subject:"hbase git commit\: HBASE\-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished"

hbase git commit: HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished

2018-03-08 Thread zhangduo

Repository: hbase
Updated Branches:
  refs/heads/branch-2 c99e6f743 -> b4e297f3f


HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong 
condition to decide whether the assignment is finished


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

Branch: refs/heads/branch-2
Commit: b4e297f3f689a6468cf4fd9a4712dccad7b75dbf
Parents: c99e6f7
Author: zhangduo 
Authored: Thu Mar 8 18:03:04 2018 +0800
Committer: zhangduo 
Committed: Fri Mar 9 11:08:57 2018 +0800

--
 .../hadoop/hbase/master/TestRestartCluster.java | 32 +---
 1 file changed, 14 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b4e297f3/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
index 56976b3..088dff5 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableExistsException;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.master.assignment.RegionStates;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -45,7 +44,7 @@ import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({MasterTests.class, LargeTests.class})
+@Category({ MasterTests.class, LargeTests.class })
 public class TestRestartCluster {
 
   @ClassRule
@@ -60,7 +59,7 @@ public class TestRestartCluster {
   TableName.valueOf("restartTableTwo"),
   TableName.valueOf("restartTableThree")
   };
-  private static final byte [] FAMILY = Bytes.toBytes("family");
+  private static final byte[] FAMILY = Bytes.toBytes("family");
 
   @After public void tearDown() throws Exception {
 UTIL.shutdownMiniCluster();
@@ -115,17 +114,13 @@ public class TestRestartCluster {
   @Test
   public void testRetainAssignmentOnRestart() throws Exception {
 UTIL.startMiniCluster(2);
-while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
-  Threads.sleep(1);
-}
 // Turn off balancer
-UTIL.getMiniHBaseCluster().getMaster().
-  getMasterRpcServices().synchronousBalanceSwitch(false);
+
UTIL.getMiniHBaseCluster().getMaster().getMasterRpcServices().synchronousBalanceSwitch(false);
 LOG.info("\n\nCreating tables");
-for(TableName TABLE : TABLES) {
+for (TableName TABLE : TABLES) {
   UTIL.createTable(TABLE, FAMILY);
 }
-for(TableName TABLE : TABLES) {
+for (TableName TABLE : TABLES) {
   UTIL.waitTableEnabled(TABLE);
 }
 
@@ -157,6 +152,7 @@ public class TestRestartCluster {
 }
 
 LOG.info("\n\nShutting down HBase cluster");
+cluster.stopMaster(0);
 cluster.shutdown();
 cluster.waitUntilShutDown();
 
@@ -194,11 +190,8 @@ public class TestRestartCluster {
 }
 
 // Wait till master is initialized and all regions are assigned
-RegionStates regionStates = 
master.getAssignmentManager().getRegionStates();
-int expectedRegions = regionToRegionServerMap.size() + 1;
-while (!master.isInitialized()
-|| regionStates.getRegionAssignments().size() != expectedRegions) {
-  Threads.sleep(100);
+for (TableName TABLE : TABLES) {
+  UTIL.waitTableAvailable(TABLE);
 }
 
 snapshot = new SnapshotOfRegionAssignmentFromMeta(master.getConnection());
@@ -206,11 +199,14 @@ public class TestRestartCluster {
 Map newRegionToRegionServerMap =
   snapshot.getRegionToRegionServerMap();
 assertEquals(regionToRegionServerMap.size(), 
newRegionToRegionServerMap.size());
-for (Map.Entry entry: 
newRegionToRegionServerMap.entrySet()) {
-  if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) 
continue;
+for (Map.Entry entry : 
newRegionToRegionServerMap.entrySet()) {
+  if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) {
+continue;
+  }
   ServerName oldServer = regionToRegionServerMap.get(entry.getKey());
   ServerName currentServer = entry.getValue();
-  LOG.info("Key=" + entry.getKey() + " oldServer=" + oldServer + ", 
currentServe

hbase git commit: HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished

2018-03-08 Thread zhangduo

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 28ebac556 -> 58d840199


HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong 
condition to decide whether the assignment is finished


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

Branch: refs/heads/branch-2.0
Commit: 58d8401995df2b81bc1557cef270546cf174da7b
Parents: 28ebac5
Author: zhangduo 
Authored: Thu Mar 8 18:03:04 2018 +0800
Committer: zhangduo 
Committed: Fri Mar 9 11:09:01 2018 +0800

--
 .../hadoop/hbase/master/TestRestartCluster.java | 32 +---
 1 file changed, 14 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/58d84019/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
index 56976b3..088dff5 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableExistsException;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.master.assignment.RegionStates;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -45,7 +44,7 @@ import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({MasterTests.class, LargeTests.class})
+@Category({ MasterTests.class, LargeTests.class })
 public class TestRestartCluster {
 
   @ClassRule
@@ -60,7 +59,7 @@ public class TestRestartCluster {
   TableName.valueOf("restartTableTwo"),
   TableName.valueOf("restartTableThree")
   };
-  private static final byte [] FAMILY = Bytes.toBytes("family");
+  private static final byte[] FAMILY = Bytes.toBytes("family");
 
   @After public void tearDown() throws Exception {
 UTIL.shutdownMiniCluster();
@@ -115,17 +114,13 @@ public class TestRestartCluster {
   @Test
   public void testRetainAssignmentOnRestart() throws Exception {
 UTIL.startMiniCluster(2);
-while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
-  Threads.sleep(1);
-}
 // Turn off balancer
-UTIL.getMiniHBaseCluster().getMaster().
-  getMasterRpcServices().synchronousBalanceSwitch(false);
+
UTIL.getMiniHBaseCluster().getMaster().getMasterRpcServices().synchronousBalanceSwitch(false);
 LOG.info("\n\nCreating tables");
-for(TableName TABLE : TABLES) {
+for (TableName TABLE : TABLES) {
   UTIL.createTable(TABLE, FAMILY);
 }
-for(TableName TABLE : TABLES) {
+for (TableName TABLE : TABLES) {
   UTIL.waitTableEnabled(TABLE);
 }
 
@@ -157,6 +152,7 @@ public class TestRestartCluster {
 }
 
 LOG.info("\n\nShutting down HBase cluster");
+cluster.stopMaster(0);
 cluster.shutdown();
 cluster.waitUntilShutDown();
 
@@ -194,11 +190,8 @@ public class TestRestartCluster {
 }
 
 // Wait till master is initialized and all regions are assigned
-RegionStates regionStates = 
master.getAssignmentManager().getRegionStates();
-int expectedRegions = regionToRegionServerMap.size() + 1;
-while (!master.isInitialized()
-|| regionStates.getRegionAssignments().size() != expectedRegions) {
-  Threads.sleep(100);
+for (TableName TABLE : TABLES) {
+  UTIL.waitTableAvailable(TABLE);
 }
 
 snapshot = new SnapshotOfRegionAssignmentFromMeta(master.getConnection());
@@ -206,11 +199,14 @@ public class TestRestartCluster {
 Map newRegionToRegionServerMap =
   snapshot.getRegionToRegionServerMap();
 assertEquals(regionToRegionServerMap.size(), 
newRegionToRegionServerMap.size());
-for (Map.Entry entry: 
newRegionToRegionServerMap.entrySet()) {
-  if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) 
continue;
+for (Map.Entry entry : 
newRegionToRegionServerMap.entrySet()) {
+  if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) {
+continue;
+  }
   ServerName oldServer = regionToRegionServerMap.get(entry.getKey());
   ServerName currentServer = entry.getValue();
-  LOG.info("Key=" + entry.getKey() + " oldServer=" + oldServer + ", 
currentS

hbase git commit: HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished

2018-03-08 Thread zhangduo

Repository: hbase
Updated Branches:
  refs/heads/master 4e821d491 -> a513678a7


HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong 
condition to decide whether the assignment is finished


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

Branch: refs/heads/master
Commit: a513678a793d07302e6314f4c678bea9ae5aa133
Parents: 4e821d4
Author: zhangduo 
Authored: Thu Mar 8 18:03:04 2018 +0800
Committer: zhangduo 
Committed: Fri Mar 9 11:08:44 2018 +0800

--
 .../hadoop/hbase/master/TestRestartCluster.java | 32 +---
 1 file changed, 14 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a513678a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
index 56976b3..088dff5 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableExistsException;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.master.assignment.RegionStates;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -45,7 +44,7 @@ import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({MasterTests.class, LargeTests.class})
+@Category({ MasterTests.class, LargeTests.class })
 public class TestRestartCluster {
 
   @ClassRule
@@ -60,7 +59,7 @@ public class TestRestartCluster {
   TableName.valueOf("restartTableTwo"),
   TableName.valueOf("restartTableThree")
   };
-  private static final byte [] FAMILY = Bytes.toBytes("family");
+  private static final byte[] FAMILY = Bytes.toBytes("family");
 
   @After public void tearDown() throws Exception {
 UTIL.shutdownMiniCluster();
@@ -115,17 +114,13 @@ public class TestRestartCluster {
   @Test
   public void testRetainAssignmentOnRestart() throws Exception {
 UTIL.startMiniCluster(2);
-while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
-  Threads.sleep(1);
-}
 // Turn off balancer
-UTIL.getMiniHBaseCluster().getMaster().
-  getMasterRpcServices().synchronousBalanceSwitch(false);
+
UTIL.getMiniHBaseCluster().getMaster().getMasterRpcServices().synchronousBalanceSwitch(false);
 LOG.info("\n\nCreating tables");
-for(TableName TABLE : TABLES) {
+for (TableName TABLE : TABLES) {
   UTIL.createTable(TABLE, FAMILY);
 }
-for(TableName TABLE : TABLES) {
+for (TableName TABLE : TABLES) {
   UTIL.waitTableEnabled(TABLE);
 }
 
@@ -157,6 +152,7 @@ public class TestRestartCluster {
 }
 
 LOG.info("\n\nShutting down HBase cluster");
+cluster.stopMaster(0);
 cluster.shutdown();
 cluster.waitUntilShutDown();
 
@@ -194,11 +190,8 @@ public class TestRestartCluster {
 }
 
 // Wait till master is initialized and all regions are assigned
-RegionStates regionStates = 
master.getAssignmentManager().getRegionStates();
-int expectedRegions = regionToRegionServerMap.size() + 1;
-while (!master.isInitialized()
-|| regionStates.getRegionAssignments().size() != expectedRegions) {
-  Threads.sleep(100);
+for (TableName TABLE : TABLES) {
+  UTIL.waitTableAvailable(TABLE);
 }
 
 snapshot = new SnapshotOfRegionAssignmentFromMeta(master.getConnection());
@@ -206,11 +199,14 @@ public class TestRestartCluster {
 Map newRegionToRegionServerMap =
   snapshot.getRegionToRegionServerMap();
 assertEquals(regionToRegionServerMap.size(), 
newRegionToRegionServerMap.size());
-for (Map.Entry entry: 
newRegionToRegionServerMap.entrySet()) {
-  if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) 
continue;
+for (Map.Entry entry : 
newRegionToRegionServerMap.entrySet()) {
+  if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) {
+continue;
+  }
   ServerName oldServer = regionToRegionServerMap.get(entry.getKey());
   ServerName currentServer = entry.getValue();
-  LOG.info("Key=" + entry.getKey() + " oldServer=" + oldServer + ", 
currentServer="

hbase git commit: HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished

hbase git commit: HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished

hbase git commit: HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished

3 matches

Site Navigation

Mail list logo

Footer information