From 82802e878899e4e2df7bf9459e9d05ff43b300c8 Mon Sep 17 00:00:00 2001
From: Zhihong Yu <tedyu@apache.org>
Date: Sat, 27 Aug 2011 19:23:32 +0000
Subject: [PATCH] HBASE-4252  TestLogRolling's low-probability failure (Jieshan
 Bean)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1162426 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                         |  1 +
 .../hbase/regionserver/wal/TestLogRolling.java      | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0814a09a7c9..f21c717abbe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -219,6 +219,7 @@ Release 0.91.0 - Unreleased
                the encoded name (ramkrishna.s.vasudevan)
    HBASE-3229  HBASE-3229 Table creation, though using "async" call to master,
                can actually run for a while and cause RPC timeout (Ming Ma)
+   HBASE-4252  TestLogRolling's low-probability failure (Jieshan Bean)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
index abe7c55bb5f..79ac2183d75 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
@@ -19,7 +19,10 @@
  */
 package org.apache.hadoop.hbase.regionserver.wal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -29,7 +32,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -58,7 +60,6 @@ import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
-import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
 import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
 import org.apache.log4j.Level;
 import org.junit.After;
@@ -379,12 +380,12 @@ public class TestLogRolling  {
     dfsCluster.waitActive();
     // Force roll writer. The new log file will have the default replications,
     // and the LowReplication Roller will be enabled.
-    log.rollWriter();
+    log.rollWriter(true);
     batchWriteAndWait(table, 13, true, 10000);
-    assertTrue("LowReplication Roller should've been enabled",
-        log.isLowReplicationRollEnabled());
     assertTrue("New log file should have the default replication",
         log.getLogReplication() == fs.getDefaultReplication());
+    assertTrue("LowReplication Roller should've been enabled",
+        log.isLowReplicationRollEnabled());
   }
 
   /**