Skip to content

HBASE-26230 Start an in process HRegionServer in maintenance mode #3659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apache9 merged 1 commit into from
Sep 3, 2021
Merged

HBASE-26230 Start an in process HRegionServer in maintenance mode #3659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
import org.apache.hadoop.hbase.util.HBaseFsck;
import org.apache.hadoop.hbase.util.HFileArchiveUtil;
import org.apache.hadoop.hbase.util.IdLock;
import org.apache.hadoop.hbase.util.JVMClusterUtil;
import org.apache.hadoop.hbase.util.ModifyRegionUtils;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.RetryCounter;
Expand Down Expand Up @@ -415,6 +416,9 @@ public class HMaster extends HRegionServer implements MasterServices {
private final boolean maintenanceMode;
static final String MAINTENANCE_MODE = "hbase.master.maintenance_mode";

// the in process region server for carry system regions in maintenanceMode
private JVMClusterUtil.RegionServerThread maintenanceRegionServer;

// Cached clusterId on stand by masters to serve clusterID requests from clients.
private final CachedClusterId cachedClusterId;

Expand Down Expand Up @@ -623,9 +627,6 @@ protected void login(UserProvider user, String host) throws IOException {
*/
@Override
protected void waitForMasterActive() {
if (maintenanceMode) {
return;
}
while (!isStopped() && !isAborted()) {
sleeper.sleep();
}
Expand Down Expand Up @@ -669,9 +670,6 @@ protected RSRpcServices createRpcServices() throws IOException {
protected void configureInfoServer() {
infoServer.addUnprivilegedServlet("master-status", "/master-status", MasterStatusServlet.class);
infoServer.setAttribute(MASTER, this);
if (maintenanceMode) {
super.configureInfoServer();
}
}

@Override
Expand Down Expand Up @@ -966,6 +964,11 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
// initialize master side coprocessors before we start handling requests
status.setStatus("Initializing master coprocessors");
this.cpHost = new MasterCoprocessorHost(this, this.conf);
} else {
// start an in process region server for carrying system regions
maintenanceRegionServer =
JVMClusterUtil.createRegionServerThread(getConfiguration(), HRegionServer.class, 0);
maintenanceRegionServer.start();
}

// Checking if meta needs initializing.
Expand Down Expand Up @@ -1553,9 +1556,11 @@ protected void stopServiceThreads() {
cleanerPool.shutdownNow();
cleanerPool = null;
}
if (maintenanceRegionServer != null) {
maintenanceRegionServer.getRegionServer().stop(HBASE_MASTER_CLEANER_INTERVAL);
}

LOG.debug("Stopping service threads");

// stop procedure executor prior to other services such as server manager and assignment
// manager, as these services are important for some running procedures. See HBASE-24117 for
// example.
Expand Down Expand Up @@ -3873,10 +3878,7 @@ public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() {

@Override
public Map<String, ReplicationStatus> getWalGroupsReplicationStatus() {
if (!this.isOnline() || !maintenanceMode) {
return new HashMap<>();
}
return super.getWalGroupsReplicationStatus();
return new HashMap<>();
}

public HbckChore getHbckChore() {
Expand Down
3 changes: 2 additions & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,8 @@ public static void closeRegionSilentlyAndWait(AsyncClusterConnection connection,
*/
private int getMinToStart() {
if (master.isInMaintenanceMode()) {
// If in maintenance mode, then master hosting meta will be the only server available
// If in maintenance mode, then in process region server hosting meta will be the only server
// available
return 1;
}

Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void testMasterInitWithObserverModeClientZKQuorum() throws Exception {
conf.set(HConstants.CLIENT_ZOOKEEPER_QUORUM, HConstants.LOCALHOST);
conf.setInt(HConstants.CLIENT_ZOOKEEPER_CLIENT_PORT,
TESTUTIL.getZkCluster().getClientPort() + 1);
// need to enable maintenance mode so we will start master as a region server
// need to enable maintenance mode so we will start master and an in process region server
conf.setBoolean(HMaster.MAINTENANCE_MODE, true);
// settings to allow us not to start additional RS
conf.setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 1);
Expand Down