From 23e418d14abe77239c0c6ef81f796cd53a386757 Mon Sep 17 00:00:00 2001 From: Guangxu Cheng Date: Thu, 23 Nov 2017 11:12:30 +0800 Subject: [PATCH] HBASE-19325 Pass a list of server name to postClearDeadServers --- .../java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 4 ++-- .../apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java | 4 ++-- .../java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java | 4 ++-- .../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 +++- .../org/apache/hadoop/hbase/security/access/AccessController.java | 4 ++-- .../java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java | 4 ++-- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java index a6fbd05690..65892fa0d8 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java @@ -970,8 +970,8 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override - public void postClearDeadServers(ObserverContext ctx) - throws IOException { + public void postClearDeadServers(ObserverContext ctx, + List servers, List notClearedServers) throws IOException { } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java index 645222664c..de09f71498 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java @@ -84,8 +84,8 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override - public void postClearDeadServers(ObserverContext ctx) - throws IOException { + public void postClearDeadServers(ObserverContext ctx, + List servers, List notClearedServers) throws IOException { } @Override diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java index 842d917c3f..7d962abb3a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java @@ -95,8 +95,8 @@ public class BaseMasterObserver implements MasterObserver { } @Override - public void postClearDeadServers(ObserverContext ctx) - throws IOException { + public void postClearDeadServers(ObserverContext ctx, + List servers, List notClearedServers) throws IOException { } @Override 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 bb0e63b171..6e9179aa9d 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 @@ -1067,7 +1067,8 @@ public interface MasterObserver extends Coprocessor { /** * Called after clear dead region servers. */ - void postClearDeadServers(ObserverContext ctx) throws IOException; + void postClearDeadServers(ObserverContext ctx, + List servers, List notClearedServers) throws IOException; /** * Called before servers are moved to target region server group 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 c62057adaa..616f76c693 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 @@ -1208,12 +1208,13 @@ public class MasterCoprocessorHost }); } - public void postClearDeadServers() throws IOException { + public void postClearDeadServers(final List servers, + final List notClearedServers) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { - oserver.postClearDeadServers(ctx); + oserver.postClearDeadServers(ctx, 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 11d9159142..b86a9f5c6b 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 @@ -1162,7 +1162,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); 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 17da4a097f..5865b1ae3f 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 @@ -2613,8 +2613,8 @@ public class AccessController extends BaseMasterAndRegionObserver } @Override - public void postClearDeadServers(ObserverContext ctx) - throws IOException { } + public void postClearDeadServers(ObserverContext ctx, + List servers, List notClearedServers) throws IOException { } @Override public void preMerge(ObserverContext ctx, Region regionA, 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 eb62a35b31..cf899b8468 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 @@ -288,8 +288,8 @@ public class TestMasterObserver { } @Override - public void postClearDeadServers(ObserverContext ctx) - throws IOException { + public void postClearDeadServers(ObserverContext ctx, + List servers, List notClearedServers) throws IOException { } public boolean wasDispatchMergeCalled() { -- 2.13.0.windows.1