From cfaf4fab71c287877f294187685e26cbb30bc4db Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Sat, 10 Oct 2009 19:34:22 +0000
Subject: [PATCH] HBASE-1887 Update hbase trunk to latests on hadoop 0.21
 branch so we can all test sync/append; add more to testsync test -- make sure
 does right thing if file spans multiple blocks

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@823925 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop/hbase/regionserver/TestHLog.java   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/test/org/apache/hadoop/hbase/regionserver/TestHLog.java b/src/test/org/apache/hadoop/hbase/regionserver/TestHLog.java
index ccf96b149b2..941a6267abb 100644
--- a/src/test/org/apache/hadoop/hbase/regionserver/TestHLog.java
+++ b/src/test/org/apache/hadoop/hbase/regionserver/TestHLog.java
@@ -44,6 +44,8 @@ public class TestHLog extends HBaseTestCase implements HConstants {
   public void setUp() throws Exception {
     // Enable append for these tests.
     this.conf.setBoolean("dfs.support.append", true);
+    // Make block sizes small.
+    this.conf.setInt("dfs.blocksize", 1024 * 1024);
     cluster = new MiniDFSCluster(conf, 3, true, (String[])null);
     // Set the hbase.rootdir to be the home directory in mini dfs.
     this.conf.set(HConstants.HBASE_DIR,
@@ -160,6 +162,28 @@ public class TestHLog extends HBaseTestCase implements HConstants {
     count = 0;
     while(reader.next(key)) count++;
     assertEquals(total * 2, count);
+    // Now do a test that ensures stuff works when we go over block boundary,
+    // especially that we return good length on file.
+    final byte [] value = new byte[1025 * 1024];  // Make a 1M value.
+    for (int i = 0; i < total; i++) {
+      List<KeyValue> kvs = new ArrayList<KeyValue>();
+      kvs.add(new KeyValue(Bytes.toBytes(i), bytes, value));
+      wal.append(bytes, bytes, kvs, false, System.currentTimeMillis());
+    }
+    // Now I should have written out lots of blocks.  Sync then read.
+    wal.sync();
+    reader = HLog.getReader(this.fs, walPath, this.conf);
+    count = 0;
+    while(reader.next(key)) count++;
+    assertEquals(total * 3, count);
+    reader.close();
+    // Close it and ensure that closed, Reader gets right length also.
+    wal.close();
+    reader = HLog.getReader(this.fs, walPath, this.conf);
+    count = 0;
+    while(reader.next(key)) count++;
+    assertEquals(total * 3, count);
+    reader.close();
   }
  
   private void verifySplits(List<Path> splits, final int howmany)