Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19325 Pass a list of server name to postClearDeadServers 

Signed-off-by: Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Guangxu Cheng 2017-11-23 11:12:30 +08:00 committed by Chia-Ping Tsai
parent 20d811121f
commit de16690b7a
8 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
View File

@ -970,8 +970,8 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService
}
@Override
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException {
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<ServerName> servers, List<ServerName> notClearedServers) throws IOException {
}

4
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java
View File

@ -84,8 +84,8 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver
}
@Override
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException {
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<ServerName> servers, List<ServerName> notClearedServers) throws IOException {
}
@Override

4
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java
View File

@ -95,8 +95,8 @@ public class BaseMasterObserver implements MasterObserver {
}
@Override
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException {
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<ServerName> servers, List<ServerName> notClearedServers) throws IOException {
}
@Override

3
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
View File

@ -1067,7 +1067,8 @@ public interface MasterObserver extends Coprocessor {
/**
* Called after clear dead region servers.
*/
void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx) throws IOException;
void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<ServerName> servers, List<ServerName> notClearedServers) throws IOException;
/**
* Called before servers are moved to target region server group

5
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java
View File

@ -1208,12 +1208,13 @@ public class MasterCoprocessorHost
});
}
public void postClearDeadServers() throws IOException {
public void postClearDeadServers(final List<ServerName> servers,
final List<ServerName> notClearedServers) throws IOException {
execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() {
@Override
public void call(MasterObserver oserver, ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException {
oserver.postClearDeadServers(ctx);
oserver.postClearDeadServers(ctx, servers, notClearedServers);
}
});
}

4
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
View File

@ -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);

4
hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
View File

@ -2613,8 +2613,8 @@ public class AccessController extends BaseMasterAndRegionObserver
}
@Override
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException { }
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<ServerName> servers, List<ServerName> notClearedServers) throws IOException { }
@Override
public void preMerge(ObserverContext<RegionServerCoprocessorEnvironment> ctx, Region regionA,

4
hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
View File

@ -288,8 +288,8 @@ public class TestMasterObserver {
}
@Override
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx)
throws IOException {
public void postClearDeadServers(ObserverContext<MasterCoprocessorEnvironment> ctx,
List<ServerName> servers, List<ServerName> notClearedServers) throws IOException {
}
public boolean wasDispatchMergeCalled() {