From 8a7b4a34091b545c4ceb069c4f2b08c1b730fd95 Mon Sep 17 00:00:00 2001
From: Guanghao Zhang <zhangguanghao1@xiaomi.com>
Date: Mon, 9 Sep 2019 17:06:32 +0800
Subject: [PATCH] update hbtop to 2.2.0-mdh3.2-SNAPSHOT and fix compile error

---
 hbase-hbtop/pom.xml                                  |  2 +-
 .../master/procedure/RestoreSnapshotProcedure.java   | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

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 @@
   <parent>
     <artifactId>hbase-build-configuration</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>2.2.1</version>
+    <version>2.2.0-mdh3.2-SNAPSHOT</version>
     <relativePath>../hbase-build-configuration</relativePath>
   </parent>
   <artifactId>hbase-hbtop</artifactId>
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;
   }