You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2016/03/09 04:51:08 UTC
[7/8] hbase git commit: HBASE-15113 Procedure v2 - Speedup eviction
of sys operation results
HBASE-15113 Procedure v2 - Speedup eviction of sys operation results
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9e967e5c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9e967e5c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9e967e5c
Branch: refs/heads/master
Commit: 9e967e5c1ddcff46db0b80fb26e1cfe083cd1bfd
Parents: 648cc5e
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Tue Mar 8 10:46:54 2016 -0800
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Tue Mar 8 19:47:15 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/ProcedureInfo.java | 2 +-
.../hadoop/hbase/procedure2/Procedure.java | 13 ++++++++++
.../hbase/procedure2/ProcedureExecutor.java | 26 ++++++++++++--------
.../procedure/CreateNamespaceProcedure.java | 17 ++++++++++---
.../master/procedure/CreateTableProcedure.java | 7 ++++++
.../master/procedure/ServerCrashProcedure.java | 7 ++++++
6 files changed, 57 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e967e5c/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java
index 4880a6d..562ad7d 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java
@@ -203,7 +203,7 @@ public class ProcedureInfo implements Cloneable {
@InterfaceAudience.Private
public boolean hasClientAckTime() {
- return clientAckTime > 0;
+ return clientAckTime != -1;
}
@InterfaceAudience.Private
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e967e5c/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java
----------------------------------------------------------------------
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 64f817a..aff2b15 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
@@ -190,6 +190,19 @@ public abstract class Procedure<TEnvironment> implements Comparable<Procedure> {
return false;
}
+ /**
+ * By default, the executor will keep the procedure result around util
+ * the eviction TTL is expired. The client can cut down the waiting time
+ * by requesting that the result is removed from the executor.
+ * In case of system started procedure, we can force the executor to auto-ack.
+ * @param env the environment passed to the ProcedureExecutor
+ * @return true if the executor should wait the client ack for the result.
+ * Defaults to return true.
+ */
+ protected boolean shouldWaitClientAck(final TEnvironment env) {
+ return true;
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e967e5c/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
----------------------------------------------------------------------
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 41497af..38dd062 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
@@ -165,22 +165,23 @@ public class ProcedureExecutor<TEnvironment> {
final long evictTtl = conf.getInt(EVICT_TTL_CONF_KEY, DEFAULT_EVICT_TTL);
final long evictAckTtl = conf.getInt(EVICT_ACKED_TTL_CONF_KEY, DEFAULT_ACKED_EVICT_TTL);
- long now = EnvironmentEdgeManager.currentTime();
- Iterator<Map.Entry<Long, ProcedureInfo>> it = completed.entrySet().iterator();
+ final long now = EnvironmentEdgeManager.currentTime();
+ final Iterator<Map.Entry<Long, ProcedureInfo>> it = completed.entrySet().iterator();
+ final boolean isDebugEnabled = LOG.isDebugEnabled();
while (it.hasNext() && store.isRunning()) {
- Map.Entry<Long, ProcedureInfo> entry = it.next();
- ProcedureInfo result = entry.getValue();
+ final Map.Entry<Long, ProcedureInfo> entry = it.next();
+ final ProcedureInfo procInfo = entry.getValue();
// TODO: Select TTL based on Procedure type
- if ((result.hasClientAckTime() && (now - result.getClientAckTime()) >= evictAckTtl) ||
- (now - result.getLastUpdate()) >= evictTtl) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Evict completed procedure " + entry.getKey());
+ if ((procInfo.hasClientAckTime() && (now - procInfo.getClientAckTime()) >= evictAckTtl) ||
+ (now - procInfo.getLastUpdate()) >= evictTtl) {
+ if (isDebugEnabled) {
+ LOG.debug("Evict completed procedure: " + procInfo);
}
store.delete(entry.getKey());
it.remove();
- NonceKey nonceKey = result.getNonceKey();
+ NonceKey nonceKey = procInfo.getNonceKey();
if (nonceKey != null) {
nonceKeysToProcIdsMap.remove(nonceKey);
}
@@ -1272,7 +1273,12 @@ public class ProcedureExecutor<TEnvironment> {
}
// update the executor internal state maps
- completed.put(proc.getProcId(), Procedure.createProcedureInfo(proc, proc.getNonceKey()));
+ ProcedureInfo procInfo = Procedure.createProcedureInfo(proc, proc.getNonceKey());
+ if (!proc.shouldWaitClientAck(getEnvironment())) {
+ procInfo.setClientAckTime(0);
+ }
+
+ completed.put(procInfo.getProcId(), procInfo);
rollbackStack.remove(proc.getProcId());
procedures.remove(proc.getProcId());
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e967e5c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateNamespaceProcedure.java
----------------------------------------------------------------------
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 a760aa2..d8daab7 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
@@ -194,16 +194,18 @@ public class CreateNamespaceProcedure
sb.append(")");
}
+ private boolean isBootstrapNamespace() {
+ return nsDescriptor.equals(NamespaceDescriptor.DEFAULT_NAMESPACE) ||
+ nsDescriptor.equals(NamespaceDescriptor.SYSTEM_NAMESPACE);
+ }
+
@Override
protected boolean acquireLock(final MasterProcedureEnv env) {
if (!env.getMasterServices().isInitialized()) {
// 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).
- boolean isBootstrapNs = nsDescriptor.equals(NamespaceDescriptor.DEFAULT_NAMESPACE) ||
- nsDescriptor.equals(NamespaceDescriptor.SYSTEM_NAMESPACE);
-
- if (!isBootstrapNs && env.waitInitialized(this)) {
+ if (!isBootstrapNamespace() && env.waitInitialized(this)) {
return false;
}
}
@@ -364,4 +366,11 @@ public class CreateNamespaceProcedure
}
return traceEnabled;
}
+
+ @Override
+ protected boolean shouldWaitClientAck(MasterProcedureEnv env) {
+ // hbase and default namespaces are created on bootstrap internally by the system
+ // the client does not know about this procedures.
+ return !isBootstrapNamespace();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e967e5c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
----------------------------------------------------------------------
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 1ad8bd5..183871d 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
@@ -448,4 +448,11 @@ public class CreateTableProcedure
final TableName tableName) throws IOException {
env.getMasterServices().getTableDescriptors().get(tableName);
}
+
+ @Override
+ protected boolean shouldWaitClientAck(MasterProcedureEnv env) {
+ // system tables are created on bootstrap internally by the system
+ // the client does not know about this procedures.
+ return !getTableName().isSystemTable();
+ }
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e967e5c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
index c5deb0d..19e05fd 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
@@ -767,4 +767,11 @@ implements ServerProcedureInterface {
protected boolean isYieldBeforeExecuteFromState(MasterProcedureEnv env, ServerCrashState state) {
return true;
}
+
+ @Override
+ protected boolean shouldWaitClientAck(MasterProcedureEnv env) {
+ // The operation is triggered internally on the server
+ // the client does not know about this procedure.
+ return false;
+ }
}