Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Michael Stack 2017-11-16 15:00:13 -08:00
parent 9fecb3b2c8
commit f7ce3fd48a
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.java
View File

@ -26,7 +26,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager; 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.client.Connection;
import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignException;
import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; 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.HRegionServer;
import org.apache.hadoop.hbase.regionserver.RegionServerServices; import org.apache.hadoop.hbase.regionserver.RegionServerServices;
import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL; 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.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.wal.WAL; 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. * 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 RegionServerServices rss;
private final LogRollBackupSubprocedurePool taskManager; private final LogRollBackupSubprocedurePool taskManager;
private FSHLog hlog;
private String backupRoot; private String backupRoot;
public LogRollBackupSubprocedure(RegionServerServices rss, ProcedureMember member, 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 * 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> { class RSRollLogTask implements Callable<Void> {
RSRollLogTask() { RSRollLogTask() {
@ -76,16 +74,17 @@ public class LogRollBackupSubprocedure extends Subprocedure {
@Override @Override
public Void call() throws Exception { public Void call() throws Exception {
if (LOG.isDebugEnabled()) { 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(); List<WAL> wals = rss.getWALs();
long highest = -1; long highest = -1;
for (WAL wal : wals) { for (WAL wal : wals) {
if (wal == null) continue; if (wal == null) continue;
if (((AbstractFSWAL) wal).getFilenum() > highest) { if (((AbstractFSWAL<?>) wal).getFilenum() > highest) {
highest = ((AbstractFSWAL) wal).getFilenum(); highest = ((AbstractFSWAL<?>) wal).getFilenum();
} }
} }
@ -97,7 +96,7 @@ public class LogRollBackupSubprocedure extends Subprocedure {
Thread.sleep(20); Thread.sleep(20);
} }
LOG.debug("log roll took " + (EnvironmentEdgeManager.currentTime() - start)); 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()); + " on " + rss.getServerName());
Connection connection = rss.getConnection(); Connection connection = rss.getConnection();