diff --git a/hbase-hbtop/pom.xml b/hbase-hbtop/pom.xml index c2dbffdb3567..793eba59b542 100644 --- a/hbase-hbtop/pom.xml +++ b/hbase-hbtop/pom.xml @@ -25,7 +25,7 @@ hbase-build-configuration org.apache.hbase - 2.2.1 + 2.2.0-mdh3.2-SNAPSHOT ../hbase-build-configuration hbase-hbtop 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 84304b394cce..13908aec2a1a 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 @@ -546,18 +546,6 @@ private void restoreSnapshotAcl(final MasterProcedureEnv env) throws IOException } } - /** - * 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; - } - public SnapshotDescription getSnapshot() { return this.snapshot; }