svn commit: r1202312 - in /hbase/trunk: CHANGES.txt src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

[tedyu]

Author: tedyu
Date: Tue Nov 15 17:15:04 2011
New Revision: 1202312

URL: http://svn.apache.org/viewvc?rev=1202312&view=rev
Log:
HBASE-4790  Occasional TestDistributedLogSplitting failure (Jinchao)

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1202312&r1=1202311&r2=1202312&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Nov 15 17:15:04 2011
@@ -438,6 +438,7 @@ Release 0.92.0 - Unreleased
    HBASE-4651  ConcurrentModificationException might be thrown in
                TestHCM.testConnectionUniqueness (Jinchao)
    HBASE-4518  TestServerCustomProtocol fails intermittently
+   HBASE-4790  Occasional TestDistributedLogSplitting failure (Jinchao)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1202312&r1=1202311&r2=1202312&view=diff
==============================================================================
--- 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
 (original)
+++ 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
 Tue Nov 15 17:15:04 2011
@@ -199,15 +199,22 @@ public class TestDistributedLogSplitting
     FileSystem fs = master.getMasterFileSystem().getFileSystem();
 
     List<RegionServerThread> rsts = cluster.getLiveRegionServerThreads();
-    HRegionServer hrs = rsts.get(0).getRegionServer();
+    
     Path rootdir = FSUtils.getRootDir(conf);
-    final Path logDir = new Path(rootdir,
-        HLog.getHLogDirectoryName(hrs.getServerName().toString()));
 
     installTable(new ZooKeeperWatcher(conf, "table-creation", null),
         "table", "family", 40);
     byte[] table = Bytes.toBytes("table");
-    List<HRegionInfo> regions = hrs.getOnlineRegions();
+    List<HRegionInfo> regions = null;
+    HRegionServer hrs = null;
+    for (int i = 0; i < NUM_RS; i++) {
+      hrs = rsts.get(i).getRegionServer();
+      regions = hrs.getOnlineRegions();
+      if (regions.size() != 0) break;
+    }
+    final Path logDir = new Path(rootdir, HLog.getHLogDirectoryName(hrs
+        .getServerName().toString()));
+    
     LOG.info("#regions = " + regions.size());
     Iterator<HRegionInfo> it = regions.iterator();
     while (it.hasNext()) {