hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject svn commit: r1446156 - /hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
Date Thu, 14 Feb 2013 13:05:31 GMT
Author: jmhsieh
Date: Thu Feb 14 13:05:31 2013
New Revision: 1446156

URL: http://svn.apache.org/r1446156
Log:
HBASE-7752 [snapshot 130201 merge]  Fix TestStoreFile failure
    
Revert change to make it match trunk and pass


Modified:
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

Modified: hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1446156&r1=1446155&r2=1446156&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
(original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
Thu Feb 14 13:05:31 2013
@@ -175,12 +175,13 @@ public class TestStoreFile extends HBase
   public void testHFileLink() throws IOException {
     final String columnFamily = "f";
 
-    Configuration testConf = new Configuration(this.conf);
-    FSUtils.setRootDir(testConf, this.testDir);
+    // force temp data in hbase/target/test-data instead of /tmp/hbase-xxxx/ 
+    Configuration testConf = new Configuration(this.conf); 
+    FSUtils.setRootDir(testConf, this.testDir);  
 
     HRegionInfo hri = new HRegionInfo(Bytes.toBytes("table-link"));
     Path storedir = new Path(new Path(this.testDir,
-      new Path(hri.getTableNameAsString(), hri.getEncodedName())), columnFamily);
+        new Path(hri.getTableNameAsString(), hri.getEncodedName())), columnFamily);
 
     // Make a store file and write data to it.
     StoreFile.Writer writer = new StoreFile.WriterBuilder(testConf, cacheConf,
@@ -197,7 +198,7 @@ public class TestStoreFile extends HBase
                   HFileLink.createHFileLinkName(hri, storeFilePath.getName()));
 
     // Try to open store file from link
-    StoreFile hsf = new StoreFile(this.fs, linkFilePath, conf, cacheConf,
+    StoreFile hsf = new StoreFile(this.fs, linkFilePath, testConf, cacheConf,
         BloomType.NONE, NoOpDataBlockEncoder.INSTANCE);
     assertTrue(hsf.isLink());
 



Mime
View raw message