You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/04/18 02:36:57 UTC
[hbase] branch branch-2 updated: HBASE-24166 Duplicate
implementation for acquireLock between CreateTableProcedure and its parent
class (#1486)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 935c233 HBASE-24166 Duplicate implementation for acquireLock between CreateTableProcedure and its parent class (#1486)
935c233 is described below
commit 935c23312fa17824fced19005aa1638a2871e197
Author: XinSun <dd...@gmail.com>
AuthorDate: Sat Apr 18 10:30:12 2020 +0800
HBASE-24166 Duplicate implementation for acquireLock between CreateTableProcedure and its parent class (#1486)
Signed-off-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../hadoop/hbase/master/procedure/CreateTableProcedure.java | 8 --------
.../apache/hadoop/hbase/master/procedure/InitMetaProcedure.java | 8 --------
2 files changed, 16 deletions(-)
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 a6c96a3..cc7a195 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
@@ -235,14 +235,6 @@ public class CreateTableProcedure
return super.waitInitialized(env);
}
- @Override
- protected LockState acquireLock(final MasterProcedureEnv env) {
- if (env.getProcedureScheduler().waitTableExclusiveLock(this, getTableName())) {
- return LockState.LOCK_EVENT_WAIT;
- }
- return LockState.LOCK_ACQUIRED;
- }
-
private boolean prepareCreate(final MasterProcedureEnv env) throws IOException {
final TableName tableName = getTableName();
if (MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {
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 024f3ea..c510a25 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
@@ -70,14 +70,6 @@ public class InitMetaProcedure extends AbstractStateMachineTableProcedure<InitMe
}
@Override
- protected LockState acquireLock(MasterProcedureEnv env) {
- if (env.getProcedureScheduler().waitTableExclusiveLock(this, getTableName())) {
- return LockState.LOCK_EVENT_WAIT;
- }
- return LockState.LOCK_ACQUIRED;
- }
-
- @Override
protected void rollbackState(MasterProcedureEnv env, InitMetaState state)
throws IOException, InterruptedException {
throw new UnsupportedOperationException();