svn commit: r1390012 - in /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase: fs/HFileSystem.java regionserver/HRegionServer.java

[la...@apache.org]

Author: larsh
Date: Tue Sep 25 17:37:34 2012
New Revision: 1390012

URL: http://svn.apache.org/viewvc?rev=1390012&view=rev
Log:
HBASE-6868 Skip checksum is broke; are we double-checksumming by default?

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java?rev=1390012&r1=1390011&r2=1390012&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java Tue Sep 25 17:37:34 2012
@@ -73,6 +73,8 @@ public class HFileSystem extends FilterF
     // This manifests itself in that incorrect data is read and HFileBlocks won't be able to read
     // their header magic numbers. See HBASE-5885
     if (useHBaseChecksum && !(fs instanceof LocalFileSystem)) {
+      conf = new Configuration(conf);
+      conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);
       this.noChecksumFs = newInstanceFileSystem(conf);
       this.noChecksumFs.setVerifyChecksum(false);
     } else {

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1390012&r1=1390011&r2=1390012&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Sep 25 17:37:34 2012
@@ -378,7 +378,7 @@ public class HRegionServer implements HR
     // do we use checksum verfication in the hbase? If hbase checksum verification
     // is enabled, then we automatically switch off hdfs checksum verification.
     this.useHBaseChecksum = conf.getBoolean(
-      HConstants.HBASE_CHECKSUM_VERIFICATION, true);
+      HConstants.HBASE_CHECKSUM_VERIFICATION, false);
 
     // Config'ed params
     this.numRetries = conf.getInt("hbase.client.retries.number", 10);