Merge -r 811494:813103 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-265@813107 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -62,6 +62,18 @@ Trunk (unreleased changes)
     HDFS-492. Add two JSON JSP pages to the Namenode for providing corrupt
     blocks/replicas information.  (Bill Zeller via szetszwo)
 
+    HDFS-578. Add support for new FileSystem method for clients to get server
+    defaults. (Kan Zhang via suresh)
+
+    HDFS-595. umask settings in configuration may now use octal or symbolic 
+    instead of decimal. (Jakob Homan via suresh)
+
+    HADOOP-6234. Updated hadoop-core and test jars to propagate new option 
+    dfs.umaskmode in configuration. (Jakob Homan via suresh)
+
+    HDFS-235. Add support for byte ranges in HftpFileSystem to serve
+    range of bytes from a file. (Bill Zeller via suresh)
+
   IMPROVEMENTS
 
     HDFS-381. Remove blocks from DataNode maps when corresponding file
@@ -168,6 +180,12 @@ Trunk (unreleased changes)
     HDFS-551. Create new functional test for a block report. (Konstantin
     Boudnik via hairong)
 
+    HDFS-288. Redundant computation in hashCode() implementation.
+    (szetszwo via tomwhite)
+
+    HDFS-412. Hadoop JMX usage makes Nagios monitoring impossible.
+    (Brian Bockelman via tomwhite)
+
   BUG FIXES
 
     HDFS-76. Better error message to users when commands fail because of 
@@ -239,6 +257,12 @@ Trunk (unreleased changes)
     HDFS-586. TestBlocksWithNotEnoughRacks sometimes fails.
     (Jitendra Nath Pandey via hairong)
 
+    HADOOP-6243. Fixed a NullPointerException in handling deprecated keys.
+    (Sreekanth Ramakrishnan via yhemanth)
+
+    HDFS-605. Do not run fault injection tests in the run-test-hdfs-with-mr
+    target.  (Konstantin Boudnik via szetszwo)
+
 Release 0.20.1 - Unreleased
 
   IMPROVEMENTS

build.xml

@@ -378,15 +378,6 @@
     </subant>
   </target>
 
-  <target name="run-test-hdfs-with-mr-fault-inject" depends="injectfaults"
-          description="Run hdfs Fault Injection related unit tests that require mapred">
-    <subant buildpath="build.xml" target="run-test-hdfs-with-mr">
-      <property name="build.dir" value="${build-fi.dir}"/>
-      <property name="test.fault.inject" value="yes"/>
-      <property name="test.include" value="TestFi*"/>
-    </subant>
-  </target>
-
   <!-- ================================================================== -->
   <!-- Make hadoop-fi.jar including all Fault Iinjected artifacts         -->
   <!-- ================================================================== -->
@@ -702,17 +693,9 @@
            includes="**/${test.include}.java"
            excludes="**/${test.exclude}.java" />
       </batchtest>
-      <batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
-        <fileset dir="${test.src.dir}/aop"
-          includes="**/${test.include}.java"
-          excludes="**/${test.exclude}.java" />
-      </batchtest>
       <batchtest todir="${test.build.dir}" if="tests.testcase">
         <fileset dir="${test.src.dir}/hdfs-with-mr" includes="**/${testcase}.java"/>
       </batchtest>
-      <batchtest todir="${test.build.dir}" if="tests.testcase.fi">
-        <fileset dir="${test.src.dir}/aop" includes="**/${testcase}.java"/>
-      </batchtest>
     </junit>
     <antcall target="checkfailure"/>
   </target>  
@@ -737,7 +720,6 @@
     <antcall target="run-test-hdfs"/>
     <antcall target="run-test-hdfs-with-mr"/>
     <antcall target="run-test-hdfs-fault-inject"/>
-    <antcall target="run-test-hdfs-with-mr-fault-inject"/>
     <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
     <fail if="testsfailed">Tests failed!</fail>
   </target>

src/java/org/apache/hadoop/hdfs/ByteRangeInputStream.java

@@ -0,0 +1,164 @@
+/**
+ * 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.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import org.apache.hadoop.fs.FSInputStream;
+
+
+/**
+ * To support HTTP byte streams, a new connection to an HTTP server needs to be
+ * created each time. This class hides the complexity of those multiple 
+ * connections from the client. Whenever seek() is called, a new connection
+ * is made on the successive read(). The normal input stream functions are 
+ * connected to the currently active input stream. 
+ */
+class ByteRangeInputStream extends FSInputStream {
+  
+  /**
+   * This class wraps a URL to allow easy mocking when testing. The URL class
+   * cannot be easily mocked because it is public.
+   */
+  static class URLOpener {
+    protected URL url;
+  
+    public URLOpener(URL u) {
+      url = u;
+    }
+  
+    public void setURL(URL u) {
+      url = u;
+    }
+  
+    public URL getURL() {
+      return url;
+    }
+  
+    public HttpURLConnection openConnection() throws IOException {
+      return (HttpURLConnection)url.openConnection();
+    }  
+  }
+  
+  
+  protected InputStream in;
+  protected URLOpener originalURL;
+  protected URLOpener resolvedURL;
+  protected long startPos = 0;
+  protected long currentPos = 0;
+  protected int status = STATUS_SEEK;
+  protected static final int STATUS_NORMAL = 0;
+  protected static final int STATUS_SEEK = 1;
+
+  ByteRangeInputStream(final URL url) {
+    this(new URLOpener(url), new URLOpener(null));
+  }
+  
+  ByteRangeInputStream(URLOpener o, URLOpener r) {
+    this.originalURL = o;
+    this.resolvedURL = r;
+  }
+  
+  private InputStream getInputStream() throws IOException {
+    if (status != STATUS_NORMAL) {
+      
+      if (in != null) {
+        in.close();
+        in = null;
+      }
+      
+      final URLOpener o;
+      
+      // use the original url  if no resolved url exists (e.g., if it's 
+      // the first time a request is made)
+      System.out.println("url: "+resolvedURL.getURL());
+      if (resolvedURL.getURL() == null) {
+        o = originalURL;
+      } else {
+        o = resolvedURL;
+      }
+        
+      final HttpURLConnection connection = o.openConnection();
+      connection.setRequestMethod("GET");
+      if (startPos != 0) {
+        connection.setRequestProperty("Range", "bytes="+startPos+"-");
+      }
+      connection.connect();
+      in = connection.getInputStream();
+      
+      if (startPos != 0 && connection.getResponseCode() != 206) {
+        // we asked for a byte range but did not receive a partial content
+        // response...
+        throw new IOException("206 expected, but received "
+                              + connection.getResponseCode());
+      } else if(startPos == 0 && connection.getResponseCode() != 200) {
+        // we asked for all bytes from the beginning but didn't receive a 200
+        // response (none of the other 2xx codes are valid here)
+        throw new IOException("200 expected, but received "
+                              + connection.getResponseCode());
+      }
+      
+      resolvedURL.setURL(connection.getURL());
+      status = STATUS_NORMAL;
+    }
+    
+    return in;
+  }
+  
+  public int read() throws IOException {
+    int ret = getInputStream().read();
+    if (ret != -1) {
+     currentPos++;
+    }
+    return ret;
+  }
+  
+  /**
+   * Seek to the given offset from the start of the file.
+   * The next read() will be from that location.  Can't
+   * seek past the end of the file.
+   */
+  public void seek(long pos) throws IOException {
+    if (pos != currentPos) {
+      startPos = pos;
+      currentPos = pos;
+      status = STATUS_SEEK;
+    }
+  }
+
+  /**
+   * Return the current offset from the start of the file
+   */
+  public long getPos() throws IOException {
+    return currentPos; // keep total count?
+  }
+
+  /**
+   * Seeks a different copy of the data.  Returns true if
+   * found a new source, false otherwise.
+   */
+  public boolean seekToNewSource(long targetPos) throws IOException {
+    return false;
+  }
+
+}
+
+

src/java/org/apache/hadoop/hdfs/DFSClient.java

@@ -67,6 +67,7 @@ import org.apache.hadoop.fs.FSInputStream;
 import org.apache.hadoop.fs.FSOutputSummer;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FsServerDefaults;
 import org.apache.hadoop.fs.FsStatus;
 import org.apache.hadoop.fs.MD5MD5CRC32FileChecksum;
 import org.apache.hadoop.fs.Path;
@@ -125,12 +126,15 @@ import org.apache.hadoop.util.StringUtils;
  ********************************************************/
 public class DFSClient implements FSConstants, java.io.Closeable {
   public static final Log LOG = LogFactory.getLog(DFSClient.class);
+  public static final long SERVER_DEFAULTS_VALIDITY_PERIOD = 60 * 60 * 1000L; // 1 hour
   public static final int MAX_BLOCK_ACQUIRE_FAILURES = 3;
   private static final int TCP_WINDOW_SIZE = 128 * 1024; // 128 KB
   private final ClientProtocol namenode;
   private final ClientProtocol rpcNamenode;
   final UnixUserGroupInformation ugi;
   volatile boolean clientRunning = true;
+  private volatile FsServerDefaults serverDefaults;
+  private volatile long serverDefaultsLastUpdate;
   Random r = new Random();
   final String clientName;
   final LeaseChecker leasechecker = new LeaseChecker();
@@ -328,6 +332,18 @@ public class DFSClient implements FSConstants, java.io.Closeable {
     }
   }
 
+  /**
+   * Get server default values for a number of configuration params.
+   */
+  public FsServerDefaults getServerDefaults() throws IOException {
+    long now = System.currentTimeMillis();
+    if (now - serverDefaultsLastUpdate > SERVER_DEFAULTS_VALIDITY_PERIOD) {
+      serverDefaults = namenode.getServerDefaults();
+      serverDefaultsLastUpdate = now;
+    }
+    return serverDefaults;
+  }
+
   /**
    * Report corrupt blocks that were discovered by the client.
    */

src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java

@@ -434,6 +434,12 @@ public class DistributedFileSystem extends FileSystem {
     dfs.metaSave(pathname);
   }
 
+  /** {@inheritDoc} */
+  @Override
+  public FsServerDefaults getServerDefaults() throws IOException {
+    return dfs.getServerDefaults();
+  }
+
   /**
    * We need to find the blocks that didn't match.  Likely only one 
    * is corrupt but we will report both to the namenode.  In the future,

src/java/org/apache/hadoop/hdfs/HftpFileSystem.java

@@ -59,6 +59,9 @@ import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
+import org.apache.hadoop.hdfs.ByteRangeInputStream;
+
+
 
 /** An implementation of a protocol for accessing filesystems over HTTP.
  * The following implementation provides a limited, read-only interface
@@ -115,55 +118,48 @@ public class HftpFileSystem extends FileSystem {
     } 
   }
 
-  /**
-   * Open an HTTP connection to the namenode to read file data and metadata.
-   * @param path The path component of the URL
-   * @param query The query component of the URL
-   */
-  protected HttpURLConnection openConnection(String path, String query)
-      throws IOException {
+
+  /* 
+    Construct URL pointing to file on namenode
+  */
+  URL getNamenodeFileURL(Path f) throws IOException {
+    return getNamenodeURL("/data" + f.toUri().getPath(), "ugi=" + ugi);
+  }
+
+  /* 
+    Construct URL pointing to namenode. 
+  */
+  URL getNamenodeURL(String path, String query) throws IOException {
     try {
       final URL url = new URI("http", null, nnAddr.getHostName(),
           nnAddr.getPort(), path, query, null).toURL();
       if (LOG.isTraceEnabled()) {
         LOG.trace("url=" + url);
       }
-      HttpURLConnection connection = (HttpURLConnection)url.openConnection();
-      connection.setRequestMethod("GET");
-      connection.connect();
-      return connection;
+      return url;
     } catch (URISyntaxException e) {
-      throw (IOException)new IOException().initCause(e);
+      throw new IOException(e);
     }
   }
 
+  /**
+   * Open an HTTP connection to the namenode to read file data and metadata.
+   * @param path The path component of the URL
+   * @param query The query component of the URL
+   */
+  protected HttpURLConnection openConnection(String path, String query)
+      throws IOException {
+    final URL url = getNamenodeURL(path, query);
+    HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+    connection.setRequestMethod("GET");
+    connection.connect();
+    return connection;
+  }
+
   @Override
   public FSDataInputStream open(Path f, int buffersize) throws IOException {
-    HttpURLConnection connection = null;
-    connection = openConnection("/data" + f.toUri().getPath(), "ugi=" + ugi);
-    final InputStream in = connection.getInputStream();
-    return new FSDataInputStream(new FSInputStream() {
-        public int read() throws IOException {
-          return in.read();
-        }
-        public int read(byte[] b, int off, int len) throws IOException {
-          return in.read(b, off, len);
-        }
-
-        public void close() throws IOException {
-          in.close();
-        }
-
-        public void seek(long pos) throws IOException {
-          throw new IOException("Can't seek!");
-        }
-        public long getPos() throws IOException {
-          throw new IOException("Position unknown!");
-        }
-        public boolean seekToNewSource(long targetPos) throws IOException {
-          return false;
-        }
-      });
+    URL u = getNamenodeURL("/data" + f.toUri().getPath(), "ugi=" + ugi);
+    return new FSDataInputStream(new ByteRangeInputStream(u));
   }
 
   /** Class to parse and store a listing reply from the server. */

src/java/org/apache/hadoop/hdfs/protocol/Block.java

@@ -207,6 +207,6 @@ public class Block implements Writable, Comparable<Block> {
   /** {@inheritDoc} */
   public int hashCode() {
     //GenerationStamp is IRRELEVANT and should not be used here
-    return 37 * 17 + (int) (blockId^(blockId>>>32));
+    return (int)(blockId^(blockId>>>32));
   }
 }

src/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java

@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.CreateFlag;
+import org.apache.hadoop.fs.FsServerDefaults;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.protocol.FSConstants.UpgradeAction;
 import org.apache.hadoop.hdfs.server.common.UpgradeStatusReport;
@@ -43,9 +44,9 @@ public interface ClientProtocol extends VersionedProtocol {
    * Compared to the previous version the following changes have been introduced:
    * (Only the latest change is reflected.
    * The log of historical changes can be retrieved from the svn).
-   * 46: add Block parameter to addBlock() and complete()
+   * 47: added a new method getServerDefaults(), see HDFS-578
    */
-  public static final long versionID = 46L;
+  public static final long versionID = 47L;
   
   ///////////////////////////////////////
   // File contents
@@ -73,6 +74,13 @@ public interface ClientProtocol extends VersionedProtocol {
                                           long offset,
                                           long length) throws IOException;
 
+  /**
+   * Get server default values for a number of configuration params.
+   * @return a set of server default configuration values
+   * @throws IOException
+   */
+  public FsServerDefaults getServerDefaults() throws IOException;
+
   /**
    * Create a new file entry in the namespace.
    * <p>

src/java/org/apache/hadoop/hdfs/protocol/FSConstants.java

@@ -53,6 +53,10 @@ public interface FSConstants {
   public static final int SMALL_BUFFER_SIZE = Math.min(BUFFER_SIZE/2, 512);
   //TODO mb@media-style.com: should be conf injected?
   public static final long DEFAULT_BLOCK_SIZE = 64 * 1024 * 1024;
+  public static final int DEFAULT_BYTES_PER_CHECKSUM = 512;
+  public static final int DEFAULT_WRITE_PACKET_SIZE = 64 * 1024;
+  public static final short DEFAULT_REPLICATION_FACTOR = 3;
+  public static final int DEFAULT_FILE_BUFFER_SIZE = 4096;
   public static final int DEFAULT_DATA_SOCKET_SIZE = 128 * 1024;
 
   public static final int SIZE_OF_INTEGER = Integer.SIZE / Byte.SIZE;

src/java/org/apache/hadoop/hdfs/server/common/GenerationStamp.java

@@ -109,6 +109,6 @@ public class GenerationStamp implements WritableComparable<GenerationStamp> {
 
   /** {@inheritDoc} */
   public int hashCode() {
-    return 37 * 17 + (int) (genstamp^(genstamp>>>32));
+    return (int) (genstamp^(genstamp>>>32));
   }
 }

src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -380,7 +380,7 @@ public class DataNode extends Configured
     this.infoServer.start();
     // adjust info port
     this.dnRegistration.setInfoPort(this.infoServer.getPort());
-    myMetrics = new DataNodeMetrics(conf, dnRegistration.getStorageID());
+    myMetrics = new DataNodeMetrics(conf, dnRegistration.getName());
     
     // set service-level authorization security policy
     if (conf.getBoolean(

src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java

@@ -113,7 +113,7 @@ public class DirectoryScanner {
 
     @Override // Object
     public int hashCode() {
-      return 37 * 17 + (int) (blockId^(blockId>>>32));
+      return (int)(blockId^(blockId>>>32));
     }
 
     public long getGenStamp() {

src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeActivityMBean.java

@@ -28,7 +28,7 @@ import org.apache.hadoop.metrics.util.MetricsRegistry;
  * 
  * This is the JMX MBean for reporting the DataNode Activity.
  * The MBean is register using the name
- *        "hadoop:service=DataNode,name=DataNodeActivity-<storageid>"
+ *        "hadoop:service=DataNode,name=DataNodeActivity-<hostname>-<portNumber>"
  * 
  * Many of the activity metrics are sampled and averaged on an interval 
  * which can be specified in the metrics config file.
@@ -57,15 +57,17 @@ public class DataNodeActivityMBean extends MetricsDynamicMBeanBase {
   final private ObjectName mbeanName;
   private Random rand = new Random(); 
 
-  public DataNodeActivityMBean(final MetricsRegistry mr, final String storageId) {
+  public DataNodeActivityMBean(final MetricsRegistry mr,
+      final String datanodeName) {
     super(mr, "Activity statistics at the DataNode");
-    String storageName;
-    if (storageId.equals("")) {// Temp fix for the uninitialized storage
-      storageName = "UndefinedStorageId" + rand.nextInt();
+    String name;
+    if (datanodeName.equals("")) {// Temp fix for the uninitialized name
+      name = "UndefinedDataNodeName" + rand.nextInt();
     } else {
-      storageName = storageId;
+      name = datanodeName.replace(":", "-");
     }
-    mbeanName = MBeanUtil.registerMBean("DataNode", "DataNodeActivity-" + storageName, this);
+    mbeanName = MBeanUtil.registerMBean("DataNode",
+	"DataNodeActivity-" + name, this);
   }
   
 

src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeMetrics.java

@@ -90,14 +90,14 @@ public class DataNodeMetrics implements Updater {
                     new MetricsTimeVaryingRate("blockReports", registry);
 
     
-  public DataNodeMetrics(Configuration conf, String storageId) {
+  public DataNodeMetrics(Configuration conf, String datanodeName) {
     String sessionId = conf.get("session.id"); 
     // Initiate reporting of Java VM metrics
     JvmMetrics.init("DataNode", sessionId);
     
 
     // Now the MBean for the data node
-    datanodeActivityMBean = new DataNodeActivityMBean(registry, storageId);
+    datanodeActivityMBean = new DataNodeActivityMBean(registry, datanodeName);
     
     // Create record for DataNode metrics
     MetricsContext context = MetricsUtil.getContext("dfs");

src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -55,6 +55,7 @@ import org.apache.hadoop.hdfs.server.protocol.BlocksWithLocations.BlockWithLocat
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.CreateFlag;
 import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FsServerDefaults;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.*;
 import org.apache.hadoop.ipc.Server;
@@ -200,8 +201,7 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean {
   private long heartbeatExpireInterval;
   //replicationRecheckInterval is how often namenode checks for new replication work
   private long replicationRecheckInterval;
-  // default block size of a file
-  private long defaultBlockSize = 0;
+  private FsServerDefaults serverDefaults;
   // allow appending to hdfs files
   private boolean supportAppends = true;
 
@@ -413,7 +413,12 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean {
       10 * heartbeatInterval;
     this.replicationRecheckInterval = 
       conf.getInt("dfs.replication.interval", 3) * 1000L;
-    this.defaultBlockSize = conf.getLong("dfs.block.size", DEFAULT_BLOCK_SIZE);
+    this.serverDefaults = new FsServerDefaults(
+        conf.getLong("dfs.block.size", DEFAULT_BLOCK_SIZE),
+        conf.getInt("io.bytes.per.checksum", DEFAULT_BYTES_PER_CHECKSUM),
+        conf.getInt("dfs.write.packet.size", DEFAULT_WRITE_PACKET_SIZE),
+        (short) conf.getInt("dfs.replication", DEFAULT_REPLICATION_FACTOR),
+        conf.getInt("io.file.buffer.size", DEFAULT_FILE_BUFFER_SIZE));
     this.maxFsObjects = conf.getLong("dfs.max.objects", 0);
     this.blockInvalidateLimit = Math.max(this.blockInvalidateLimit, 
                                          20*(int)(heartbeatInterval/1000));
@@ -505,7 +510,11 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean {
   }
 
   long getDefaultBlockSize() {
-    return defaultBlockSize;
+    return serverDefaults.getBlockSize();
+  }
+
+  FsServerDefaults getServerDefaults() {
+    return serverDefaults;
   }
 
   long getAccessTimePrecision() {

src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java

@@ -32,6 +32,7 @@ import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.CreateFlag;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FsServerDefaults;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.Trash;
 import org.apache.hadoop.fs.permission.FsPermission;
@@ -545,6 +546,11 @@ public class NameNode implements ClientProtocol, DatanodeProtocol,
     return clientMachine;
   }
 
+  /** {@inheritDoc} */
+  public FsServerDefaults getServerDefaults() throws IOException {
+    return namesystem.getServerDefaults();
+  }
+
   /** {@inheritDoc} */
   public void create(String src, 
                      FsPermission masked,

src/java/org/apache/hadoop/hdfs/server/namenode/StreamFile.java

@@ -21,17 +21,18 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.InetSocketAddress;
-
+import java.util.Enumeration;
+import java.util.List;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSInputStream;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.server.common.JspHelper;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.security.UnixUserGroupInformation;
+import org.mortbay.jetty.InclusiveByteRange;
 
 public class StreamFile extends DfsServlet {
   /** for java.io.Serializable */
@@ -65,22 +66,104 @@ public class StreamFile extends DfsServlet {
       out.print("Invalid input");
       return;
     }
-    DFSClient dfs = getDFSClient(request);
+    
+    Enumeration reqRanges = request.getHeaders("Range");
+    if (reqRanges != null && !reqRanges.hasMoreElements())
+      reqRanges = null;
+
+    DFSClient dfs = getDFSClient(request);  
+    long fileLen = dfs.getFileInfo(filename).getLen();
     FSInputStream in = dfs.open(filename);
     OutputStream os = response.getOutputStream();
-    response.setHeader("Content-Disposition", "attachment; filename=\"" + 
-                       filename + "\"");
-    response.setContentType("application/octet-stream");
-    byte buf[] = new byte[4096];
+
     try {
-      int bytesRead;
-      while ((bytesRead = in.read(buf)) != -1) {
-        os.write(buf, 0, bytesRead);
+      if (reqRanges != null) {
+        List ranges = InclusiveByteRange.satisfiableRanges(reqRanges,
+                                                           fileLen);
+        StreamFile.sendPartialData(in, os, response, fileLen, ranges);
+      } else {
+        // No ranges, so send entire file
+        response.setHeader("Content-Disposition", "attachment; filename=\"" + 
+                           filename + "\"");
+        response.setContentType("application/octet-stream");
+        StreamFile.writeTo(in, os, 0L, fileLen);
       }
     } finally {
       in.close();
       os.close();
       dfs.close();
+    }      
+  }
+  
+  static void sendPartialData(FSInputStream in,
+                              OutputStream os,
+                              HttpServletResponse response,
+                              long contentLength,
+                              List ranges)
+  throws IOException {
+
+    if (ranges == null || ranges.size() != 1) {
+      //  if there are no satisfiable ranges, or if multiple ranges are
+      // requested (we don't support multiple range requests), send 416 response
+      response.setContentLength(0);
+      int status = HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE;
+      response.setStatus(status);
+      response.setHeader("Content-Range", 
+                InclusiveByteRange.to416HeaderRangeString(contentLength));
+    } else {
+      //  if there is only a single valid range (must be satisfiable 
+      //  since were here now), send that range with a 206 response
+      InclusiveByteRange singleSatisfiableRange =
+        (InclusiveByteRange)ranges.get(0);
+      long singleLength = singleSatisfiableRange.getSize(contentLength);
+      response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+      response.setHeader("Content-Range", 
+        singleSatisfiableRange.toHeaderRangeString(contentLength));
+      System.out.println("first: "+singleSatisfiableRange.getFirst(contentLength));
+      System.out.println("singleLength: "+singleLength);
+      
+      StreamFile.writeTo(in,
+                         os,
+                         singleSatisfiableRange.getFirst(contentLength),
+                         singleLength);
     }
   }
+  
+  static void writeTo(FSInputStream in,
+                      OutputStream os,
+                      long start,
+                      long count) 
+  throws IOException {
+    byte buf[] = new byte[4096];
+    long bytesRemaining = count;
+    int bytesRead;
+    int bytesToRead;
+
+    in.seek(start);
+
+    while (true) {
+      // number of bytes to read this iteration
+      bytesToRead = (int)(bytesRemaining<buf.length ? 
+                                                      bytesRemaining:
+                                                      buf.length);
+      
+      // number of bytes actually read this iteration
+      bytesRead = in.read(buf, 0, bytesToRead);
+
+      // if we can't read anymore, break
+      if (bytesRead == -1) {
+        break;
+      } 
+      
+      os.write(buf, 0, bytesRead);
+
+      bytesRemaining -= bytesRead;
+
+      // if we don't need to read anymore, break
+      if (bytesRemaining <= 0) {
+        break;
+      }
+
+    } 
+  }
 }

src/test/hdfs/org/apache/hadoop/hdfs/TestByteRangeInputStream.java

@@ -0,0 +1,189 @@
+/**
+ * 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.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.ByteRangeInputStream;
+import org.apache.hadoop.hdfs.ByteRangeInputStream.URLOpener;
+
+class MockHttpURLConnection extends HttpURLConnection {
+  MockURL m;
+  
+  public MockHttpURLConnection(URL u, MockURL m) {
+    super(u); 
+    this.m = m;
+  }
+  
+  public boolean usingProxy(){
+    return false;
+  }
+  
+  public void disconnect() {
+  }
+  
+  public void connect() throws IOException {
+    m.setMsg("Connect: "+url+", Range: "+getRequestProperty("Range"));
+  }
+  
+  public InputStream getInputStream() throws IOException {
+    return new ByteArrayInputStream("asdf".getBytes());
+  } 
+
+  public URL getURL() {
+    URL u = null;
+    try {
+      u = new URL("http://resolvedurl/");
+    } catch (Exception e) {
+      System.out.println(e.getMessage());
+    }
+    return u;
+  }
+  
+  public int getResponseCode() {
+    if (m.responseCode != -1) {
+      return m.responseCode;
+    } else {
+      if (getRequestProperty("Range") == null) {
+        return 200;
+      } else {
+        return 206;
+      }
+    }
+  }
+  
+}
+
+class MockURL extends URLOpener {
+  String msg;
+  public int responseCode = -1;
+  
+  public MockURL(URL u) {
+    super(u);
+  }
+
+  public MockURL(String s) throws MalformedURLException {
+    this(new URL(s));
+  }
+
+  public HttpURLConnection openConnection() throws IOException {
+    return new MockHttpURLConnection(url, this);
+  }    
+
+  public void setMsg(String s) {
+    msg = s;
+  }
+  
+  public String getMsg() {
+    return msg;
+  }
+}
+
+
+
+public class TestByteRangeInputStream extends TestCase {
+  
+  private static final Log LOG = 
+                           LogFactory.getLog(TestByteRangeInputStream.class);
+  
+  public void testByteRange() throws IOException, InterruptedException {
+    MockURL o = new MockURL("http://test/");
+    MockURL r =  new MockURL((URL)null);
+    ByteRangeInputStream is = new ByteRangeInputStream(o, r);
+
+    assertEquals("getPos wrong", 0, is.getPos());
+
+    is.read();
+
+    assertEquals("Initial call made incorrectly", 
+                 "Connect: http://test/, Range: null",
+                 o.getMsg());
+
+    assertEquals("getPos should be 1 after reading one byte", 1, is.getPos());
+
+    o.setMsg(null);
+
+    is.read();
+
+    assertEquals("getPos should be 2 after reading two bytes", 2, is.getPos());
+
+    assertNull("No additional connections should have been made (no seek)",
+               o.getMsg());
+
+    r.setMsg(null);
+    r.setURL(new URL("http://resolvedurl/"));
+    
+    is.seek(100);
+    is.read();
+
+    assertEquals("Seek to 100 bytes made incorrectly", 
+                 "Connect: http://resolvedurl/, Range: bytes=100-",
+                 r.getMsg());
+
+    assertEquals("getPos should be 101 after reading one byte", 101, is.getPos());
+
+    r.setMsg(null);
+
+    is.seek(101);
+    is.read();
+
+    assertNull("Seek to 101 should not result in another request", null);
+
+    r.setMsg(null);
+    is.seek(2500);
+    is.read();
+
+    assertEquals("Seek to 2500 bytes made incorrectly", 
+                 "Connect: http://resolvedurl/, Range: bytes=2500-",
+                 r.getMsg());
+
+    r.responseCode = 200;
+    is.seek(500);
+    
+    try {
+      is.read();
+      fail("Exception should be thrown when 200 response is given "
+           + "but 206 is expected");
+    } catch (IOException e) {
+      assertEquals("Should fail because incorrect response code was sent",
+                   "206 expected, but received 200", e.getMessage());
+    }
+
+    r.responseCode = 206;
+    is.seek(0);
+
+    try {
+      is.read();
+      fail("Exception should be thrown when 206 response is given "
+           + "but 200 is expected");
+    } catch (IOException e) {
+      assertEquals("Should fail because incorrect response code was sent",
+                   "200 expected, but received 206", e.getMessage());
+    }
+
+
+
+  }
+}

src/test/hdfs/org/apache/hadoop/hdfs/TestDFSClientRetries.java

@@ -155,6 +155,8 @@ public class TestDFSClientRetries extends TestCase {
     
     public LocatedBlocks  getBlockLocations(String src, long offset, long length) throws IOException { return null; }
     
+    public FsServerDefaults getServerDefaults() throws IOException { return null; }
+    
     public void create(String src, FsPermission masked, String clientName, EnumSetWritable<CreateFlag> flag, short replication, long blockSize) throws IOException {}
     
     public LocatedBlock append(String src, String clientName) throws IOException { return null; }

src/test/hdfs/org/apache/hadoop/hdfs/TestDFSPermission.java

@@ -154,8 +154,8 @@ public class TestDFSPermission extends TestCase {
   /* create a file/directory with the given umask and permission */
   private void create(OpType op, Path name, short umask, 
       FsPermission permission) throws IOException {
-    // set umask in configuration
-    conf.setInt(FsPermission.UMASK_LABEL, umask);
+    // set umask in configuration, converting to padded octal
+    conf.set(FsPermission.UMASK_LABEL, String.format("%1$03o", umask));
 
     // create the file/directory
     switch (op) {

src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreation.java

@@ -32,6 +32,7 @@ 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.FsServerDefaults;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.protocol.Block;
@@ -45,6 +46,7 @@ import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
 import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.log4j.Level;
 
 
@@ -170,6 +172,33 @@ public class TestFileCreation extends junit.framework.TestCase {
     stm.close();
   }
 
+  /**
+   * Test that server default values can be retrieved on the client side
+   */
+  public void testServerDefaults() throws IOException {
+    Configuration conf = new Configuration();
+    conf.setLong("dfs.block.size", FSConstants.DEFAULT_BLOCK_SIZE);
+    conf.setInt("io.bytes.per.checksum", FSConstants.DEFAULT_BYTES_PER_CHECKSUM);
+    conf.setInt("dfs.write.packet.size", FSConstants.DEFAULT_WRITE_PACKET_SIZE);
+    conf.setInt("dfs.replication", FSConstants.DEFAULT_REPLICATION_FACTOR + 1);
+    conf.setInt("io.file.buffer.size", FSConstants.DEFAULT_FILE_BUFFER_SIZE);
+    MiniDFSCluster cluster = new MiniDFSCluster(conf,
+        FSConstants.DEFAULT_REPLICATION_FACTOR + 1, true, null);
+    cluster.waitActive();
+    FileSystem fs = cluster.getFileSystem();
+    try {
+      FsServerDefaults serverDefaults = fs.getServerDefaults();
+      assertEquals(FSConstants.DEFAULT_BLOCK_SIZE, serverDefaults.getBlockSize());
+      assertEquals(FSConstants.DEFAULT_BYTES_PER_CHECKSUM, serverDefaults.getBytesPerChecksum());
+      assertEquals(FSConstants.DEFAULT_WRITE_PACKET_SIZE, serverDefaults.getWritePacketSize());
+      assertEquals(FSConstants.DEFAULT_REPLICATION_FACTOR + 1, serverDefaults.getReplication());
+      assertEquals(FSConstants.DEFAULT_FILE_BUFFER_SIZE, serverDefaults.getFileBufferSize());
+    } finally {
+      fs.close();
+      cluster.shutdown();
+    }
+  }
+
   /**
    * Test that file data becomes available before file is closed.
    */

src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java

@@ -0,0 +1,285 @@
+/**
+ * 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.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Vector;
+import javax.servlet.http.HttpServletResponse;
+import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.fs.FSInputStream;
+import org.apache.hadoop.hdfs.server.namenode.StreamFile;
+import org.mortbay.jetty.InclusiveByteRange;
+import static org.junit.Assert.*;
+
+/*
+  Mock input stream class that always outputs the current position of the stream
+*/
+class MockFSInputStream extends FSInputStream {
+  long currentPos = 0;
+  public int read() throws IOException {
+    return (int)(currentPos++);
+  }
+
+  public void close() throws IOException {
+  }
+
+  public void seek(long pos) throws IOException {
+    currentPos = pos;
+  }
+  
+  public long getPos() throws IOException {
+    return currentPos;
+  }
+  
+  public boolean seekToNewSource(long targetPos) throws IOException {
+    return false;
+  }
+}
+
+
+class MockHttpServletResponse implements HttpServletResponse {
+
+  private int status = -1;
+  
+  public MockHttpServletResponse() {
+  }
+  
+  public int getStatus() {
+    return status;
+  }
+  
+  
+  public void setStatus(int sc) {
+    status = sc;
+  }
+  
+  @SuppressWarnings("deprecation")
+  public void setStatus(int sc, java.lang.String sm) {
+  }
+  
+  public void addIntHeader(String name, int value) {
+  }
+
+  public void setIntHeader(String name, int value) { 
+  }
+  
+  public void addHeader(String name, String value) {
+  }
+
+  public void setHeader(String name, String value) {
+  }
+  
+  public void addDateHeader(java.lang.String name, long date) {
+  }
+  
+  public void setDateHeader(java.lang.String name, long date) {
+  }
+
+  public void sendRedirect(java.lang.String location) { 
+  }
+  
+  public void sendError(int e) {
+  }
+  
+  public void sendError(int a, java.lang.String b) {
+  }
+  
+  public String encodeRedirectUrl(java.lang.String a) {
+    return null;
+  }
+  
+  public String encodeUrl(java.lang.String url) {
+    return null;
+  }
+  
+  public String encodeRedirectURL(java.lang.String url) {
+    return null;
+  }
+  
+  public String encodeURL(java.lang.String url) {
+    return null;
+  }
+  
+  public boolean containsHeader(java.lang.String name) {
+    return false;
+  }
+  
+  public void addCookie(javax.servlet.http.Cookie cookie) {
+  }
+  
+  public java.util.Locale getLocale() {
+    return null;
+  }
+  
+  public void setLocale(java.util.Locale loc) {
+  }
+  
+  public void reset() {
+  }
+  
+  public boolean isCommitted() {
+    return false;
+  }
+  
+  public void resetBuffer() {
+  }
+  
+  public void flushBuffer() {
+  }
+  
+  public int getBufferSize() {
+    return 0;
+  }
+  
+  public void setBufferSize(int size) {
+  }
+  
+  public void setContentType(java.lang.String type) {
+  }
+  
+  public void setContentLength(int len) {
+  }
+  
+  public void setCharacterEncoding(java.lang.String charset) {
+  }
+  
+  public java.io.PrintWriter getWriter() {
+    return null;
+  }
+  
+  public javax.servlet.ServletOutputStream getOutputStream() {
+    return null;
+  }
+  
+  public java.lang.String getContentType() {
+    return null;
+  }
+  
+  public java.lang.String getCharacterEncoding() {
+    return null;
+  }
+}
+
+
+
+public class TestStreamFile extends TestCase {
+  
+  private static final Log LOG =  LogFactory.getLog(TestStreamFile.class);
+
+  // return an array matching the output of mockfsinputstream
+  private static byte[] getOutputArray(int start, int count) {
+    byte[] a = new byte[count];
+    
+    for (int i = 0; i < count; i++) {
+      a[i] = (byte)(start+i);
+    }
+
+    return a;
+  }
+  
+  public void testWriteTo() throws IOException, InterruptedException {
+
+    FSInputStream fsin = new MockFSInputStream();
+    ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+    // new int[]{s_1, c_1, s_2, c_2, ..., s_n, c_n} means to test
+    // reading c_i bytes starting at s_i
+    int[] pairs = new int[]{ 0, 10000,
+                             50, 100,
+                             50, 6000,
+                             1000, 2000,
+                             0, 1,
+                             0, 0,
+                             5000, 0,
+                            };
+                            
+    assertTrue("Pairs array must be even", pairs.length % 2 == 0);
+    
+    for (int i = 0; i < pairs.length; i+=2) {
+      StreamFile.writeTo(fsin, os, pairs[i], pairs[i+1]);
+      assertArrayEquals("Reading " + pairs[i+1]
+                        + " bytes from offset " + pairs[i],
+                        getOutputArray(pairs[i], pairs[i+1]),
+                        os.toByteArray());
+      os.reset();
+    }
+    
+  }
+  
+  private List strToRanges(String s, int contentLength) {
+    List<String> l = Arrays.asList(new String[]{"bytes="+s});
+    Enumeration e = (new Vector<String>(l)).elements();
+    return InclusiveByteRange.satisfiableRanges(e, contentLength);
+  }
+  
+  public void testSendPartialData() throws IOException, InterruptedException {
+    FSInputStream in = new MockFSInputStream();
+    ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+    // test if multiple ranges, then 416
+    { 
+      List ranges = strToRanges("0-,10-300", 500);
+      MockHttpServletResponse response = new MockHttpServletResponse();
+      StreamFile.sendPartialData(in, os, response, 500, ranges);
+      assertEquals("Multiple ranges should result in a 416 error",
+                   416, response.getStatus());
+    }
+                              
+    // test if no ranges, then 416
+    { 
+      os.reset();
+      MockHttpServletResponse response = new MockHttpServletResponse();
+      StreamFile.sendPartialData(in, os, response, 500, null);
+      assertEquals("No ranges should result in a 416 error",
+                   416, response.getStatus());
+    }
+
+    // test if invalid single range (out of bounds), then 416
+    { 
+      List ranges = strToRanges("600-800", 500);
+      MockHttpServletResponse response = new MockHttpServletResponse();
+      StreamFile.sendPartialData(in, os, response, 500, ranges);
+      assertEquals("Single (but invalid) range should result in a 416",
+                   416, response.getStatus());
+    }
+
+      
+    // test if one (valid) range, then 206
+    { 
+      List ranges = strToRanges("100-300", 500);
+      MockHttpServletResponse response = new MockHttpServletResponse();
+      StreamFile.sendPartialData(in, os, response, 500, ranges);
+      assertEquals("Single (valid) range should result in a 206",
+                   206, response.getStatus());
+      assertArrayEquals("Byte range from 100-300",
+                        getOutputArray(100, 201),
+                        os.toByteArray());
+    }
+    
+  }
+}

src/test/hdfs/org/apache/hadoop/security/TestPermission.java

@@ -67,7 +67,7 @@ public class TestPermission extends TestCase {
   public void testCreate() throws Exception {
     Configuration conf = new Configuration();
     conf.setBoolean("dfs.permissions", true);
-    conf.setInt(FsPermission.UMASK_LABEL, 0);
+    conf.set(FsPermission.UMASK_LABEL, "000");
     MiniDFSCluster cluster = null;
     FileSystem fs = null;
 
@@ -95,7 +95,7 @@ public class TestPermission extends TestCase {
       checkPermission(fs, "/b1/b2", inheritPerm);
       checkPermission(fs, "/b1/b2/b3.txt", filePerm);
       
-      conf.setInt(FsPermission.UMASK_LABEL, 0022);
+      conf.set(FsPermission.UMASK_LABEL, "022");
       FsPermission permission = 
         FsPermission.createImmutable((short)0666);
       FileSystem.mkdirs(fs, new Path("/c1"), new FsPermission(permission));