hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [1/5] hbase git commit: HBASE-16190 IntegrationTestDDLMasterFailover failed with IllegalArgumentException: n must be positive (Romil Choksi and Heng Chen)
Date Thu, 07 Jul 2016 23:50:22 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 74090faaf -> ed07a38d5
  refs/heads/branch-1.1 dcc1243f6 -> d0756e306
  refs/heads/branch-1.2 8f8736d17 -> 075f33a06
  refs/heads/branch-1.3 1ac755e40 -> ee63706ee
  refs/heads/master e9f5db721 -> 17edca634


HBASE-16190 IntegrationTestDDLMasterFailover failed with IllegalArgumentException: n must
be positive (Romil Choksi and Heng Chen)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/17edca63
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/17edca63
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/17edca63

Branch: refs/heads/master
Commit: 17edca6346722072a72ec7942e719214083e63a2
Parents: e9f5db7
Author: Enis Soztutar <enis@apache.org>
Authored: Thu Jul 7 16:34:08 2016 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Thu Jul 7 16:34:08 2016 -0700

----------------------------------------------------------------------
 .../hbase/IntegrationTestDDLMasterFailover.java | 24 ++++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/17edca63/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
index 4b75ce2..92c65d8 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
@@ -25,13 +25,17 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.math.RandomUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.client.*;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
 import org.apache.hadoop.hbase.testclassification.IntegrationTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.HBaseFsck;
@@ -246,12 +250,12 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase
{
     // NamespaceAction has implemented selectNamespace() shared by multiple namespace Actions
     protected NamespaceDescriptor selectNamespace(
         ConcurrentHashMap<String, NamespaceDescriptor> namespaceMap) {
-      // randomly select namespace from namespaceMap
-      if (namespaceMap.isEmpty()) {
-        return null;
-      }
       // synchronization to prevent removal from multiple threads
       synchronized (namespaceMap) {
+        // randomly select namespace from namespaceMap
+        if (namespaceMap.isEmpty()) {
+          return null;
+        }
         ArrayList<String> namespaceList = new ArrayList<String>(namespaceMap.keySet());
         String randomKey = namespaceList.get(RandomUtils.nextInt(namespaceList.size()));
         NamespaceDescriptor randomNsd = namespaceMap.get(randomKey);
@@ -386,12 +390,12 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase
{
     // TableAction has implemented selectTable() shared by multiple table Actions
     protected HTableDescriptor selectTable(ConcurrentHashMap<TableName, HTableDescriptor>
tableMap)
     {
-      // randomly select table from tableMap
-      if (tableMap.isEmpty()){
-        return null;
-      }
       // synchronization to prevent removal from multiple threads
       synchronized (tableMap){
+        // randomly select table from tableMap
+        if (tableMap.isEmpty()) {
+          return null;
+        }
         ArrayList<TableName> tableList = new ArrayList<TableName>(tableMap.keySet());
         TableName randomKey = tableList.get(RandomUtils.nextInt(tableList.size()));
         HTableDescriptor randomHtd = tableMap.get(randomKey);


Mime
View raw message