Revert "HBASE-21237 Use CompatRemoteProcedureResolver to dispatch open/close region requests to RS"

This commit is contained in:
Allan Yang 2018-09-28 14:06:54 +08:00
parent 4947e72f63
commit f6c05faccf
1 changed files with 8 additions and 4 deletions

View File

@ -109,12 +109,16 @@ public class RSProcedureDispatcher
protected void remoteDispatch(final ServerName serverName, protected void remoteDispatch(final ServerName serverName,
final Set<RemoteProcedure> remoteProcedures) { final Set<RemoteProcedure> remoteProcedures) {
final int rsVersion = master.getServerManager().getVersionNumber(serverName); final int rsVersion = master.getServerManager().getVersionNumber(serverName);
if (rsVersion == 0 && !master.getServerManager().isServerOnline(serverName)) { if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {
LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,
rsVersion);
submitTask(new ExecuteProceduresRemoteCall(serverName, remoteProcedures));
} else if (rsVersion == 0 && !master.getServerManager().isServerOnline(serverName)) {
submitTask(new DeadRSRemoteCall(serverName, remoteProcedures)); submitTask(new DeadRSRemoteCall(serverName, remoteProcedures));
} else { } else {
// See HBASE-21237, fallback to CompatRemoteProcedureResolver for now. Since LOG.info(String.format(
// ExecuteProceduresRemoteCall will group all the open/close requests. If one "Fallback to compat rpc execution for serverName=%s version=%s",
// fails, master will regard all the requests as failure and then cause some trouble. serverName, rsVersion));
submitTask(new CompatRemoteProcedureResolver(serverName, remoteProcedures)); submitTask(new CompatRemoteProcedureResolver(serverName, remoteProcedures));
} }
} }