hgromer commented on code in PR #7582:
URL: https://github.com/apache/hbase/pull/7582#discussion_r2817333240
##########
hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java:
##########
@@ -83,12 +82,48 @@ public Map<String, Long> getIncrBackupLogFileMap() throws
IOException {
LOG.info("Execute roll log procedure for incremental backup ...");
BackupUtils.logRoll(conn, backupInfo.getBackupRootDir(), conf);
- newTimestamps = readRegionServerLastLogRollResult();
+ Map<String, Long> newTimestamps = readRegionServerLastLogRollResult();
+
+ Map<String, Long> latestLogRollByHost =
readRegionServerLastLogRollResult();
+ for (Map.Entry<String, Long> entry : latestLogRollByHost.entrySet()) {
+ String host = entry.getKey();
+ long latestLogRoll = entry.getValue();
+ Long earliestTimestampToIncludeInBackup =
previousTimestampMins.get(host);
+
+ boolean isInactive = earliestTimestampToIncludeInBackup != null
+ && earliestTimestampToIncludeInBackup > latestLogRoll;
+
+ long latestTimestampToIncludeInBackup;
+ if (isInactive) {
+ LOG.debug("Avoided resetting latest timestamp boundary for {} from {}
to {}", host,
+ earliestTimestampToIncludeInBackup, latestLogRoll);
+ latestTimestampToIncludeInBackup = earliestTimestampToIncludeInBackup;
+ } else {
+ latestTimestampToIncludeInBackup = latestLogRoll;
+ }
+ newTimestamps.put(host, latestTimestampToIncludeInBackup);
+ }
logList = getLogFilesForNewBackup(previousTimestampMins, newTimestamps,
conf, savedStartCode);
logList = excludeProcV2WALs(logList);
backupInfo.setIncrBackupFileList(logList);
+ // Update boundaries based on WALs that will be backed up
+ for (String logFile : logList) {
+ Path logPath = new Path(logFile);
+ String logHost = BackupUtils.parseHostFromOldLog(logPath);
+ if (logHost == null) {
+ logHost = BackupUtils.parseHostNameFromLogFile(logPath.getParent());
Review Comment:
You're right, we can merge the two paths here. I'm actually duplicating work
that `parseHostNameFromLogFile` which already handles the difference between
the oldWALs and WAL file directory structure
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
