hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1186992 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
Date Thu, 20 Oct 2011 19:03:56 GMT
Author: stack
Date: Thu Oct 20 19:03:56 2011
New Revision: 1186992

URL: http://svn.apache.org/viewvc?rev=1186992&view=rev
Log:
HBASE-4510 Check and workaround usage of internal HDFS APIs in HBase

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1186992&r1=1186991&r2=1186992&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Oct 20 19:03:56 2011
@@ -381,6 +381,8 @@ Release 0.92.0 - Unreleased
    HBASE-4430  Disable TestSlabCache and TestSingleSizedCache temporarily to
                see if these are cause of build box failure though all tests
                pass (Li Pi)
+   HBASE-4510  Check and workaround usage of internal HDFS APIs in HBase
+               (Harsh)
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java?rev=1186992&r1=1186991&r2=1186992&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java Thu Oct 20 19:03:56
2011
@@ -32,7 +32,6 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.RemoteExceptionHandler;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
-import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.server.namenode.LeaseExpiredException;
 
 
@@ -42,6 +41,16 @@ import org.apache.hadoop.hdfs.server.nam
 public class FSHDFSUtils extends FSUtils{
   private static final Log LOG = LogFactory.getLog(FSHDFSUtils.class);
 
+  /**
+   * Lease timeout constant, sourced from HDFS upstream.
+   * The upstream constant is defined in a private interface, so we
+   * can't reuse for compatibility reasons.
+   * NOTE: On versions earlier than Hadoop 0.23, the constant is in
+   * o.a.h.hdfs.protocol.FSConstants, while for 0.23 and above it is
+   * in o.a.h.hdfs.protocol.HdfsConstants cause of HDFS-1620.
+   */
+  public static final long LEASE_SOFTLIMIT_PERIOD = 60 * 1000;
+
   public void recoverFileLease(final FileSystem fs, final Path p, Configuration conf)
   throws IOException{
     if (!isAppendSupported(conf)) {
@@ -86,7 +95,7 @@ public class FSHDFSUtils extends FSUtils
           // that the RS is holding onto the file even though it lost its
           // znode. We could potentially abort after some time here.
           long waitedFor = System.currentTimeMillis() - startWaiting;
-          if (waitedFor > FSConstants.LEASE_SOFTLIMIT_PERIOD) {
+          if (waitedFor > LEASE_SOFTLIMIT_PERIOD) {
             LOG.warn("Waited " + waitedFor + "ms for lease recovery on " + p +
               ":" + e.getMessage());
           }

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=1186992&r1=1186991&r2=1186992&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Thu Oct 20 19:03:56
2011
@@ -29,6 +29,7 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
+import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HDFSBlocksDistribution;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -38,6 +39,7 @@ import org.apache.hadoop.hbase.master.HM
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
+import org.apache.hadoop.hdfs.server.namenode.SafeModeException;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.StringUtils;
@@ -151,21 +153,36 @@ public abstract class FSUtils {
   }
 
   /**
+   * Utility to check if provided FS is in safemode.
+   * @return true if dfs is in safemode, false otherwise.
+   *
+   */
+  private static boolean isInSafeMode(FileSystem fs) throws IOException {
+    // Refactored safe-mode check for HBASE-4510
+    if (fs instanceof DistributedFileSystem) {
+      Path rootPath = new Path("/");
+      FsPermission rootPerm = fs.getFileStatus(rootPath).getPermission();
+      try {
+        // Should be harmless to set back the path we retrieved.
+        // The first check server-side is the safemode, so if
+        // other exceptions are spewed out, we're not interested.
+        fs.setPermission(rootPath, rootPerm);
+      } catch (SafeModeException e) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
    * Check whether dfs is in safemode. 
-   * @param conf 
-   * @return true if dfs is in safemode.
-   * @throws IOException
+   * @param conf Configuration to use
+   * @throws IOException if dfs is in safemode
    */
   public static void checkDfsSafeMode(final Configuration conf) 
   throws IOException {
-    boolean isInSafeMode = false;
     FileSystem fs = FileSystem.get(conf);
-    if (fs instanceof DistributedFileSystem) {
-      DistributedFileSystem dfs = (DistributedFileSystem)fs;
-      // Check whether dfs is on safemode.
-      isInSafeMode = dfs.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_GET);
-    }
-    if (isInSafeMode) {
+    if (isInSafeMode(fs)) {
       throw new IOException("File system is in safemode, it can't be written now");
     }
   }
@@ -436,10 +453,8 @@ public abstract class FSUtils {
     final long wait)
   throws IOException {
     FileSystem fs = FileSystem.get(conf);
-    if (!(fs instanceof DistributedFileSystem)) return;
-    DistributedFileSystem dfs = (DistributedFileSystem)fs;
     // Make sure dfs is not in safe mode
-    while (dfs.setSafeMode(FSConstants.SafeModeAction.SAFEMODE_GET)) {
+    while (isInSafeMode(fs)) {
       LOG.info("Waiting for dfs to exit safe mode...");
       try {
         Thread.sleep(wait);



Mime
View raw message