opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-08-30 18:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #6634] Polish the HA logs to better troubleshoot issues (#6635)

Browse Source
This commit is contained in:
rongtong
2023-04-24 10:11:01 +08:00
committed by GitHub
parent af6a95f4c5
commit 14ad16b0d5
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+12 -2
View File
@@ -684,7 +684,11 @@ public class DefaultMessageStore implements MessageStore {
}
public void truncateDirtyFiles(long offsetToTruncate) {
LOGGER.info("truncate dirty files to {}", offsetToTruncate);
if (offsetToTruncate >= this.getMaxPhyOffset()) {
LOGGER.info("no need to truncate files, truncate offset is {}, max physical offset is {}", offsetToTruncate, this.getMaxPhyOffset());
return;
}
@@ -706,18 +710,24 @@ public class DefaultMessageStore implements MessageStore {
this.reputMessageService = new ConcurrentReputMessageService();
}
this.reputMessageService.setReputFromOffset(Math.min(oldReputFromOffset, offsetToTruncate));
long resetReputOffset = Math.min(oldReputFromOffset, offsetToTruncate);
LOGGER.info("oldReputFromOffset is {}, reset reput from offset to {}", oldReputFromOffset, resetReputOffset);
this.reputMessageService.setReputFromOffset(resetReputOffset);
this.reputMessageService.start();
}
@Override
public boolean truncateFiles(long offsetToTruncate) {
if (offsetToTruncate >= this.getMaxPhyOffset()) {
LOGGER.info("no need to truncate files, truncate offset is {}, max physical offset is {}", offsetToTruncate, this.getMaxPhyOffset());
return true;
}
if (!isOffsetAligned(offsetToTruncate)) {
LOGGER.error("Offset {} not align, truncate failed, need manual fix");
LOGGER.error("offset {} is not align, truncate failed, need manual fix", offsetToTruncate);
return false;
}
truncateDirtyFiles(offsetToTruncate);
store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAClient.java
+7 -1
View File
@@ -448,7 +448,13 @@ public class AutoSwitchHAClient extends ServiceThread implements HAClient {
localEpochCache.initCacheFromEntries(localEpochEntries);
localEpochCache.setLastEpochEntryEndOffset(this.messageStore.getMaxPhyOffset());
LOGGER.info("master epoch entries is {}", masterEpochCache.getAllEntries());
LOGGER.info("local epoch entries is {}", localEpochEntries);
final long truncateOffset = localEpochCache.findConsistentPoint(masterEpochCache);
LOGGER.info("truncateOffset is {}", truncateOffset);
if (truncateOffset < 0) {
// If truncateOffset < 0, means we can't find a consistent point
LOGGER.error("Failed to find a consistent point between masterEpoch:{} and slaveEpoch:{}", masterEpochEntries, localEpochEntries);
@@ -496,7 +502,7 @@ public class AutoSwitchHAClient extends ServiceThread implements HAClient {
AutoSwitchHAClient.this.processPosition += headerSize + bodySize;
AutoSwitchHAClient.this.waitForRunning(1);
LOGGER.error("State not matched, masterState:{}, slaveState:{}, bodySize:{}, offset:{}, masterEpoch:{}, masterEpochStartOffset:{}, confirmOffset:{}",
masterState, AutoSwitchHAClient.this.currentState, bodySize, masterOffset, masterEpoch, masterEpochStartOffset, confirmOffset);
HAConnectionState.values()[masterState], AutoSwitchHAClient.this.currentState, bodySize, masterOffset, masterEpoch, masterEpochStartOffset, confirmOffset);
return false;
}