From d12889e631310d373f5b77f1aa03efe244b9d9b1 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Sat, 14 Jul 2018 22:12:18 +0800 Subject: [PATCH] HBASE-20846 Restore procedure locks when master restarts --- .../hadoop/hbase/procedure2/DelayedProcedure.java | 5 +- .../apache/hadoop/hbase/procedure2/Procedure.java | 93 ++++++++++++--- .../hadoop/hbase/procedure2/ProcedureExecutor.java | 131 +++++++++++++-------- .../hadoop/hbase/procedure2/ProcedureUtil.java | 7 ++ .../hbase/procedure2/TimeoutExecutorThread.java | 26 ++-- .../hbase/procedure2/TestProcedureSuspended.java | 6 - .../src/main/protobuf/Procedure.proto | 3 + .../hbase/master/assignment/GCRegionProcedure.java | 5 - .../assignment/MergeTableRegionsProcedure.java | 12 +- .../assignment/RegionTransitionProcedure.java | 33 +++--- .../hadoop/hbase/master/locking/LockProcedure.java | 9 -- .../AbstractStateMachineNamespaceProcedure.java | 6 +- .../AbstractStateMachineRegionProcedure.java | 9 -- .../AbstractStateMachineTableProcedure.java | 8 +- .../master/procedure/CreateNamespaceProcedure.java | 11 ++ .../master/procedure/CreateTableProcedure.java | 12 +- .../hbase/master/procedure/InitMetaProcedure.java | 7 +- .../master/procedure/MasterProcedureScheduler.java | 37 +++--- .../master/replication/AbstractPeerProcedure.java | 14 +-- 19 files changed, 256 insertions(+), 178 deletions(-) diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/DelayedProcedure.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/DelayedProcedure.java index a9f3e7d..3fc9750 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/DelayedProcedure.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/DelayedProcedure.java @@ -24,8 +24,9 @@ import org.apache.yetus.audience.InterfaceAudience; * Vessel that carries a Procedure and a timeout. */ @InterfaceAudience.Private -class DelayedProcedure extends DelayedUtil.DelayedContainerWithTimestamp> { - public DelayedProcedure(Procedure procedure) { +class DelayedProcedure + extends DelayedUtil.DelayedContainerWithTimestamp> { + public DelayedProcedure(Procedure procedure) { super(procedure, procedure.getTimeoutTimestamp()); } } diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java index 545bedf..7c42b27 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java @@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory; import org.apache.hadoop.hbase.exceptions.TimeoutIOException; import org.apache.hadoop.hbase.metrics.Counter; import org.apache.hadoop.hbase.metrics.Histogram; +import org.apache.hadoop.hbase.procedure2.store.ProcedureStore; import org.apache.hadoop.hbase.procedure2.util.StringUtils; import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.ProcedureState; import org.apache.hadoop.hbase.security.User; @@ -122,6 +123,10 @@ public abstract class Procedure implements Comparable implements Comparable + * This is because that when master restarts, we need to restore the lock state for all the + * procedures to not break the semantic if {@link #holdLock(Object)} is true. But the + * {@link ProcedureExecutor} will be started before the master finish initialization(as it is part + * of the initialization!), so we need to split the code into two steps, and when restore, we just + * restore the lock part and ignore the waitInitialized part. Otherwise there will be dead lock. + * @return true means we need to wait until the environment has been initialized, otherwise true. + */ + protected boolean waitInitialized(TEnvironment env) { + return false; + } + + /** * The user should override this method if they need a lock on an Entity. * A lock can be anything, and it is up to the implementor. The Procedure * Framework will call this method just before it invokes {@link #execute(Object)}. @@ -218,9 +239,6 @@ public abstract class Procedure implements Comparable implements Comparable implements Comparable implements Comparable implements Comparable implements Comparable implements Comparable implements Comparable procedures, - Procedure proc) { + protected static Long getRootProcedureId(final Map> procedures, + Procedure proc) { while (proc.hasParent()) { proc = procedures.get(proc.getParentProcId()); - if (proc == null) return null; + if (proc == null) { + return null; + } } return proc.getProcId(); } diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java index db7c118..717a967 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java @@ -19,8 +19,11 @@ package org.apache.hadoop.hbase.procedure2; import java.io.IOException; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.Deque; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -240,20 +243,23 @@ public class ProcedureExecutor { * Once a Root-Procedure completes (success or failure), the result will be added to this map. * The user of ProcedureExecutor should call getResult(procId) to get the result. */ - private final ConcurrentHashMap completed = new ConcurrentHashMap<>(); + private final ConcurrentHashMap completed = + new ConcurrentHashMap<>(); /** * Map the the procId returned by submitProcedure(), the Root-ProcID, to the RootProcedureState. * The RootProcedureState contains the execution stack of the Root-Procedure, * It is added to the map by submitProcedure() and removed on procedure completion. */ - private final ConcurrentHashMap rollbackStack = new ConcurrentHashMap<>(); + private final ConcurrentHashMap rollbackStack = + new ConcurrentHashMap<>(); /** * Helper map to lookup the live procedures by ID. * This map contains every procedure. root-procedures and subprocedures. */ - private final ConcurrentHashMap procedures = new ConcurrentHashMap<>(); + private final ConcurrentHashMap> procedures = + new ConcurrentHashMap<>(); /** * Helper map to lookup whether the procedure already issued from the same client. @@ -287,7 +293,7 @@ public class ProcedureExecutor { * Overridden when we do the ProcedureTestingUtility.testRecoveryAndDoubleExecution trickery * (Should be ok). */ - private TimeoutExecutorThread timeoutExecutor; + private TimeoutExecutorThread timeoutExecutor; private int corePoolSize; private int maxPoolSize; @@ -357,6 +363,47 @@ public class ProcedureExecutor { }); } + private void restoreLocks(Deque> stack, Set acquired) { + while (!stack.isEmpty()) { + Procedure proc = stack.pop(); + proc.restoreLock(getEnvironment()); + acquired.add(proc.getProcId()); + } + } + + // Restore the locks for all the procedures. + // Notice that we need to restore the locks starting from the root proc, otherwise there will be + // problem that a sub procedure may hold the exclusive lock first and then we are stuck when + // calling the acquireLock method for the parent procedure. + // The algorithm is straight-forward: + // 1. Use a set to record the procedures which locks have already been restored. + // 2. Use a stack to store the hierarchy of the procedures + // 3. For all the procedure, we will first try to find its parent and push it into the stack, + // unless + // a. We have no parent, i.e, we are the root procedure + // b. The lock has already been restored(by checking the set introduced in #1) + // then we start to pop the stack and call acquireLock for each procedure. + // Notice that this should be done for all procedures, not only the ones in runnableList. + private void restoreLocks() { + Set acquired = new HashSet<>(); + Deque> stack = new ArrayDeque<>(); + procedures.values().forEach(proc -> { + for (;;) { + if (acquired.contains(proc.getProcId())) { + restoreLocks(stack, acquired); + return; + } + if (!proc.hasParent()) { + proc.restoreLock(getEnvironment()); + restoreLocks(stack, acquired); + return; + } + stack.push(proc); + proc = procedures.get(proc.getParentProcId()); + } + }); + } + private void loadProcedures(final ProcedureIterator procIter, final boolean abortOnCorruption) throws IOException { final boolean debugEnabled = LOG.isDebugEnabled(); @@ -365,7 +412,7 @@ public class ProcedureExecutor { int runnablesCount = 0; while (procIter.hasNext()) { boolean finished = procIter.isNextFinished(); - Procedure proc = procIter.next(); + Procedure proc = procIter.next(); NonceKey nonceKey = proc.getNonceKey(); long procId = proc.getProcId(); @@ -396,8 +443,8 @@ public class ProcedureExecutor { } // 2. Initialize the stacks - final ArrayList runnableList = new ArrayList(runnablesCount); - HashSet waitingSet = null; + ArrayList> runnableList = new ArrayList<>(runnablesCount); + HashSet> waitingSet = null; procIter.reset(); while (procIter.hasNext()) { if (procIter.isNextFinished()) { @@ -405,7 +452,7 @@ public class ProcedureExecutor { continue; } - Procedure proc = procIter.next(); + Procedure proc = procIter.next(); assert !(proc.isFinished() && !proc.hasParent()) : "unexpected completed proc=" + proc; if (debugEnabled) { @@ -420,7 +467,7 @@ public class ProcedureExecutor { } if (proc.hasParent()) { - Procedure parent = procedures.get(proc.getParentProcId()); + Procedure parent = procedures.get(proc.getParentProcId()); // corrupted procedures are handled later at step 3 if (parent != null && !proc.isFinished()) { parent.incChildrenLatch(); @@ -484,30 +531,21 @@ public class ProcedureExecutor { // 4. Push the procedures to the timeout executor if (waitingSet != null && !waitingSet.isEmpty()) { - for (Procedure proc: waitingSet) { + for (Procedure proc: waitingSet) { proc.afterReplay(getEnvironment()); timeoutExecutor.add(proc); } } - - // 5. Push the procedure to the scheduler - if (!runnableList.isEmpty()) { - // TODO: See ProcedureWALFormatReader#hasFastStartSupport - // some procedure may be started way before this stuff. - for (int i = runnableList.size() - 1; i >= 0; --i) { - Procedure proc = runnableList.get(i); - proc.afterReplay(getEnvironment()); - if (!proc.hasParent()) { - sendProcedureLoadedNotification(proc.getProcId()); - } - if (proc.wasExecuted()) { - scheduler.addFront(proc); - } else { - // if it was not in execution, it can wait. - scheduler.addBack(proc); - } + // 5. restore locks + restoreLocks(); + // 6. Push the procedure to the scheduler + runnableList.forEach(p -> { + p.afterReplay(getEnvironment()); + if (!p.hasParent()) { + sendProcedureLoadedNotification(p.getProcId()); } - } + scheduler.addBack(p); + }); } /** @@ -529,7 +567,7 @@ public class ProcedureExecutor { corePoolSize, maxPoolSize); this.threadGroup = new ThreadGroup("PEWorkerGroup"); - this.timeoutExecutor = new TimeoutExecutorThread(this, threadGroup); + this.timeoutExecutor = new TimeoutExecutorThread<>(this, threadGroup); // Create the workers workerId.set(0); @@ -581,7 +619,7 @@ public class ProcedureExecutor { timeoutExecutor.add(new WorkerMonitor()); // Add completed cleaner chore - addChore(new CompletedProcedureCleaner(conf, store, completed, nonceKeysToProcIdsMap)); + addChore(new CompletedProcedureCleaner<>(conf, store, completed, nonceKeysToProcIdsMap)); } public void stop() { @@ -686,7 +724,7 @@ public class ProcedureExecutor { * Add a chore procedure to the executor * @param chore the chore to add */ - public void addChore(final ProcedureInMemoryChore chore) { + public void addChore(ProcedureInMemoryChore chore) { chore.setState(ProcedureState.WAITING_TIMEOUT); timeoutExecutor.add(chore); } @@ -696,7 +734,7 @@ public class ProcedureExecutor { * @param chore the chore to remove * @return whether the chore is removed, or it will be removed later */ - public boolean removeChore(final ProcedureInMemoryChore chore) { + public boolean removeChore(ProcedureInMemoryChore chore) { chore.setState(ProcedureState.SUCCESS); return timeoutExecutor.remove(chore); } @@ -1169,14 +1207,14 @@ public class ProcedureExecutor { return procedures.keySet(); } - Long getRootProcedureId(Procedure proc) { + Long getRootProcedureId(Procedure proc) { return Procedure.getRootProcedureId(procedures, proc); } // ========================================================================== // Executions // ========================================================================== - private void executeProcedure(final Procedure proc) { + private void executeProcedure(Procedure proc) { final Long rootProcId = getRootProcedureId(proc); if (rootProcId == null) { // The 'proc' was ready to run but the root procedure was rolledback @@ -1275,23 +1313,22 @@ public class ProcedureExecutor { } while (procStack.isFailed()); } - private LockState acquireLock(final Procedure proc) { - final TEnvironment env = getEnvironment(); - // hasLock() is used in conjunction with holdLock(). - // This allows us to not rewrite or carry around the hasLock() flag - // for every procedure. the hasLock() have meaning only if holdLock() is true. - if (proc.holdLock(env) && proc.hasLock(env)) { + private LockState acquireLock(Procedure proc) { + TEnvironment env = getEnvironment(); + // if holdLock is true, then maybe we already have the lock, so just return LOCK_ACQUIRED if + // hasLock is true. + if (proc.hasLock()) { return LockState.LOCK_ACQUIRED; } - return proc.doAcquireLock(env); + return proc.doAcquireLock(env, store); } - private void releaseLock(final Procedure proc, final boolean force) { - final TEnvironment env = getEnvironment(); + private void releaseLock(Procedure proc, boolean force) { + TEnvironment env = getEnvironment(); // For how the framework works, we know that we will always have the lock // when we call releaseLock(), so we can avoid calling proc.hasLock() if (force || !proc.holdLock(env)) { - proc.doReleaseLock(env); + proc.doReleaseLock(env, store); } } @@ -1301,7 +1338,7 @@ public class ProcedureExecutor { * finished to user, and the result will be the fatal exception. */ private LockState executeRollback(final long rootProcId, final RootProcedureState procStack) { - final Procedure rootProc = procedures.get(rootProcId); + Procedure rootProc = procedures.get(rootProcId); RemoteProcedureException exception = rootProc.getException(); // TODO: This needs doc. The root proc doesn't have an exception. Maybe we are // rolling back because the subprocedure does. Clarify. @@ -1679,7 +1716,7 @@ public class ProcedureExecutor { private void execCompletionCleanup(final Procedure proc) { final TEnvironment env = getEnvironment(); - if (proc.holdLock(env) && proc.hasLock(env)) { + if (proc.hasLock()) { releaseLock(proc, true); } try { @@ -1747,7 +1784,7 @@ public class ProcedureExecutor { long lastUpdate = EnvironmentEdgeManager.currentTime(); try { while (isRunning() && keepAlive(lastUpdate)) { - Procedure proc = scheduler.poll(keepAliveTime, TimeUnit.MILLISECONDS); + Procedure proc = scheduler.poll(keepAliveTime, TimeUnit.MILLISECONDS); if (proc == null) { continue; } diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureUtil.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureUtil.java index c42dfc4..1215008 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureUtil.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureUtil.java @@ -202,6 +202,9 @@ public final class ProcedureUtil { builder.setNonce(proc.getNonceKey().getNonce()); } + if (proc.hasLock()) { + builder.setLocked(true); + } return builder.build(); } @@ -255,6 +258,10 @@ public final class ProcedureUtil { proc.setNonceKey(new NonceKey(proto.getNonceGroup(), proto.getNonce())); } + if (proto.getLocked()) { + proc.lockedWhenLoading(); + } + ProcedureStateSerializer serializer = null; if (proto.getStateMessageCount() > 0) { diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java index e5e3230..49c9dfc 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/TimeoutExecutorThread.java @@ -31,15 +31,15 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos.Procedu * @see InlineChore */ @InterfaceAudience.Private -class TimeoutExecutorThread extends StoppableThread { +class TimeoutExecutorThread extends StoppableThread { private static final Logger LOG = LoggerFactory.getLogger(TimeoutExecutorThread.class); - private final ProcedureExecutor executor; + private final ProcedureExecutor executor; private final DelayQueue queue = new DelayQueue<>(); - public TimeoutExecutorThread(ProcedureExecutor executor, ThreadGroup group) { + public TimeoutExecutorThread(ProcedureExecutor executor, ThreadGroup group) { super(group, "ProcExecTimeout"); setDaemon(true); this.executor = executor; @@ -65,7 +65,7 @@ class TimeoutExecutorThread extends StoppableThread { if (task instanceof InlineChore) { execInlineChore((InlineChore) task); } else if (task instanceof DelayedProcedure) { - execDelayedProcedure((DelayedProcedure) task); + execDelayedProcedure((DelayedProcedure) task); } else { LOG.error("CODE-BUG unknown timeout task type {}", task); } @@ -77,15 +77,15 @@ class TimeoutExecutorThread extends StoppableThread { queue.add(chore); } - public void add(Procedure procedure) { + public void add(Procedure procedure) { assert procedure.getState() == ProcedureState.WAITING_TIMEOUT; LOG.info("ADDED {}; timeout={}, timestamp={}", procedure, procedure.getTimeout(), procedure.getTimeoutTimestamp()); - queue.add(new DelayedProcedure(procedure)); + queue.add(new DelayedProcedure<>(procedure)); } - public boolean remove(Procedure procedure) { - return queue.remove(new DelayedProcedure(procedure)); + public boolean remove(Procedure procedure) { + return queue.remove(new DelayedProcedure<>(procedure)); } private void execInlineChore(InlineChore chore) { @@ -93,13 +93,13 @@ class TimeoutExecutorThread extends StoppableThread { add(chore); } - private void execDelayedProcedure(DelayedProcedure delayed) { + private void execDelayedProcedure(DelayedProcedure delayed) { // TODO: treat this as a normal procedure, add it to the scheduler and // let one of the workers handle it. // Today we consider ProcedureInMemoryChore as InlineChores - Procedure procedure = delayed.getObject(); + Procedure procedure = delayed.getObject(); if (procedure instanceof ProcedureInMemoryChore) { - executeInMemoryChore((ProcedureInMemoryChore) procedure); + executeInMemoryChore((ProcedureInMemoryChore) procedure); // if the procedure is in a waiting state again, put it back in the queue procedure.updateTimestamp(); if (procedure.isWaiting()) { @@ -111,7 +111,7 @@ class TimeoutExecutorThread extends StoppableThread { } } - private void executeInMemoryChore(ProcedureInMemoryChore chore) { + private void executeInMemoryChore(ProcedureInMemoryChore chore) { if (!chore.isWaiting()) { return; } @@ -126,7 +126,7 @@ class TimeoutExecutorThread extends StoppableThread { } } - private void executeTimedoutProcedure(Procedure proc) { + private void executeTimedoutProcedure(Procedure proc) { // The procedure received a timeout. if the procedure itself does not handle it, // call abort() and add the procedure back in the queue for rollback. if (proc.setTimeoutFailure(executor.getEnvironment())) { diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java index a9e919c..c1c9187 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java @@ -227,7 +227,6 @@ public class TestProcedureSuspended { protected void releaseLock(final TestProcEnv env) { LOG.info("RELEASE LOCK " + this + " " + hasLock); lock.set(false); - hasLock = false; } @Override @@ -235,11 +234,6 @@ public class TestProcedureSuspended { return true; } - @Override - protected boolean hasLock(final TestProcEnv env) { - return hasLock; - } - public ArrayList getTimestamps() { return timestamps; } diff --git a/hbase-protocol-shaded/src/main/protobuf/Procedure.proto b/hbase-protocol-shaded/src/main/protobuf/Procedure.proto index 2c5f1aa..b4a3107 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Procedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Procedure.proto @@ -63,6 +63,9 @@ message Procedure { // Nonce to prevent same procedure submit by multiple times optional uint64 nonce_group = 13 [default = 0]; optional uint64 nonce = 14 [default = 0]; + + // whether the procedure has held the lock + optional bool locked = 16 [default = false]; } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/GCRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/GCRegionProcedure.java index bbb27e1..0b6e45b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/GCRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/GCRegionProcedure.java @@ -148,9 +148,4 @@ public class GCRegionProcedure extends AbstractStateMachineRegionProcedure { private static final Logger LOG = LoggerFactory.getLogger(MergeTableRegionsProcedure.class); private Boolean traceEnabled; - private volatile boolean lock = false; private ServerName regionLocation; private RegionInfo[] regionsToMerge; private RegionInfo mergedRegion; @@ -414,24 +413,20 @@ public class MergeTableRegionsProcedure @Override protected LockState acquireLock(final MasterProcedureEnv env) { - if (env.waitInitialized(this)) return LockState.LOCK_EVENT_WAIT; if (env.getProcedureScheduler().waitRegions(this, getTableName(), mergedRegion, regionsToMerge[0], regionsToMerge[1])) { try { LOG.debug(LockState.LOCK_EVENT_WAIT + " " + env.getProcedureScheduler().dumpLocks()); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + // Ignore, just for logging } return LockState.LOCK_EVENT_WAIT; } - this.lock = true; return LockState.LOCK_ACQUIRED; } @Override protected void releaseLock(final MasterProcedureEnv env) { - this.lock = false; env.getProcedureScheduler().wakeRegions(this, getTableName(), mergedRegion, regionsToMerge[0], regionsToMerge[1]); } @@ -442,11 +437,6 @@ public class MergeTableRegionsProcedure } @Override - protected boolean hasLock(MasterProcedureEnv env) { - return this.lock; - } - - @Override public TableName getTableName() { return mergedRegion.getTable(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java index c3b2458..4054778 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java @@ -34,14 +34,16 @@ import org.apache.hadoop.hbase.procedure2.ProcedureSuspendedException; import org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher.RemoteOperation; import org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher.RemoteProcedure; import org.apache.hadoop.hbase.procedure2.RemoteProcedureException; -import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos; -import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RegionTransitionState; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; -import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; + +import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RegionTransitionState; +import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos; +import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; + /** * Base class for the Assign and Unassign Procedure. * @@ -114,8 +116,6 @@ public abstract class RegionTransitionProcedure */ private int attempt; - private volatile boolean lock = false; - // Required by the Procedure framework to create the procedure on replay public RegionTransitionProcedure() {} @@ -419,15 +419,17 @@ public abstract class RegionTransitionProcedure } @Override - protected LockState acquireLock(final MasterProcedureEnv env) { + protected boolean waitInitialized(MasterProcedureEnv env) { // Unless we are assigning meta, wait for meta to be available and loaded. - if (!isMeta()) { - AssignmentManager am = env.getAssignmentManager(); - if (am.waitMetaLoaded(this) || am.waitMetaAssigned(this, regionInfo)) { - return LockState.LOCK_EVENT_WAIT; - } + if (isMeta()) { + return false; } + AssignmentManager am = env.getAssignmentManager(); + return am.waitMetaLoaded(this) || am.waitMetaAssigned(this, regionInfo); + } + @Override + protected LockState acquireLock(final MasterProcedureEnv env) { // TODO: Revisit this and move it to the executor if (env.getProcedureScheduler().waitRegion(this, getRegionInfo())) { try { @@ -438,14 +440,12 @@ public abstract class RegionTransitionProcedure } return LockState.LOCK_EVENT_WAIT; } - this.lock = true; return LockState.LOCK_ACQUIRED; } @Override protected void releaseLock(final MasterProcedureEnv env) { env.getProcedureScheduler().wakeRegion(this, getRegionInfo()); - lock = false; } @Override @@ -454,11 +454,6 @@ public abstract class RegionTransitionProcedure } @Override - protected boolean hasLock(final MasterProcedureEnv env) { - return lock; - } - - @Override protected boolean shouldWaitClientAck(MasterProcedureEnv env) { // The operation is triggered internally on the server // the client does not know about this procedure. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java index b4c55f4..3a87bbc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java @@ -76,8 +76,6 @@ public final class LockProcedure extends Procedure private String description; // True when recovery of master lock from WALs private boolean recoveredMasterLock; - // this is for internal working - private boolean hasLock; private final ProcedureEvent event = new ProcedureEvent<>(this); // True if this proc acquired relevant locks. This value is for client checks. @@ -306,7 +304,6 @@ public final class LockProcedure extends Procedure protected LockState acquireLock(final MasterProcedureEnv env) { boolean ret = lock.acquireLock(env); locked.set(ret); - hasLock = ret; if (ret) { if (LOG.isDebugEnabled()) { LOG.debug("LOCKED " + toString()); @@ -321,7 +318,6 @@ public final class LockProcedure extends Procedure @Override protected void releaseLock(final MasterProcedureEnv env) { lock.releaseLock(env); - hasLock = false; } /** @@ -423,11 +419,6 @@ public final class LockProcedure extends Procedure return true; } - @Override - public boolean hasLock(final MasterProcedureEnv env) { - return hasLock; - } - /////////////////////// // LOCK IMPLEMENTATIONS /////////////////////// diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineNamespaceProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineNamespaceProcedure.java index 574706a..341d116 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineNamespaceProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineNamespaceProcedure.java @@ -66,8 +66,12 @@ public abstract class AbstractStateMachineNamespaceProcedure } @Override + protected boolean waitInitialized(MasterProcedureEnv env) { + return env.waitInitialized(this); + } + + @Override protected LockState acquireLock(final MasterProcedureEnv env) { - if (env.waitInitialized(this)) return LockState.LOCK_EVENT_WAIT; if (env.getProcedureScheduler().waitNamespaceExclusiveLock(this, getNamespaceName())) { return LockState.LOCK_EVENT_WAIT; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineRegionProcedure.java index e711ca0..3b5e3b5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineRegionProcedure.java @@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; public abstract class AbstractStateMachineRegionProcedure extends AbstractStateMachineTableProcedure { private RegionInfo hri; - private volatile boolean lock = false; public AbstractStateMachineRegionProcedure(final MasterProcedureEnv env, final RegionInfo hri) { @@ -100,25 +99,17 @@ public abstract class AbstractStateMachineRegionProcedure @Override protected LockState acquireLock(final MasterProcedureEnv env) { - if (env.waitInitialized(this)) return LockState.LOCK_EVENT_WAIT; if (env.getProcedureScheduler().waitRegions(this, getTableName(), getRegion())) { return LockState.LOCK_EVENT_WAIT; } - this.lock = true; return LockState.LOCK_ACQUIRED; } @Override protected void releaseLock(final MasterProcedureEnv env) { - this.lock = false; env.getProcedureScheduler().wakeRegions(this, getTableName(), getRegion()); } - @Override - protected boolean hasLock(final MasterProcedureEnv env) { - return this.lock; - } - protected void setFailure(Throwable cause) { super.setFailure(getClass().getSimpleName(), cause); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java index 1af2445..50a0149 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.java @@ -89,10 +89,12 @@ public abstract class AbstractStateMachineTableProcedure } @Override + protected boolean waitInitialized(MasterProcedureEnv env) { + return env.waitInitialized(this); + } + + @Override protected LockState acquireLock(final MasterProcedureEnv env) { - if (env.waitInitialized(this)) { - return LockState.LOCK_EVENT_WAIT; - } if (env.getProcedureScheduler().waitTableExclusiveLock(this, getTableName())) { return LockState.LOCK_EVENT_WAIT; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateNamespaceProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateNamespaceProcedure.java index c63f420..2f41367 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateNamespaceProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateNamespaceProcedure.java @@ -171,6 +171,17 @@ public class CreateNamespaceProcedure } @Override + protected boolean waitInitialized(MasterProcedureEnv env) { + // Namespace manager might not be ready if master is not fully initialized, + // return false to reject user namespace creation; return true for default + // and system namespace creation (this is part of master initialization). + if (isBootstrapNamespace()) { + return false; + } + return env.waitInitialized(this); + } + + @Override protected LockState acquireLock(final MasterProcedureEnv env) { if (!env.getMasterServices().isInitialized()) { // Namespace manager might not be ready if master is not fully initialized, diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java index acee1af..faad3dd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java @@ -220,10 +220,16 @@ public class CreateTableProcedure } @Override - protected LockState acquireLock(final MasterProcedureEnv env) { - if (!getTableName().isSystemTable() && env.waitInitialized(this)) { - return LockState.LOCK_EVENT_WAIT; + protected boolean waitInitialized(MasterProcedureEnv env) { + if (getTableName().isSystemTable()) { + // Creating system table is part of the initialization, so do not wait here. + return false; } + return super.waitInitialized(env); + } + + @Override + protected LockState acquireLock(final MasterProcedureEnv env) { if (env.getProcedureScheduler().waitTableExclusiveLock(this, getTableName())) { return LockState.LOCK_EVENT_WAIT; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/InitMetaProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/InitMetaProcedure.java index 4736d65..d984632 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/InitMetaProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/InitMetaProcedure.java @@ -63,8 +63,13 @@ public class InitMetaProcedure extends AbstractStateMachineTableProcedure> void doAdd(final FairQueue fairq, final Queue queue, final Procedure proc, final boolean addFront) { - if (!queue.getLockStatus().hasExclusiveLock() || - queue.getLockStatus().isLockOwner(proc.getProcId())) { - // if the queue was not remove for an xlock execution - // or the proc is the lock owner, put the queue back into execution + if (!queue.getLockStatus().hasExclusiveLock()) { + // if the queue was not remove for an xlock execution,put the queue back into execution queue.add(proc, addFront); addToRunQueue(fairq, queue); - } else if (queue.getLockStatus().hasParentLock(proc)) { - // always add it to front as its parent has the xlock - // usually the addFront is true if we arrive here as we will call addFront for adding sub - // proc, but sometimes we may retry on the proc which means we will arrive here through yield, - // so it is possible the addFront here is false. + } else if (queue.getLockStatus().hasLockAccess(proc)) { + // always add it to front as the have the lock access. queue.add(proc, true); - // our (proc) parent has the xlock, - // so the queue is not in the fairq (run-queue) - // add it back to let the child run (inherit the lock) addToRunQueue(fairq, queue); } else { queue.add(proc, addFront); @@ -386,9 +378,6 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler { if (proc != null) { priority = MasterProcedureUtil.getServerPriority(proc); } else { - LOG.warn("Usually this should not happen as proc can only be null when calling from " + - "wait/wake lock, which means at least we should have one procedure in the queue which " + - "wants to acquire the lock or just released the lock."); priority = 1; } node = new ServerQueue(serverName, priority, locking.getServerLock(serverName)); @@ -848,9 +837,12 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler { try { final LockAndQueue lock = locking.getServerLock(serverName); if (lock.tryExclusiveLock(procedure)) { - // We do not need to create a new queue so just pass null, as in tests we may pass - // procedures other than ServerProcedureInterface - removeFromRunQueue(serverRunQueue, getServerQueue(serverName, null)); + // In tests we may pass procedures other than ServerProcedureInterface, just pass null if + // so. + removeFromRunQueue(serverRunQueue, + getServerQueue(serverName, + procedure instanceof ServerProcedureInterface ? (ServerProcedureInterface) procedure + : null)); return false; } waitProcedure(lock, procedure); @@ -873,9 +865,12 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler { final LockAndQueue lock = locking.getServerLock(serverName); // Only SCP will acquire/release server lock so do not need to check the return value here. lock.releaseExclusiveLock(procedure); - // We do not need to create a new queue so just pass null, as in tests we may pass procedures - // other than ServerProcedureInterface - addToRunQueue(serverRunQueue, getServerQueue(serverName, null)); + // In tests we may pass procedures other than ServerProcedureInterface, just pass null if + // so. + addToRunQueue(serverRunQueue, + getServerQueue(serverName, + procedure instanceof ServerProcedureInterface ? (ServerProcedureInterface) procedure + : null)); int waitingCount = wakeWaitingProcedures(lock); wakePollIfNeeded(waitingCount); } finally { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/AbstractPeerProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/AbstractPeerProcedure.java index 458e073..e133a65 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/AbstractPeerProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/AbstractPeerProcedure.java @@ -36,8 +36,6 @@ public abstract class AbstractPeerProcedure protected String peerId; - private volatile boolean locked; - // used to keep compatible with old client where we can only returns after updateStorage. protected ProcedurePrepareLatch latch; @@ -59,17 +57,20 @@ public abstract class AbstractPeerProcedure } @Override + protected boolean waitInitialized(MasterProcedureEnv env) { + return env.waitInitialized(this); + } + + @Override protected LockState acquireLock(MasterProcedureEnv env) { if (env.getProcedureScheduler().waitPeerExclusiveLock(this, peerId)) { return LockState.LOCK_EVENT_WAIT; } - locked = true; return LockState.LOCK_ACQUIRED; } @Override protected void releaseLock(MasterProcedureEnv env) { - locked = false; env.getProcedureScheduler().wakePeerExclusiveLock(this, peerId); } @@ -79,11 +80,6 @@ public abstract class AbstractPeerProcedure } @Override - protected boolean hasLock(MasterProcedureEnv env) { - return locked; - } - - @Override protected void serializeStateData(ProcedureStateSerializer serializer) throws IOException { super.serializeStateData(serializer); serializer.serialize(PeerProcedureStateData.newBuilder().setPeerId(peerId).build()); -- 2.7.4