date:20180604

[4/5] hbase git commit: HBASE-20670 NPE in HMaster#isInMaintenanceMode

2018-06-04 Thread apurtell

HBASE-20670 NPE in HMaster#isInMaintenanceMode


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

Branch: refs/heads/branch-2
Commit: d7b09de854dddfc09b8e00638e07eb1b8c1b2844
Parents: 3673e54
Author: Andrew Purtell 
Authored: Fri Jun 1 15:22:18 2018 -0700
Committer: Andrew Purtell 
Committed: Mon Jun 4 15:19:45 2018 -0700

--
 .../org/apache/hadoop/hbase/master/HMaster.java | 25 
 .../hadoop/hbase/master/MasterRpcServices.java  |  6 -
 .../hadoop/hbase/master/MasterServices.java |  3 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d7b09de8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 33d2e61..7349aa6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2822,7 +2822,10 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* @return true if master is in maintenanceMode
*/
   @Override
-  public boolean isInMaintenanceMode() {
+  public boolean isInMaintenanceMode() throws IOException {
+if (!isInitialized()) {
+  throw new PleaseHoldException("Master is initializing");
+}
 return maintenanceModeTracker.isInMaintenanceMode();
   }
 
@@ -3359,7 +3362,11 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* @return The state of the load balancer, or false if the load balancer 
isn't defined.
*/
   public boolean isBalancerOn() {
-if (null == loadBalancerTracker || isInMaintenanceMode()) {
+try {
+  if (null == loadBalancerTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return loadBalancerTracker.isBalancerOn();
@@ -3370,8 +3377,12 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* false is returned.
*/
   public boolean isNormalizerOn() {
-return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
-false: regionNormalizerTracker.isNormalizerOn();
+try {
+  return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
+  false: regionNormalizerTracker.isNormalizerOn();
+} catch (IOException e) {
+  return false;
+}
   }
 
   /**
@@ -3382,7 +3393,11 @@ public class HMaster extends HRegionServer implements 
MasterServices {
*/
   @Override
   public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {
-if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+try {
+  if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return splitOrMergeTracker.isSplitOrMergeEnabled(switchType);

http://git-wip-us.apache.org/repos/asf/hbase/blob/d7b09de8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index 1252501..932d490 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -1489,7 +1489,11 @@ public class MasterRpcServices extends RSRpcServices
   final RpcController controller,
   final IsInMaintenanceModeRequest request) throws ServiceException {
 IsInMaintenanceModeResponse.Builder response = 
IsInMaintenanceModeResponse.newBuilder();
-response.setInMaintenanceMode(master.isInMaintenanceMode());
+try {
+  response.setInMaintenanceMode(master.isInMaintenanceMode());
+} catch (IOException e) {
+  throw new ServiceException(e);
+}
 return response.build();
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/d7b09de8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
index 52046c5..3d2b9af 100644
---

[2/5] hbase git commit: HBASE-20670 NPE in HMaster#isInMaintenanceMode

2018-06-04 Thread apurtell

HBASE-20670 NPE in HMaster#isInMaintenanceMode


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

Branch: refs/heads/branch-1
Commit: 409531209ea251e76360ab9873caea12ae82245f
Parents: 3ea999d
Author: Andrew Purtell 
Authored: Fri Jun 1 15:22:18 2018 -0700
Committer: Andrew Purtell 
Committed: Mon Jun 4 13:03:16 2018 -0700

--
 .../org/apache/hadoop/hbase/master/HMaster.java | 25 
 .../hadoop/hbase/master/MasterRpcServices.java  |  6 -
 .../hadoop/hbase/master/MasterServices.java |  5 ++--
 3 files changed, 28 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/40953120/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index a2b43e9..8bff5d2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2710,7 +2710,10 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* @return true if master is in maintenanceMode
*/
   @Override
-  public boolean isInMaintenanceMode() {
+  public boolean isInMaintenanceMode() throws IOException {
+if (!isInitialized()) {
+  throw new PleaseHoldException("Master is initializing");
+}
 return maintenanceModeTracker.isInMaintenanceMode();
   }
 
@@ -3208,7 +3211,11 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* @return The state of the load balancer, or false if the load balancer 
isn't defined.
*/
   public boolean isBalancerOn() {
-if (null == loadBalancerTracker || isInMaintenanceMode()) {
+try {
+  if (null == loadBalancerTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return loadBalancerTracker.isBalancerOn();
@@ -3219,8 +3226,12 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* false is returned.
*/
   public boolean isNormalizerOn() {
-return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
-false: regionNormalizerTracker.isNormalizerOn();
+try {
+  return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
+  false: regionNormalizerTracker.isNormalizerOn();
+} catch (IOException e) {
+  return false;
+}
   }
 
   /**
@@ -3230,7 +3241,11 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* @return The state of the switch
*/
   public boolean isSplitOrMergeEnabled(Admin.MasterSwitchType switchType) {
-if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+try {
+  if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return splitOrMergeTracker.isSplitOrMergeEnabled(switchType);

http://git-wip-us.apache.org/repos/asf/hbase/blob/40953120/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index 0ccdc27..c238746 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -1432,7 +1432,11 @@ public class MasterRpcServices extends RSRpcServices
   final RpcController controller,
   final IsInMaintenanceModeRequest request) throws ServiceException {
 IsInMaintenanceModeResponse.Builder response = 
IsInMaintenanceModeResponse.newBuilder();
-response.setInMaintenanceMode(master.isInMaintenanceMode());
+try {
+  response.setInMaintenanceMode(master.isInMaintenanceMode());
+} catch (IOException e) {
+  throw new ServiceException(e);
+}
 return response.build();
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/40953120/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java

[3/5] hbase git commit: HBASE-20670 NPE in HMaster#isInMaintenanceMode

2018-06-04 Thread apurtell

HBASE-20670 NPE in HMaster#isInMaintenanceMode


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

Branch: refs/heads/branch-1.4
Commit: 8c4a66fc59dcef4c34e3e84a28af3ad176fb94e4
Parents: 95e5dee
Author: Andrew Purtell 
Authored: Fri Jun 1 15:22:18 2018 -0700
Committer: Andrew Purtell 
Committed: Mon Jun 4 13:03:23 2018 -0700

--
 .../org/apache/hadoop/hbase/master/HMaster.java | 25 
 .../hadoop/hbase/master/MasterRpcServices.java  |  6 -
 .../hadoop/hbase/master/MasterServices.java |  5 ++--
 3 files changed, 28 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8c4a66fc/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 59e4437..b8d8435 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2697,7 +2697,10 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* @return true if master is in maintenanceMode
*/
   @Override
-  public boolean isInMaintenanceMode() {
+  public boolean isInMaintenanceMode() throws IOException {
+if (!isInitialized()) {
+  throw new PleaseHoldException("Master is initializing");
+}
 return maintenanceModeTracker.isInMaintenanceMode();
   }
 
@@ -3195,7 +3198,11 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* @return The state of the load balancer, or false if the load balancer 
isn't defined.
*/
   public boolean isBalancerOn() {
-if (null == loadBalancerTracker || isInMaintenanceMode()) {
+try {
+  if (null == loadBalancerTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return loadBalancerTracker.isBalancerOn();
@@ -3206,8 +3213,12 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* false is returned.
*/
   public boolean isNormalizerOn() {
-return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
-false: regionNormalizerTracker.isNormalizerOn();
+try {
+  return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
+  false: regionNormalizerTracker.isNormalizerOn();
+} catch (IOException e) {
+  return false;
+}
   }
 
   /**
@@ -3217,7 +3228,11 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
* @return The state of the switch
*/
   public boolean isSplitOrMergeEnabled(Admin.MasterSwitchType switchType) {
-if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+try {
+  if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return splitOrMergeTracker.isSplitOrMergeEnabled(switchType);

http://git-wip-us.apache.org/repos/asf/hbase/blob/8c4a66fc/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index 08a2033..416983f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -1456,7 +1456,11 @@ public class MasterRpcServices extends RSRpcServices
   final RpcController controller,
   final IsInMaintenanceModeRequest request) throws ServiceException {
 IsInMaintenanceModeResponse.Builder response = 
IsInMaintenanceModeResponse.newBuilder();
-response.setInMaintenanceMode(master.isInMaintenanceMode());
+try {
+  response.setInMaintenanceMode(master.isInMaintenanceMode());
+} catch (IOException e) {
+  throw new ServiceException(e);
+}
 return response.build();
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/8c4a66fc/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java

[1/5] hbase git commit: HBASE-20670 NPE in HMaster#isInMaintenanceMode

2018-06-04 Thread apurtell

Repository: hbase
Updated Branches:
  refs/heads/branch-1 3ea999d95 -> 409531209
  refs/heads/branch-1.4 95e5dee54 -> 8c4a66fc5
  refs/heads/branch-2 3673e54a4 -> d7b09de85
  refs/heads/branch-2.0 1661543c1 -> 71b8e03a5
  refs/heads/master 832f67d48 -> a45763df5


HBASE-20670 NPE in HMaster#isInMaintenanceMode


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

Branch: refs/heads/branch-2.0
Commit: 71b8e03a582f7229ff4ddc4b90c76c8503522008
Parents: 1661543
Author: Andrew Purtell 
Authored: Fri Jun 1 15:22:18 2018 -0700
Committer: Andrew Purtell 
Committed: Mon Jun 4 13:02:44 2018 -0700

--
 .../org/apache/hadoop/hbase/master/HMaster.java | 25 
 .../hadoop/hbase/master/MasterRpcServices.java  |  6 -
 .../hadoop/hbase/master/MasterServices.java |  3 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/71b8e03a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index d29ac70..214a02e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2796,7 +2796,10 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* @return true if master is in maintenanceMode
*/
   @Override
-  public boolean isInMaintenanceMode() {
+  public boolean isInMaintenanceMode() throws IOException {
+if (!isInitialized()) {
+  throw new PleaseHoldException("Master is initializing");
+}
 return maintenanceModeTracker.isInMaintenanceMode();
   }
 
@@ -,7 +3336,11 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* @return The state of the load balancer, or false if the load balancer 
isn't defined.
*/
   public boolean isBalancerOn() {
-if (null == loadBalancerTracker || isInMaintenanceMode()) {
+try {
+  if (null == loadBalancerTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return loadBalancerTracker.isBalancerOn();
@@ -3344,8 +3351,12 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* false is returned.
*/
   public boolean isNormalizerOn() {
-return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
-false: regionNormalizerTracker.isNormalizerOn();
+try {
+  return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
+  false: regionNormalizerTracker.isNormalizerOn();
+} catch (IOException e) {
+  return false;
+}
   }
 
   /**
@@ -3356,7 +3367,11 @@ public class HMaster extends HRegionServer implements 
MasterServices {
*/
   @Override
   public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {
-if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+try {
+  if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return splitOrMergeTracker.isSplitOrMergeEnabled(switchType);

http://git-wip-us.apache.org/repos/asf/hbase/blob/71b8e03a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index 257e99b..0651189 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -1485,7 +1485,11 @@ public class MasterRpcServices extends RSRpcServices
   final RpcController controller,
   final IsInMaintenanceModeRequest request) throws ServiceException {
 IsInMaintenanceModeResponse.Builder response = 
IsInMaintenanceModeResponse.newBuilder();
-response.setInMaintenanceMode(master.isInMaintenanceMode());
+try {
+  response.setInMaintenanceMode(master.isInMaintenanceMode());
+} catch (IOException e) {
+  throw new ServiceException(e);
+}
 return response.build();
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/71b8e03a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java

[5/5] hbase git commit: HBASE-20670 NPE in HMaster#isInMaintenanceMode

2018-06-04 Thread apurtell

HBASE-20670 NPE in HMaster#isInMaintenanceMode


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

Branch: refs/heads/master
Commit: a45763df553edd006c2168df3a64f0f2cdf2366f
Parents: 832f67d
Author: Andrew Purtell 
Authored: Fri Jun 1 15:22:18 2018 -0700
Committer: Andrew Purtell 
Committed: Mon Jun 4 15:19:47 2018 -0700

--
 .../org/apache/hadoop/hbase/master/HMaster.java | 25 
 .../hadoop/hbase/master/MasterRpcServices.java  |  6 -
 .../hadoop/hbase/master/MasterServices.java |  3 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a45763df/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index b565963..0871482 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2822,7 +2822,10 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* @return true if master is in maintenanceMode
*/
   @Override
-  public boolean isInMaintenanceMode() {
+  public boolean isInMaintenanceMode() throws IOException {
+if (!isInitialized()) {
+  throw new PleaseHoldException("Master is initializing");
+}
 return maintenanceModeTracker.isInMaintenanceMode();
   }
 
@@ -3359,7 +3362,11 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* @return The state of the load balancer, or false if the load balancer 
isn't defined.
*/
   public boolean isBalancerOn() {
-if (null == loadBalancerTracker || isInMaintenanceMode()) {
+try {
+  if (null == loadBalancerTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return loadBalancerTracker.isBalancerOn();
@@ -3370,8 +3377,12 @@ public class HMaster extends HRegionServer implements 
MasterServices {
* false is returned.
*/
   public boolean isNormalizerOn() {
-return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
-false: regionNormalizerTracker.isNormalizerOn();
+try {
+  return (null == regionNormalizerTracker || isInMaintenanceMode()) ?
+  false: regionNormalizerTracker.isNormalizerOn();
+} catch (IOException e) {
+  return false;
+}
   }
 
   /**
@@ -3382,7 +3393,11 @@ public class HMaster extends HRegionServer implements 
MasterServices {
*/
   @Override
   public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {
-if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+try {
+  if (null == splitOrMergeTracker || isInMaintenanceMode()) {
+return false;
+  }
+} catch (IOException e) {
   return false;
 }
 return splitOrMergeTracker.isSplitOrMergeEnabled(switchType);

http://git-wip-us.apache.org/repos/asf/hbase/blob/a45763df/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index fa4ddf5..d3202ce 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -1491,7 +1491,11 @@ public class MasterRpcServices extends RSRpcServices
   final RpcController controller,
   final IsInMaintenanceModeRequest request) throws ServiceException {
 IsInMaintenanceModeResponse.Builder response = 
IsInMaintenanceModeResponse.newBuilder();
-response.setInMaintenanceMode(master.isInMaintenanceMode());
+try {
+  response.setInMaintenanceMode(master.isInMaintenanceMode());
+} catch (IOException e) {
+  throw new ServiceException(e);
+}
 return response.build();
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/a45763df/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
index 52046c5..3d2b9af 100644
---

hbase git commit: HBASE-20677 Backport test of HBASE-20566 'Creating a system table after enabling rsgroup feature puts region into RIT' to branch-2

2018-06-04 Thread tedyu

Repository: hbase
Updated Branches:
  refs/heads/master d99ba62b1 -> 832f67d48


HBASE-20677 Backport test of HBASE-20566 'Creating a system table after 
enabling rsgroup feature puts region into RIT' to branch-2

Signed-off-by: tedyu 


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

Branch: refs/heads/master
Commit: 832f67d483985bc6cf488bb8ecef32280fdee668
Parents: d99ba62
Author: Nihal Jain 
Authored: Tue Jun 5 01:57:03 2018 +0530
Committer: tedyu 
Committed: Mon Jun 4 14:30:04 2018 -0700

--
 .../hadoop/hbase/rsgroup/TestRSGroups.java  | 38 ++--
 1 file changed, 28 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/832f67d4/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
--
diff --git 
a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java 
b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
index c2fc0f1..f9dafd4 100644
--- 
a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
+++ 
b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
@@ -89,14 +89,16 @@ public class TestRSGroups extends TestRSGroupsBase {
 RSGroupBasedLoadBalancer.class.getName());
 
TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
 RSGroupAdminEndpoint.class.getName() + "," + 
CPMasterObserver.class.getName());
-// Enable quota for testRSGroupsWithHBaseQuota()
-TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
 TEST_UTIL.startMiniCluster(NUM_SLAVES_BASE - 1);
 TEST_UTIL.getConfiguration().setInt(
 ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,
 NUM_SLAVES_BASE - 1);
 
TEST_UTIL.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, 
true);
 
+initialize();
+  }
+
+  private static void initialize() throws Exception {
 admin = TEST_UTIL.getAdmin();
 cluster = TEST_UTIL.getHBaseCluster();
 master = ((MiniHBaseCluster)cluster).getMaster();
@@ -178,8 +180,8 @@ public class TestRSGroups extends TestRSGroupsBase {
 assertEquals(4, defaultInfo.getServers().size());
 // Assignment of root and meta regions.
 int count = 
master.getAssignmentManager().getRegionStates().getRegionAssignments().size();
-//4 meta,namespace, group, quota
-assertEquals(4, count);
+//3 meta,namespace, group
+assertEquals(3, count);
   }
 
   @Test
@@ -525,11 +527,27 @@ public class TestRSGroups extends TestRSGroupsBase {
 
   @Test
   public void testRSGroupsWithHBaseQuota() throws Exception {
-TEST_UTIL.waitFor(9, new Waiter.Predicate() {
-  @Override
-  public boolean evaluate() throws Exception {
-return admin.isTableAvailable(QuotaTableUtil.QUOTA_TABLE_NAME);
-  }
-});
+TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
+restartHBaseCluster();
+try {
+  TEST_UTIL.waitFor(9, new Waiter.Predicate() {
+@Override
+public boolean evaluate() throws Exception {
+  return admin.isTableAvailable(QuotaTableUtil.QUOTA_TABLE_NAME);
+}
+  });
+} finally {
+  TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, false);
+  restartHBaseCluster();
+}
+  }
+
+  private void restartHBaseCluster() throws Exception {
+LOG.info("\n\nShutting down cluster");
+TEST_UTIL.shutdownMiniHBaseCluster();
+LOG.info("\n\nSleeping a bit");
+Thread.sleep(2000);
+TEST_UTIL.restartHBaseCluster(NUM_SLAVES_BASE - 1);
+initialize();
   }
 }

hbase git commit: HBASE-20677 Backport test of HBASE-20566 'Creating a system table after enabling rsgroup feature puts region into RIT' to branch-2

2018-06-04 Thread tedyu

Repository: hbase
Updated Branches:
  refs/heads/branch-2 063eefe3b -> 3673e54a4


HBASE-20677 Backport test of HBASE-20566 'Creating a system table after 
enabling rsgroup feature puts region into RIT' to branch-2

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-2
Commit: 3673e54a400f8189a80888e3752dc26924e91393
Parents: 063eefe
Author: Nihal Jain 
Authored: Tue Jun 5 00:38:01 2018 +0530
Committer: tedyu 
Committed: Mon Jun 4 13:24:51 2018 -0700

--
 .../hadoop/hbase/rsgroup/TestRSGroups.java  | 31 
 1 file changed, 31 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/3673e54a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
--
diff --git 
a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java 
b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
index a5dcfad..5c2e64c 100644
--- 
a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
+++ 
b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
@@ -47,6 +47,8 @@ import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
 import org.apache.hadoop.hbase.master.ServerManager;
 import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
 import org.apache.hadoop.hbase.net.Address;
+import org.apache.hadoop.hbase.quotas.QuotaTableUtil;
+import org.apache.hadoop.hbase.quotas.QuotaUtil;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.After;
@@ -93,6 +95,10 @@ public class TestRSGroups extends TestRSGroupsBase {
 NUM_SLAVES_BASE - 1);
 
TEST_UTIL.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, 
true);
 
+initialize();
+  }
+
+  private static void initialize() throws Exception {
 admin = TEST_UTIL.getAdmin();
 cluster = TEST_UTIL.getHBaseCluster();
 master = ((MiniHBaseCluster)cluster).getMaster();
@@ -433,4 +439,29 @@ public class TestRSGroups extends TestRSGroupsBase {
 admin.cloneSnapshot(snapshotName, clonedTableName);
   }
 
+  @Test
+  public void testRSGroupsWithHBaseQuota() throws Exception {
+TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
+restartHBaseCluster();
+try {
+  TEST_UTIL.waitFor(9, new Waiter.Predicate() {
+@Override
+public boolean evaluate() throws Exception {
+  return admin.isTableAvailable(QuotaTableUtil.QUOTA_TABLE_NAME);
+}
+  });
+} finally {
+  TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, false);
+  restartHBaseCluster();
+}
+  }
+
+  private void restartHBaseCluster() throws Exception {
+LOG.info("\n\nShutting down cluster");
+TEST_UTIL.shutdownMiniHBaseCluster();
+LOG.info("\n\nSleeping a bit");
+Thread.sleep(2000);
+TEST_UTIL.restartHBaseCluster(NUM_SLAVES_BASE - 1);
+initialize();
+  }
 }

hbase git commit: HBASE-20634 Reopen region while server crash can cause the procedure to be stuck; ADDENDUM

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
  refs/heads/branch-2 27e2c8c86 -> 063eefe3b


HBASE-20634 Reopen region while server crash can cause the procedure to be 
stuck; ADDENDUM


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

Branch: refs/heads/branch-2
Commit: 063eefe3b0eed3744a840a46e3b3aa5cef5e32f6
Parents: 27e2c8c
Author: Michael Stack 
Authored: Mon Jun 4 12:38:56 2018 -0700
Committer: Michael Stack 
Committed: Mon Jun 4 12:38:56 2018 -0700

--
 .../hbase/master/replication/RefreshPeerProcedure.java  | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/063eefe3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
index ba9bcdc..10e16e9 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
 import org.apache.hadoop.hbase.master.procedure.PeerProcedureInterface;
 import 
org.apache.hadoop.hbase.master.procedure.RSProcedureDispatcher.ServerOperation;
+import org.apache.hadoop.hbase.procedure2.FailedRemoteDispatchException;
 import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.procedure2.ProcedureEvent;
 import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
@@ -166,10 +167,12 @@ public class RefreshPeerProcedure extends 
Procedure
   // retry
   dispatched = false;
 }
-if (!env.getRemoteDispatcher().addOperationToNode(targetServer, this)) {
+try {
+  env.getRemoteDispatcher().addOperationToNode(targetServer, this);
+} catch (FailedRemoteDispatchException frde) {
   LOG.info("Can not add remote operation for refreshing peer {} for {} to 
{}, " +
-"this usually because the server is already dead, " +
-"give up and mark the procedure as complete", peerId, type, 
targetServer);
+"this is usually because the server is already dead, " +
+"give up and mark the procedure as complete", peerId, type, 
targetServer, frde);
   return null;
 }
 dispatched = true;

hbase git commit: HBASE-20634 Reopen region while server crash can cause the procedure to be stuck; ADDENDUM

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
  refs/heads/master 03c0f7fe1 -> d99ba62b1


HBASE-20634 Reopen region while server crash can cause the procedure to be 
stuck; ADDENDUM


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

Branch: refs/heads/master
Commit: d99ba62b1202b291bbcc3b7af0cc8a039e1eb32c
Parents: 03c0f7f
Author: Michael Stack 
Authored: Mon Jun 4 12:38:56 2018 -0700
Committer: Michael Stack 
Committed: Mon Jun 4 12:39:39 2018 -0700

--
 .../hbase/master/replication/RefreshPeerProcedure.java  | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d99ba62b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
index ba9bcdc..10e16e9 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
 import org.apache.hadoop.hbase.master.procedure.PeerProcedureInterface;
 import 
org.apache.hadoop.hbase.master.procedure.RSProcedureDispatcher.ServerOperation;
+import org.apache.hadoop.hbase.procedure2.FailedRemoteDispatchException;
 import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.procedure2.ProcedureEvent;
 import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
@@ -166,10 +167,12 @@ public class RefreshPeerProcedure extends 
Procedure
   // retry
   dispatched = false;
 }
-if (!env.getRemoteDispatcher().addOperationToNode(targetServer, this)) {
+try {
+  env.getRemoteDispatcher().addOperationToNode(targetServer, this);
+} catch (FailedRemoteDispatchException frde) {
   LOG.info("Can not add remote operation for refreshing peer {} for {} to 
{}, " +
-"this usually because the server is already dead, " +
-"give up and mark the procedure as complete", peerId, type, 
targetServer);
+"this is usually because the server is already dead, " +
+"give up and mark the procedure as complete", peerId, type, 
targetServer, frde);
   return null;
 }
 dispatched = true;

hbase git commit: HBASE-20628 SegmentScanner does over-comparing when one flushing

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
  refs/heads/master a472f24d1 -> 03c0f7fe1


HBASE-20628 SegmentScanner does over-comparing when one flushing

Signed-off-by: eshcar 
Signed-off-by: anoopsjohn 


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

Branch: refs/heads/master
Commit: 03c0f7fe1343e681eda350a7a3528b62b28532cc
Parents: a472f24
Author: Michael Stack 
Authored: Fri Jun 1 13:35:23 2018 -0700
Committer: Michael Stack 
Committed: Mon Jun 4 09:50:47 2018 -0700

--
 .../regionserver/CompositeImmutableSegment.java |   9 ++
 .../hbase/regionserver/ImmutableSegment.java|   4 +
 .../hbase/regionserver/MemStoreSnapshot.java|   3 +-
 .../regionserver/SnapshotSegmentScanner.java| 101 +++
 4 files changed, 115 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/03c0f7fe/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
index 1fd2f23..dcfaf81 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
@@ -279,4 +279,13 @@ public class CompositeImmutableSegment extends 
ImmutableSegment {
 }
 return sb.toString();
   }
+
+  @Override
+  List getSnapshotScanners() {
+List list = new ArrayList<>(this.segments.size());
+for (ImmutableSegment segment: this.segments) {
+  list.add(new SnapshotSegmentScanner(segment));
+}
+return list;
+  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/03c0f7fe/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
index b781aab..8c426bc 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
@@ -84,4 +84,8 @@ public abstract class ImmutableSegment extends Segment {
 res += "Num uniques "+getNumUniqueKeys()+"; ";
 return res;
   }
+
+  List getSnapshotScanners() {
+return Collections.singletonList(new SnapshotSegmentScanner(this));
+  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/03c0f7fe/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
index f747224..3b34828 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
@@ -40,7 +40,7 @@ public class MemStoreSnapshot implements Closeable {
 this.cellsCount = snapshot.getCellsCount();
 this.memStoreSize = snapshot.getMemStoreSize();
 this.timeRangeTracker = snapshot.getTimeRangeTracker();
-this.scanners = snapshot.getScanners(Long.MAX_VALUE);
+this.scanners = snapshot.getSnapshotScanners();
 this.tagsPresent = snapshot.isTagsPresent();
   }
 
@@ -95,5 +95,4 @@ public class MemStoreSnapshot implements Closeable {
   }
 }
   }
-
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/03c0f7fe/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
new file mode 100644
index 000..87be2e4
--- /dev/null
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
@@ -0,0 +1,101 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright

hbase git commit: HBASE-20628 SegmentScanner does over-comparing when one flushing

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
  refs/heads/branch-2 d83485940 -> 27e2c8c86


HBASE-20628 SegmentScanner does over-comparing when one flushing

Signed-off-by: eshcar 
Signed-off-by: anoopsjohn 


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

Branch: refs/heads/branch-2
Commit: 27e2c8c86b3cef19148dafba3988b6ee38aecc18
Parents: d834859
Author: Michael Stack 
Authored: Fri Jun 1 13:35:23 2018 -0700
Committer: Michael Stack 
Committed: Mon Jun 4 09:50:13 2018 -0700

--
 .../regionserver/CompositeImmutableSegment.java |   9 ++
 .../hbase/regionserver/ImmutableSegment.java|   4 +
 .../hbase/regionserver/MemStoreSnapshot.java|   3 +-
 .../regionserver/SnapshotSegmentScanner.java| 101 +++
 4 files changed, 115 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/27e2c8c8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
index 1fd2f23..dcfaf81 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
@@ -279,4 +279,13 @@ public class CompositeImmutableSegment extends 
ImmutableSegment {
 }
 return sb.toString();
   }
+
+  @Override
+  List getSnapshotScanners() {
+List list = new ArrayList<>(this.segments.size());
+for (ImmutableSegment segment: this.segments) {
+  list.add(new SnapshotSegmentScanner(segment));
+}
+return list;
+  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/27e2c8c8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
index b781aab..8c426bc 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
@@ -84,4 +84,8 @@ public abstract class ImmutableSegment extends Segment {
 res += "Num uniques "+getNumUniqueKeys()+"; ";
 return res;
   }
+
+  List getSnapshotScanners() {
+return Collections.singletonList(new SnapshotSegmentScanner(this));
+  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/27e2c8c8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
index f747224..3b34828 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
@@ -40,7 +40,7 @@ public class MemStoreSnapshot implements Closeable {
 this.cellsCount = snapshot.getCellsCount();
 this.memStoreSize = snapshot.getMemStoreSize();
 this.timeRangeTracker = snapshot.getTimeRangeTracker();
-this.scanners = snapshot.getScanners(Long.MAX_VALUE);
+this.scanners = snapshot.getSnapshotScanners();
 this.tagsPresent = snapshot.isTagsPresent();
   }
 
@@ -95,5 +95,4 @@ public class MemStoreSnapshot implements Closeable {
   }
 }
   }
-
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/27e2c8c8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
new file mode 100644
index 000..87be2e4
--- /dev/null
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
@@ -0,0 +1,101 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright

hbase git commit: HBASE-20628 SegmentScanner does over-comparing when one flushing

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 77a550c13 -> 1661543c1


HBASE-20628 SegmentScanner does over-comparing when one flushing

Signed-off-by: eshcar 
Signed-off-by: anoopsjohn 


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

Branch: refs/heads/branch-2.0
Commit: 1661543c141a27b28d499b80dce5860f718e45e2
Parents: 77a550c
Author: Michael Stack 
Authored: Fri Jun 1 13:35:23 2018 -0700
Committer: Michael Stack 
Committed: Mon Jun 4 09:48:33 2018 -0700

--
 .../regionserver/CompositeImmutableSegment.java |   9 ++
 .../hbase/regionserver/ImmutableSegment.java|   4 +
 .../hbase/regionserver/MemStoreSnapshot.java|   3 +-
 .../regionserver/SnapshotSegmentScanner.java| 101 +++
 4 files changed, 115 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1661543c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
index c927603..3001e53 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java
@@ -287,4 +287,13 @@ public class CompositeImmutableSegment extends 
ImmutableSegment {
 }
 return sb.toString();
   }
+
+  @Override
+  List getSnapshotScanners() {
+List list = new ArrayList<>(this.segments.size());
+for (ImmutableSegment segment: this.segments) {
+  list.add(new SnapshotSegmentScanner(segment));
+}
+return list;
+  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/1661543c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
index b781aab..8c426bc 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ImmutableSegment.java
@@ -84,4 +84,8 @@ public abstract class ImmutableSegment extends Segment {
 res += "Num uniques "+getNumUniqueKeys()+"; ";
 return res;
   }
+
+  List getSnapshotScanners() {
+return Collections.singletonList(new SnapshotSegmentScanner(this));
+  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/1661543c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
index cbd60e5..3b34828 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.java
@@ -40,7 +40,7 @@ public class MemStoreSnapshot implements Closeable {
 this.cellsCount = snapshot.getCellsCount();
 this.memStoreSize = snapshot.getMemStoreSize();
 this.timeRangeTracker = snapshot.getTimeRangeTracker();
-this.scanners = snapshot.getScanners(Long.MAX_VALUE, Long.MAX_VALUE);
+this.scanners = snapshot.getSnapshotScanners();
 this.tagsPresent = snapshot.isTagsPresent();
   }
 
@@ -95,5 +95,4 @@ public class MemStoreSnapshot implements Closeable {
   }
 }
   }
-
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/1661543c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
new file mode 100644
index 000..87be2e4
--- /dev/null
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SnapshotSegmentScanner.java
@@ -0,0 +1,101 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ *

[hbase] Git Push Summary

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
  refs/heads/eshcar [deleted] a472f24d1

[hbase] Git Push Summary

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
  refs/heads/eshcar [created] a472f24d1

hbase git commit: HBASE-20634 Reopen region while server crash can cause the procedure to be stuck

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
refs/heads/master 08446916a -> a472f24d1

HBASE-20634 Reopen region while server crash can cause the procedure to be stuck

A reattempt at fixing HBASE-20173 [AMv2] DisableTableProcedure concurrent to
ServerCrashProcedure can deadlock

The scenario is a SCP after processing WALs, goes to assign regions that
were on the crashed server but a concurrent Procedure gets in there
first and tries to unassign a region that was on the crashed server
(could be part of a move procedure or a disable table, etc.). The
unassign happens to run AFTER SCP has released all RPCs that
were going against the crashed server. The unassign fails because the
server is crashed. The unassign used to suspend itself only it would
never be woken up because the server it was going against had already
been processed. Worse, the SCP could not make progress because the
unassign was suspended with the lock on a region that it wanted to
assign held making it so it could make no progress.

In here, we add to the unassign recognition of the state where it is
running post SCP cleanup of RPCs. If present, unassign moves to finish
instead of suspending itself.

Includes a nice unit test made by Duo Zhang that reproduces nicely the
hung scenario.

M
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/FailedRemoteDispatchException.java
Moved this class back to hbase-procedure where it belongs.

M
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/NoNodeDispatchException.java
M
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/NoServerDispatchException.java
M
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/NullTargetServerDispatchException.java
Specializiations on FRDE so we can be more particular when we say there
was a problem.

M
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RemoteProcedureDispatcher.java
Change addOperationToNode so we throw exceptions that give more detail
on issue rather than a mysterious true/false

M hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
Undo SERVER_CRASH_HANDLE_RIT2. Bad idea (from HBASE-20173)

M hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
Have expireServer return true if it actually queued an expiration. Used
later in this patch.

M
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
Hide methods that shouldn't be public. Add a particular check used out
in unassign procedure failure processing.

M
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java
Check that server we're to move from is actually online (might
catch a few silly move requests early).

M
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
Add doc on ServerState. Wasn't being used really. Now we actually stamp
a Server OFFLINE after its WAL has been split. Means its safe to assign
since all WALs have been processed. Add methods to update SPLITTING
and to set it to OFFLINE after splitting done.

M
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
Change logging to be new-style and less repetitive of info.
Cater to new way in which .addOperationToNode returns info (exceptions
rather than true/false).

M
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java
Add looking for the case where we failed assign AND we should not
suspend because we will never be woken up because SCP is beyond
doing this for all stuck RPCs.

Some cleanup of the failure processing grouping where we can proceed.

TODOs have been handled in this refactor including the TODO that
wonders if it possible that there are concurrent fails coming in
(Yes).

M
hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
Doc and removing the old HBASE-20173 'fix'.
Also updating ServerStateNode post WAL splitting so it gets marked
OFFLINE.

A
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.java
Nice test by Duo Zhang.

Signed-off-by: Umesh Agashe
Signed-off-by: Duo Zhang
Signed-off-by: Mike Drob

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

Branch: refs/heads/master
Commit: a472f24d17718f85883d7bb7b9bd9bd64a8cb392
Parents: 0844691
Author: zhangduo
Authored: Sun May 27 20:42:21 2018 +0800
Committer: Michael Stack
Committed: Mon Jun 4 09:26:56 2018 -0700

--
.../hbase/procedure2/BadProcedureException.java | 2 +-
.../FailedRemoteDispatchException.java | 33
.../procedure2/NoNodeDispatchException.java | 33

hbase git commit: HBASE-20634 Reopen region while server crash can cause the procedure to be stuck

2018-06-04 Thread stack

Repository: hbase
Updated Branches:
refs/heads/branch-2 805e2db3e -> d83485940