Revert HFileName pattern

Author: Prathyusha Garre

hbase-server/src/main/java/org/apache/hadoop/hbase/io/HFileLink.java

@@ -72,13 +72,13 @@ public class HFileLink extends FileLink {
     RegionInfoBuilder.ENCODED_REGION_NAME_REGEX, StoreFileInfo.HFILE_NAME_REGEX);
 
   /** Define the HFile Link name parser in the form of: table=region-hfile */
-  // public static final Pattern LINK_NAME_PATTERN =
-  // Pattern.compile(String.format("^(?:(%s)(?:\\=))?(%s)=(%s)-(%s)$",
-  // TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX,
-  // RegionInfoBuilder.ENCODED_REGION_NAME_REGEX, StoreFileInfo.HFILE_NAME_REGEX));
-  public static final Pattern LINK_NAME_PATTERN = Pattern
-    .compile(String.format("^(?:(%s)(?:\\=))?(%s)=(%s)-(.+)$", TableName.VALID_NAMESPACE_REGEX,
-      TableName.VALID_TABLE_QUALIFIER_REGEX, RegionInfoBuilder.ENCODED_REGION_NAME_REGEX));
+   public static final Pattern LINK_NAME_PATTERN =
+   Pattern.compile(String.format("^(?:(%s)(?:\\=))?(%s)=(%s)-(%s)$",
+   TableName.VALID_NAMESPACE_REGEX, TableName.VALID_TABLE_QUALIFIER_REGEX,
+   RegionInfoBuilder.ENCODED_REGION_NAME_REGEX, StoreFileInfo.HFILE_NAME_REGEX));
+//  public static final Pattern LINK_NAME_PATTERN = Pattern
+//    .compile(String.format("^(?:(%s)(?:\\=))?(%s)=(%s)-(.+)$", TableName.VALID_NAMESPACE_REGEX,
+//      TableName.VALID_TABLE_QUALIFIER_REGEX, RegionInfoBuilder.ENCODED_REGION_NAME_REGEX));
 
   /**
    * The pattern should be used for hfile and reference links that can be found in

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java

@@ -39,6 +39,7 @@
 import org.apache.hadoop.hbase.io.hfile.ReaderContext;
 import org.apache.hadoop.hbase.io.hfile.ReaderContext.ReaderType;
 import org.apache.hadoop.hbase.io.hfile.ReaderContextBuilder;
+import org.apache.hadoop.hbase.mob.MobConstants;
 import org.apache.hadoop.hbase.mob.MobUtils;
 import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTracker;
 import org.apache.hadoop.hbase.util.FSUtils;
@@ -663,6 +664,11 @@ public static boolean isValid(final FileStatus fileStatus) throws IOException {
     if (fileStatus.isDirectory()) {
       return false;
     }
+    
+    // Disable validation for MOB files
+    if(p.toString().contains(MobConstants.MOB_DIR_NAME)) {
+    	return true;
+    }
 
     // Check for empty hfile. Should never be the case but can happen
     // after data loss in hdfs for whatever reason (upgrade, etc.): HBASE-646
@@ -674,7 +680,7 @@ public static boolean isValid(final FileStatus fileStatus) throws IOException {
 
     return validateStoreFileName(p.getName());
   }
-
+  
   /**
    * helper function to compute HDFS blocks distribution of a given reference file.For reference
    * file, we don't compute the exact value. We use some estimate instead given it might be good