You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2025/11/27 09:39:36 UTC
(hbase) branch branch-2.5 updated: HBASE-29698 Correct log message in ReplicationSourceShipper.clearWALEntryBatch (#7431)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 9ddc28efa7d HBASE-29698 Correct log message in ReplicationSourceShipper.clearWALEntryBatch (#7431)
9ddc28efa7d is described below
commit 9ddc28efa7d11614fcb7c7fc5f54f53b3479d74f
Author: Liu Xiao <42...@users.noreply.github.com>
AuthorDate: Thu Nov 27 17:17:56 2025 +0800
HBASE-29698 Correct log message in ReplicationSourceShipper.clearWALEntryBatch (#7431)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 100cd23406ac5a3b1390b7c2733f02f3b6e81a63)
---
.../hbase/replication/regionserver/ReplicationSourceShipper.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java
index 8e5b2e5a1d3..d55ae0f349f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java
@@ -357,10 +357,9 @@ public class ReplicationSourceShipper extends Thread {
while (this.isAlive() || this.entryReader.isAlive()) {
try {
if (EnvironmentEdgeManager.currentTime() >= timeout) {
- LOG.warn(
- "Shipper clearWALEntryBatch method timed out whilst waiting reader/shipper "
- + "thread to stop. Not cleaning buffer usage. Shipper alive: {}; Reader alive: {}",
- this.source.getPeerId(), this.isAlive(), this.entryReader.isAlive());
+ LOG.warn("Shipper clearWALEntryBatch method timed out while waiting reader/shipper "
+ + "thread to stop. Not cleaning buffer usage. PeerId: {}; Shipper alive: {}; Reader "
+ + "alive: {}", this.source.getPeerId(), this.isAlive(), this.entryReader.isAlive());
return;
} else {
// Wait both shipper and reader threads to stop