Repository: hbase Updated Branches: refs/heads/master f521000d7 -> 5a0881a98
HBASE-19325 Pass a list of server name to postClearDeadServers Signed-off-by: Chia-Ping Tsai <chia7...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5a0881a9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5a0881a9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5a0881a9 Branch: refs/heads/master Commit: 5a0881a98b3575d900d483222e2fdfab15159656 Parents: f521000 Author: Guangxu Cheng <guangxuch...@gmail.com> Authored: Wed Nov 22 17:40:08 2017 +0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Tue Nov 28 02:47:06 2017 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/coprocessor/MasterObserver.java | 3 ++- .../org/apache/hadoop/hbase/master/MasterCoprocessorHost.java | 5 +++-- .../java/org/apache/hadoop/hbase/master/MasterRpcServices.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5a0881a9/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 c90ffe5..398e56b 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 @@ -1263,7 +1263,8 @@ public interface MasterObserver { /** * Called after clear dead region servers. */ - default void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx) + default void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx, + List<ServerName> servers, List<ServerName> notClearedServers) throws IOException {} /** http://git-wip-us.apache.org/repos/asf/hbase/blob/5a0881a9/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 ddc6c3d..4337347 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 @@ -1596,11 +1596,12 @@ public class MasterCoprocessorHost }); } - public void postClearDeadServers() throws IOException { + public void postClearDeadServers(List<ServerName> servers, + List<ServerName> notClearedServers) throws IOException { execOperation(coprocEnvironments.isEmpty() ? null : new MasterObserverOperation() { @Override public void call(MasterObserver observer) throws IOException { - observer.postClearDeadServers(this); + observer.postClearDeadServers(this, servers, notClearedServers); } }); } http://git-wip-us.apache.org/repos/asf/hbase/blob/5a0881a9/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 2fd60af..1a8fd06 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 @@ -2163,7 +2163,9 @@ public class MasterRpcServices extends RSRpcServices } if (master.cpHost != null) { - master.cpHost.postClearDeadServers(); + master.cpHost.postClearDeadServers( + ProtobufUtil.toServerNameList(request.getServerNameList()), + ProtobufUtil.toServerNameList(response.getServerNameList())); } } catch (IOException io) { throw new ServiceException(io);
