From 066133b6d30f5e48dad73bf192dc9df78a91bb12 Mon Sep 17 00:00:00 2001 From: Guangxu Cheng Date: Wed, 22 Nov 2017 17:40:08 +0800 Subject: [PATCH] HBASE-19325 Pass a list of server name to postClearDeadServers --- .../java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java | 3 ++- .../java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java | 5 +++-- .../main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) 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 c90ffe592a..398e56bafe 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 ctx) + default void postClearDeadServers(ObserverContext ctx, + List servers, List notClearedServers) throws IOException {} /** 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 ddc6c3d8e6..43373474c0 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 servers, + List 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); } }); } 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 2fd60aff3e..1a8fd06499 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); -- 2.13.0.windows.1