diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index 71d03ce..2361c0c 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -1203,6 +1203,14 @@ public class ServerManager { } /** + * Check whether a server is online based on hostname and port + * @return true if finding a server with matching hostname and port. + */ + public boolean isServerWithSameHostnamePortOnline(final ServerName serverName) { + return findServerWithSameHostnamePortWithLock(serverName) != null; + } + + /** * Check if a server is known to be dead. A server can be online, * or known to be dead, or unknown to this manager (i.e, not online, * not known to be dead either. it is simply not tracked by the diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java index bfe3cc6..3463000 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java @@ -23,8 +23,10 @@ import java.io.InterruptedIOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.concurrent.locks.Lock; @@ -547,13 +549,31 @@ implements ServerProcedureInterface { private boolean assign(final MasterProcedureEnv env, final List hris) throws InterruptedIOException { AssignmentManager am = env.getMasterServices().getAssignmentManager(); + // If the dead server already restarted, assign to the same server to preserve locality + boolean retainAssignment = + env.getMasterServices().getServerManager().isServerWithSameHostnamePortOnline(serverName) ? + true : false; try { - am.assign(hris); + if (retainAssignment) { + Map hriServerMap = + new HashMap(hris.size()); + for (HRegionInfo hri: hris) { + hriServerMap.put(hri, serverName); + } + LOG.info("Best effort in SSH to retain assignment of " + hris.size() + + " regions from the dead server " + serverName); + am.assign(hriServerMap); + } else { + LOG.info("Using round robin in SSH to assign " + hris.size() + + " regions from the dead server " + serverName); + am.assign(hris); + } } catch (InterruptedException ie) { - LOG.error("Caught " + ie + " during round-robin assignment"); + LOG.error("Caught " + ie + " during " + (retainAssignment ? "retaining" : "round-robin") + + " assignment"); throw (InterruptedIOException)new InterruptedIOException().initCause(ie); } catch (IOException ioe) { - LOG.info("Caught " + ioe + " during region assignment, will retry"); + LOG.warn("Caught " + ioe + " during region assignment, will retry"); return false; } return true;