You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/05/17 01:19:41 UTC

[2/2] hbase git commit: HBASE-20500 [rsgroup] should keep at least one server in default group

HBASE-20500 [rsgroup] should keep at least one server in default group

Signed-off-by: tedyu <yu...@gmail.com>
Amending-Author: Andrew Purtell <ap...@apache.org>


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

Branch: refs/heads/branch-1.4
Commit: 13abd56743a43123ae2ec429f0f21e9f6eef918d
Parents: cfdc9d1
Author: Yechao Chen <ch...@gmail.com>
Authored: Tue May 8 14:04:59 2018 +0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed May 16 18:05:16 2018 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/13abd567/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java
----------------------------------------------------------------------
diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java
index f3d03b5..e4f4c86 100644
--- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java
+++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java
@@ -139,8 +139,12 @@ public class RSGroupAdminServer implements RSGroupAdmin {
         }
       }
 
-      if(srcGrp.getServers().size() <= servers.size() &&
-          srcGrp.getTables().size() > 0) {
+      if (RSGroupInfo.DEFAULT_GROUP.equals(srcGrp.getName()) && srcGrp.getServers().size() <=
+          servers.size()) {
+        throw new ConstraintException("Should keep at least one server in 'default' RSGroup ");
+      }
+
+      if(srcGrp.getServers().size() <= servers.size() && srcGrp.getTables().size() > 0) {
         throw new ConstraintException("Cannot leave a group "+srcGrp.getName()+
             " that contains tables " +"without servers.");
       }