[43/50] [abbrv] hbase git commit: Fix broke unit test. Use nice facility I found in procedure testing utility in a few other tests... in place of checking for symptom

2017-05-23 Thread stack 
Fix broke unit test. Use nice facility I found in procedure testing utility in 
a few other tests... in place of checking for symptom


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

Branch: refs/heads/HBASE-14614
Commit: 2e780735860302c815cc598f8b330aafa90d2ac7
Parents: 18eaefb
Author: Michael Stack 
Authored: Fri May 12 17:07:27 2017 -0700
Committer: Michael Stack 
Committed: Tue May 23 08:36:53 2017 -0700

--
 .../hadoop/hbase/master/CatalogJanitor.java |  8 --
 .../hadoop/hbase/master/TestCatalogJanitor.java | 28 
 .../TestSplitTransactionOnCluster.java  |  3 ++-
 3 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/2e780735/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
index 2331d8f..7d43f2f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
@@ -45,6 +45,7 @@ import 
org.apache.hadoop.hbase.master.assignment.AssignmentManager;
 import org.apache.hadoop.hbase.master.assignment.GCMergedRegionsProcedure;
 import org.apache.hadoop.hbase.master.assignment.GCRegionProcedure;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
+import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
 import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -54,6 +55,8 @@ import org.apache.hadoop.hbase.util.PairOfSameType;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.util.Triple;
 
+import com.google.common.annotations.VisibleForTesting;
+
 /**
  * A janitor for the catalog tables.  Scans the hbase:meta catalog
  * table on a period looking for unused regions to garbage collect.
@@ -66,6 +69,7 @@ public class CatalogJanitor extends ScheduledChore {
   private final AtomicBoolean enabled = new AtomicBoolean(true);
   private final MasterServices services;
   private final Connection connection;
+  // PID of the last Procedure launched herein. Keep around for Tests.
 
   CatalogJanitor(final MasterServices services) {
 super("CatalogJanitor-" + services.getServerName().toShortString(), 
services,
@@ -215,8 +219,8 @@ public class CatalogJanitor extends ScheduledChore {
   + regionB.getShortNameToLog()
   + " from fs because merged region no longer holds references");
   ProcedureExecutor pe = 
this.services.getMasterProcedureExecutor();
-  pe.submitProcedure(new 
GCMergedRegionsProcedure(pe.getEnvironment(),mergedRegion,
-  regionA, regionB));
+  pe.submitProcedure(new GCMergedRegionsProcedure(pe.getEnvironment(),
+  mergedRegion, regionA, regionB));
   return true;
 }
 return false;

http://git-wip-us.apache.org/repos/asf/hbase/blob/2e780735/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
index 5c082a4..59e8fb3 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
@@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.io.Reference;
 import 
org.apache.hadoop.hbase.master.CatalogJanitor.SplitParentFirstComparator;
 import org.apache.hadoop.hbase.master.assignment.MockMasterServices;
+import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
 import org.apache.hadoop.hbase.regionserver.ChunkCreator;
 import org.apache.hadoop.hbase.regionserver.HStore;
 import org.apache.hadoop.hbase.regionserver.MemStoreLABImpl;
@@ -135,14 +136,14 @@ public class TestCatalogJanitor {
 // Add a parentdir for kicks so can check it gets removed by the 
catalogjanitor.
 fs.mkdirs(parentdir);
 assertFalse(this.janitor.cleanParent(parent, r));
+
ProcedureTestingUtility.waitAllProcedures(masterServices.getMasterProcedureExecutor());
+assertTrue(fs.exists(parentdir));
 // Remove

[50/50] [abbrv] hbase git commit: Fix broke unit test. Use nice facility I found in procedure testing utility in a few other tests... in place of checking for symptom

2017-05-23 Thread stack 
Fix broke unit test. Use nice facility I found in procedure testing utility in 
a few other tests... in place of checking for symptom


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

Branch: refs/heads/HBASE-14614
Commit: 42346646a17e001cb21d95682709f8c9a76c3e8c
Parents: ea8f54f
Author: Michael Stack 
Authored: Fri May 12 17:07:27 2017 -0700
Committer: Michael Stack 
Committed: Tue May 23 00:33:03 2017 -0700

--
 .../hadoop/hbase/master/CatalogJanitor.java |  8 --
 .../hadoop/hbase/master/TestCatalogJanitor.java | 28 
 .../TestSplitTransactionOnCluster.java  |  3 ++-
 3 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/42346646/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
index 2331d8f..7d43f2f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
@@ -45,6 +45,7 @@ import 
org.apache.hadoop.hbase.master.assignment.AssignmentManager;
 import org.apache.hadoop.hbase.master.assignment.GCMergedRegionsProcedure;
 import org.apache.hadoop.hbase.master.assignment.GCRegionProcedure;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
+import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
 import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -54,6 +55,8 @@ import org.apache.hadoop.hbase.util.PairOfSameType;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.util.Triple;
 
+import com.google.common.annotations.VisibleForTesting;
+
 /**
  * A janitor for the catalog tables.  Scans the hbase:meta catalog
  * table on a period looking for unused regions to garbage collect.
@@ -66,6 +69,7 @@ public class CatalogJanitor extends ScheduledChore {
   private final AtomicBoolean enabled = new AtomicBoolean(true);
   private final MasterServices services;
   private final Connection connection;
+  // PID of the last Procedure launched herein. Keep around for Tests.
 
   CatalogJanitor(final MasterServices services) {
 super("CatalogJanitor-" + services.getServerName().toShortString(), 
services,
@@ -215,8 +219,8 @@ public class CatalogJanitor extends ScheduledChore {
   + regionB.getShortNameToLog()
   + " from fs because merged region no longer holds references");
   ProcedureExecutor pe = 
this.services.getMasterProcedureExecutor();
-  pe.submitProcedure(new 
GCMergedRegionsProcedure(pe.getEnvironment(),mergedRegion,
-  regionA, regionB));
+  pe.submitProcedure(new GCMergedRegionsProcedure(pe.getEnvironment(),
+  mergedRegion, regionA, regionB));
   return true;
 }
 return false;

http://git-wip-us.apache.org/repos/asf/hbase/blob/42346646/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
index 5c082a4..59e8fb3 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
@@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.io.Reference;
 import 
org.apache.hadoop.hbase.master.CatalogJanitor.SplitParentFirstComparator;
 import org.apache.hadoop.hbase.master.assignment.MockMasterServices;
+import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
 import org.apache.hadoop.hbase.regionserver.ChunkCreator;
 import org.apache.hadoop.hbase.regionserver.HStore;
 import org.apache.hadoop.hbase.regionserver.MemStoreLABImpl;
@@ -135,14 +136,14 @@ public class TestCatalogJanitor {
 // Add a parentdir for kicks so can check it gets removed by the 
catalogjanitor.
 fs.mkdirs(parentdir);
 assertFalse(this.janitor.cleanParent(parent, r));
+
ProcedureTestingUtility.waitAllProcedures(masterServices.getMasterProcedureExecutor());
+assertTrue(fs.exists(parentdir));
 // Remove

hbase git commit: Fix broke unit test. Use nice facility I found in procedure testing utility in a few other tests... in place of checking for symptom

2017-05-12 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/HBASE-14614 4ab52f2c1 -> 61ed02691


Fix broke unit test. Use nice facility I found in procedure testing utility in 
a few other tests... in place of checking for symptom


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

Branch: refs/heads/HBASE-14614
Commit: 61ed02691bf4dd66fb5ac4e5205a884a908eea00
Parents: 4ab52f2
Author: Michael Stack 
Authored: Fri May 12 17:07:27 2017 -0700
Committer: Michael Stack 
Committed: Fri May 12 17:07:27 2017 -0700

--
 .../hadoop/hbase/master/CatalogJanitor.java |  8 --
 .../hadoop/hbase/master/TestCatalogJanitor.java | 28 
 .../TestSplitTransactionOnCluster.java  |  3 ++-
 3 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/61ed0269/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
index 2331d8f..7d43f2f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
@@ -45,6 +45,7 @@ import 
org.apache.hadoop.hbase.master.assignment.AssignmentManager;
 import org.apache.hadoop.hbase.master.assignment.GCMergedRegionsProcedure;
 import org.apache.hadoop.hbase.master.assignment.GCRegionProcedure;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
+import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
 import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -54,6 +55,8 @@ import org.apache.hadoop.hbase.util.PairOfSameType;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.util.Triple;
 
+import com.google.common.annotations.VisibleForTesting;
+
 /**
  * A janitor for the catalog tables.  Scans the hbase:meta catalog
  * table on a period looking for unused regions to garbage collect.
@@ -66,6 +69,7 @@ public class CatalogJanitor extends ScheduledChore {
   private final AtomicBoolean enabled = new AtomicBoolean(true);
   private final MasterServices services;
   private final Connection connection;
+  // PID of the last Procedure launched herein. Keep around for Tests.
 
   CatalogJanitor(final MasterServices services) {
 super("CatalogJanitor-" + services.getServerName().toShortString(), 
services,
@@ -215,8 +219,8 @@ public class CatalogJanitor extends ScheduledChore {
   + regionB.getShortNameToLog()
   + " from fs because merged region no longer holds references");
   ProcedureExecutor pe = 
this.services.getMasterProcedureExecutor();
-  pe.submitProcedure(new 
GCMergedRegionsProcedure(pe.getEnvironment(),mergedRegion,
-  regionA, regionB));
+  pe.submitProcedure(new GCMergedRegionsProcedure(pe.getEnvironment(),
+  mergedRegion, regionA, regionB));
   return true;
 }
 return false;

http://git-wip-us.apache.org/repos/asf/hbase/blob/61ed0269/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
index 5c082a4..59e8fb3 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
@@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.io.Reference;
 import 
org.apache.hadoop.hbase.master.CatalogJanitor.SplitParentFirstComparator;
 import org.apache.hadoop.hbase.master.assignment.MockMasterServices;
+import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
 import org.apache.hadoop.hbase.regionserver.ChunkCreator;
 import org.apache.hadoop.hbase.regionserver.HStore;
 import org.apache.hadoop.hbase.regionserver.MemStoreLABImpl;
@@ -135,14 +136,14 @@ public class TestCatalogJanitor {
 // Add a parentdir for kicks so can check it gets removed by the 
catalogjanitor.
 fs.mkdirs(parentdir);
 assertFalse(this.janitor.cleanParent(parent, r));
+