Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: stack@apache.org
To: commits@hbase.apache.org
Message-Id: <34dad82e868d475c83d31b4448adac84@git.apache.org>
Subject: hbase git commit: HBASE-19181 LogRollBackupSubprocedure will fail if
 we use AsyncFSWAL instead of FSHLog (Vladimir Rodionov)
Date: Thu, 16 Nov 2017 23:04:27 +0000 (UTC)
archived-at: Thu, 16 Nov 2017 23:04:29 -0000

Repository: hbase
Updated Branches:
  refs/heads/master f7212aaeb -> 5b13b624b


HBASE-19181 LogRollBackupSubprocedure will fail if we use AsyncFSWAL instead of FSHLog (Vladimir Rodionov)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5b13b624
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5b13b624
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5b13b624

Branch: refs/heads/master
Commit: 5b13b624bb3487c6a6805fd5368227ccbe357c7b
Parents: f7212aa
Author: Michael Stack <stack@apache.org>
Authored: Thu Nov 16 15:00:13 2017 -0800
Committer: Michael Stack <stack@apache.org>
Committed: Thu Nov 16 15:04:07 2017 -0800

----------------------------------------------------------------------
 .../regionserver/LogRollBackupSubprocedure.java  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5b13b624/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java
index 2467913..183463d 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java
@@ -26,7 +26,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
 import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager;
-import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.client.Connection;
 import org.apache.hadoop.hbase.errorhandling.ForeignException;
 import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher;
@@ -35,9 +34,9 @@ import org.apache.hadoop.hbase.procedure.Subprocedure;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices;
 import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;
-import org.apache.hadoop.hbase.regionserver.wal.FSHLog;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.wal.WAL;
+import org.apache.yetus.audience.InterfaceAudience;
 
 /**
  * This backup sub-procedure implementation forces a WAL rolling on a RS.
@@ -48,7 +47,6 @@ public class LogRollBackupSubprocedure extends Subprocedure {
 
   private final RegionServerServices rss;
   private final LogRollBackupSubprocedurePool taskManager;
-  private FSHLog hlog;
   private String backupRoot;
 
   public LogRollBackupSubprocedure(RegionServerServices rss, ProcedureMember member,
@@ -67,7 +65,7 @@ public class LogRollBackupSubprocedure extends Subprocedure {
 
   /**
    * Callable task. TODO. We don't need a thread pool to execute roll log. This can be simplified
-   * with no use of subprocedurepool.
+   * with no use of sub-procedure pool.
    */
   class RSRollLogTask implements Callable<Void> {
     RSRollLogTask() {
@@ -76,16 +74,17 @@ public class LogRollBackupSubprocedure extends Subprocedure {
     @Override
     public Void call() throws Exception {
       if (LOG.isDebugEnabled()) {
-        LOG.debug("++ DRPC started: " + rss.getServerName());
+        LOG.debug("DRPC started: " + rss.getServerName());
       }
-      hlog = (FSHLog) rss.getWAL(null);
-      long filenum = hlog.getFilenum();
+
+      AbstractFSWAL<?> fsWAL = (AbstractFSWAL<?>) rss.getWAL(null);
+      long filenum = fsWAL.getFilenum();
       List<WAL> wals = rss.getWALs();
       long highest = -1;
       for (WAL wal : wals) {
         if (wal == null) continue;
-        if (((AbstractFSWAL) wal).getFilenum() > highest) {
-          highest = ((AbstractFSWAL) wal).getFilenum();
+        if (((AbstractFSWAL<?>) wal).getFilenum() > highest) {
+          highest = ((AbstractFSWAL<?>) wal).getFilenum();
         }
       }
 
@@ -97,7 +96,7 @@ public class LogRollBackupSubprocedure extends Subprocedure {
         Thread.sleep(20);
       }
       LOG.debug("log roll took " + (EnvironmentEdgeManager.currentTime() - start));
-      LOG.info("After roll log in backup subprocedure, current log number: " + hlog.getFilenum()
+      LOG.info("After roll log in backup subprocedure, current log number: " + fsWAL.getFilenum()
           + " on " + rss.getServerName());
 
       Connection connection = rss.getConnection();