HBASE-4651 ConcurrentModificationException might be thrown in

TestHCM.testConnectionUniqueness (Jinchao)


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1188259 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -399,6 +399,8 @@ Release 0.92.0 - Unreleased
    HBASE-4492  TestRollingRestart fails intermittently (Ted Yu and Ram)
    HBASE-4512  JVMClusterUtil throwing wrong exception when master thread cannot be created (Ram)
    HBASE-4479  TestMasterFailover failure in Hbase-0.92#17(Ram)
+   HBASE-4651  ConcurrentModificationException might be thrown in
+               TestHCM.testConnectionUniqueness (Jinchao)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

src/test/java/org/apache/hadoop/hbase/client/TestHCM.java

@@ -105,15 +105,11 @@ public class TestHCM {
       //      to remove them, so the LRU strategy does not work.
       configuration.set("someotherkey", String.valueOf(_randy.nextInt()));
       last = connection;
-      LOG.info("Cache Size: "
-          + getHConnectionManagerCacheSize() + ", Valid Keys: "
-          + getValidKeyCount());
+      LOG.info("Cache Size: " + getHConnectionManagerCacheSize());
       Thread.sleep(100);
     }
     Assert.assertEquals(1,
       getHConnectionManagerCacheSize());
-    Assert.assertEquals(1,
-      getValidKeyCount());
   }
 
   private static int getHConnectionManagerCacheSize()
@@ -126,21 +122,6 @@ public class TestHCM {
     return cache.size();
   }
 
-  private static int getValidKeyCount() throws SecurityException,
-  NoSuchFieldException, IllegalArgumentException,
-  IllegalAccessException {
-    Field cacheField =
-      HConnectionManager.class.getDeclaredField("HBASE_INSTANCES");
-    cacheField.setAccessible(true);
-    Map<?, ?> cache = (Map<?, ?>) cacheField.get(null);
-    List<Object> keys = new ArrayList<Object>(cache.keySet());
-    Set<Object> values = new HashSet<Object>();
-    for (Object key : keys) {
-      values.add(cache.get(key));
-    }
-    return values.size();
-  }
-
   /**
    * Test that when we delete a location using the first row of a region
    * that we really delete it.
@@ -220,9 +201,8 @@ public class TestHCM {
 
       previousConnection = currentConnection;
       LOG.info("The current HConnectionManager#HBASE_INSTANCES cache size is: "
-          + getHConnectionManagerCacheSize()
-          + ", and the number of valid keys is: " + getValidKeyCount());
+          + getHConnectionManagerCacheSize());
       Thread.sleep(50);
     }
   }
-}
+}