You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/08/29 18:57:10 UTC
[hbase] branch branch-2.1 updated: HBASE-22943 Various procedures
should not cache log trace level (#557)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 3b6f6b6 HBASE-22943 Various procedures should not cache log trace level (#557)
3b6f6b6 is described below
commit 3b6f6b623d46839e82ba5205c2315fe1f3770380
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Wed Aug 28 11:29:09 2019 -0500
HBASE-22943 Various procedures should not cache log trace level (#557)
Signed-off-by: Peter Somogyi <ps...@apache.org>
(cherry picked from commit 84cc51174239ef853bf257e4d8ae0cca5ca05e84)
---
.../master/assignment/SplitTableRegionProcedure.java | 17 +----------------
.../hbase/master/procedure/CloneSnapshotProcedure.java | 17 +----------------
.../hbase/master/procedure/EnableTableProcedure.java | 18 +-----------------
.../master/procedure/RestoreSnapshotProcedure.java | 18 +-----------------
4 files changed, 4 insertions(+), 66 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
index c51e98b..a685173 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
@@ -97,7 +97,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.S
public class SplitTableRegionProcedure
extends AbstractStateMachineRegionProcedure<SplitTableRegionState> {
private static final Logger LOG = LoggerFactory.getLogger(SplitTableRegionProcedure.class);
- private Boolean traceEnabled = null;
private RegionInfo daughter_1_RI;
private RegionInfo daughter_2_RI;
private byte[] bestSplitRow;
@@ -320,9 +319,7 @@ public class SplitTableRegionProcedure
@Override
protected void rollbackState(final MasterProcedureEnv env, final SplitTableRegionState state)
throws IOException, InterruptedException {
- if (isTraceEnabled()) {
- LOG.trace(this + " rollback state=" + state);
- }
+ LOG.trace("{} rollback state={}", this, state);
try {
switch (state) {
@@ -915,18 +912,6 @@ public class SplitTableRegionProcedure
}
}
- /**
- * The procedure could be restarted from a different machine. If the variable is null, we need to
- * retrieve it.
- * @return traceEnabled
- */
- private boolean isTraceEnabled() {
- if (traceEnabled == null) {
- traceEnabled = LOG.isTraceEnabled();
- }
- return traceEnabled;
- }
-
@Override
protected boolean abort(MasterProcedureEnv env) {
// Abort means rollback. We can't rollback all steps. HBASE-18018 added abort to all
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
index e85a1f3..a0f638a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
@@ -76,8 +76,6 @@ public class CloneSnapshotProcedure
// Monitor
private MonitoredTask monitorStatus = null;
- private Boolean traceEnabled = null;
-
/**
* Constructor (for failover)
*/
@@ -128,9 +126,7 @@ public class CloneSnapshotProcedure
@Override
protected Flow executeFromState(final MasterProcedureEnv env, final CloneSnapshotState state)
throws InterruptedException {
- if (isTraceEnabled()) {
- LOG.trace(this + " execute state=" + state);
- }
+ LOG.trace("{} execute state={}", this, state);
try {
switch (state) {
case CLONE_SNAPSHOT_PRE_OPERATION:
@@ -498,15 +494,4 @@ public class CloneSnapshotProcedure
metaChanges.updateMetaParentRegions(env.getMasterServices().getConnection(), newRegions);
}
- /**
- * The procedure could be restarted from a different machine. If the variable is null, we need to
- * retrieve it.
- * @return traceEnabled
- */
- private Boolean isTraceEnabled() {
- if (traceEnabled == null) {
- traceEnabled = LOG.isTraceEnabled();
- }
- return traceEnabled;
- }
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java
index a1f56c2..cc093af 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java
@@ -54,8 +54,6 @@ public class EnableTableProcedure
private TableName tableName;
private boolean skipTableStateCheck;
- private Boolean traceEnabled = null;
-
public EnableTableProcedure() {
super();
}
@@ -88,9 +86,7 @@ public class EnableTableProcedure
@Override
protected Flow executeFromState(final MasterProcedureEnv env, final EnableTableState state)
throws InterruptedException {
- if (isTraceEnabled()) {
- LOG.trace(this + " execute state=" + state);
- }
+ LOG.trace("{} execute state={}", this, state);
try {
switch (state) {
@@ -403,18 +399,6 @@ public class EnableTableProcedure
}
/**
- * The procedure could be restarted from a different machine. If the variable is null, we need to
- * retrieve it.
- * @return traceEnabled
- */
- private Boolean isTraceEnabled() {
- if (traceEnabled == null) {
- traceEnabled = LOG.isTraceEnabled();
- }
- return traceEnabled;
- }
-
- /**
* Coprocessor Action.
* @param env MasterProcedureEnv
* @param state the procedure state
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.java
index 80fc544..244711d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.java
@@ -77,8 +77,6 @@ public class RestoreSnapshotProcedure
// Monitor
private MonitoredTask monitorStatus = null;
- private Boolean traceEnabled = null;
-
/**
* Constructor (for failover)
*/
@@ -129,9 +127,7 @@ public class RestoreSnapshotProcedure
@Override
protected Flow executeFromState(final MasterProcedureEnv env, final RestoreSnapshotState state)
throws InterruptedException {
- if (isTraceEnabled()) {
- LOG.trace(this + " execute state=" + state);
- }
+ LOG.trace("{} execute state={}", this, state);
// Make sure that the monitor status is set up
getMonitorStatus();
@@ -549,16 +545,4 @@ public class RestoreSnapshotProcedure
env.getMasterServices().getConfiguration());
}
}
-
- /**
- * The procedure could be restarted from a different machine. If the variable is null, we need to
- * retrieve it.
- * @return traceEnabled
- */
- private Boolean isTraceEnabled() {
- if (traceEnabled == null) {
- traceEnabled = LOG.isTraceEnabled();
- }
- return traceEnabled;
- }
}