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 2017/12/01 21:44:42 UTC
[4/5] hbase git commit: HBASE-19326 Remove decommissioned servers
from rsgroup
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ac82136/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
index 6e9179a..ed40e67 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
@@ -1165,6 +1165,22 @@ public interface MasterObserver extends Coprocessor {
String name) throws IOException;
/**
+ * Called before servers are removed from rsgroup
+ * @param ctx the environment to interact with the framework and master
+ * @param servers set of decommissioned servers to remove
+ */
+ void preRemoveServers(final ObserverContext<MasterCoprocessorEnvironment> ctx,
+ Set<Address> servers) throws IOException;
+
+ /**
+ * Called after servers are removed from rsgroup
+ * @param ctx the environment to interact with the framework and master
+ * @param servers set of servers to remove
+ */
+ void postRemoveServers(final ObserverContext<MasterCoprocessorEnvironment> ctx,
+ Set<Address> servers) throws IOException;
+
+ /**
* Called before a region server group is removed
* @param ctx the environment to interact with the framework and master
* @param groupName group name
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ac82136/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
index 616f76c..6965eae 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
@@ -1297,6 +1297,32 @@ public class MasterCoprocessorHost
});
}
+ public void preRemoveServers(final Set<Address> servers)
+ throws IOException {
+ execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() {
+ @Override
+ public void call(MasterObserver oserver,
+ ObserverContext<MasterCoprocessorEnvironment> ctx) throws IOException {
+ if(((MasterEnvironment)getEnvironment()).supportGroupCPs) {
+ oserver.preRemoveServers(this, servers);
+ }
+ }
+ });
+ }
+
+ public void postRemoveServers(final Set<Address> servers)
+ throws IOException {
+ execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() {
+ @Override
+ public void call(MasterObserver oserver,
+ ObserverContext<MasterCoprocessorEnvironment> ctx) throws IOException {
+ if(((MasterEnvironment)getEnvironment()).supportGroupCPs) {
+ oserver.postRemoveServers(this, servers);
+ }
+ }
+ });
+ }
+
public void preAddRSGroup(final String name)
throws IOException {
execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ac82136/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
index 5865b1a..e90fe05 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
@@ -2719,6 +2719,12 @@ public class AccessController extends BaseMasterAndRegionObserver
}
@Override
+ public void preRemoveServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
+ Set<Address> servers) throws IOException {
+ requirePermission("removeServers", Action.ADMIN);
+ }
+
+ @Override
public void preAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx,
String name) throws IOException {
requirePermission("addRSGroup", Action.ADMIN);
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ac82136/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index cf899b8..83d5749 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -1332,6 +1332,16 @@ public class TestMasterObserver {
}
@Override
+ public void preRemoveServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
+ Set<Address> servers) throws IOException {
+ }
+
+ @Override
+ public void postRemoveServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
+ Set<Address> servers) throws IOException {
+ }
+
+ @Override
public void preBalanceRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx,
String groupName) throws IOException {
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ac82136/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb b/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb
index 0b72fd8..f5f4e62 100644
--- a/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/rsgroup_admin.rb
@@ -160,5 +160,16 @@ module Hbase
@admin.moveServersAndTables(servers, tables, dest)
end
+ #--------------------------------------------------------------------------
+ # remove decommissioned server from rsgroup
+ def remove_servers(*args)
+ # Flatten params array
+ args = args.flatten.compact
+ servers = java.util.HashSet.new
+ args.each do |s|
+ servers.add(org.apache.hadoop.hbase.net.Address.fromString(s))
+ end
+ @admin.removeServers(servers)
+ end
end
end
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ac82136/hbase-shell/src/main/ruby/shell.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell.rb b/hbase-shell/src/main/ruby/shell.rb
index 2eb872c..7444c3b 100644
--- a/hbase-shell/src/main/ruby/shell.rb
+++ b/hbase-shell/src/main/ruby/shell.rb
@@ -464,5 +464,6 @@ Shell.load_command_group(
move_servers_tables_rsgroup
get_server_rsgroup
get_table_rsgroup
+ remove_servers_rsgroup
]
)
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ac82136/hbase-shell/src/main/ruby/shell/commands/remove_servers_rsgroup.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/remove_servers_rsgroup.rb b/hbase-shell/src/main/ruby/shell/commands/remove_servers_rsgroup.rb
new file mode 100644
index 0000000..ba8e60c
--- /dev/null
+++ b/hbase-shell/src/main/ruby/shell/commands/remove_servers_rsgroup.rb
@@ -0,0 +1,35 @@
+# 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 ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Shell
+ module Commands
+ class RemoveServersRsgroup < Command
+ def help
+ <<-EOF
+Remove decommissioned servers from rsgroup.
+Dead/recovering/live servers will be disallowed.
+Example:
+ hbase> remove_servers_rsgroup ['server1:port','server2:port']
+EOF
+ end
+
+ def command(servers)
+ rsgroup_admin.remove_servers(servers)
+ end
+ end
+ end
+end