You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by vj...@apache.org on 2020/08/06 13:26:43 UTC
[hbase] branch branch-2.3 updated: HBASE-24823 Port HBASE-22762
Print the delta between phases in the split/merge/compact/flush transaction
journals
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 543f189 HBASE-24823 Port HBASE-22762 Print the delta between phases in the split/merge/compact/flush transaction journals
543f189 is described below
commit 543f18957ddaf0312c0357da3558cefc521dd75b
Author: sguggilam <sa...@gmail.com>
AuthorDate: Thu Aug 6 18:42:18 2020 +0530
HBASE-24823 Port HBASE-22762 Print the delta between phases in the split/merge/compact/flush transaction journals
Closes #2204
Signed-off-by: Andrew Purtell <ap...@apache.org>
Signed-off-by: Mingliang Liu <li...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../hadoop/hbase/monitoring/MonitoredTaskImpl.java | 19 +++++++++++++++++--
.../org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++--
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java
index c95363b..af6a47a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.hadoop.hbase.util.GsonUtil;
-import org.apache.hadoop.util.StringUtils;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hbase.thirdparty.com.google.gson.Gson;
@@ -271,7 +270,23 @@ class MonitoredTaskImpl implements MonitoredTask {
@Override
public String prettyPrintJournal() {
- return StringUtils.join("\n\t", getStatusJournal());
+ if (!journalEnabled) {
+ return "";
+ }
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < journal.size(); i++) {
+ StatusJournalEntry je = journal.get(i);
+ sb.append(je.toString());
+ if (i != 0) {
+ StatusJournalEntry jep = journal.get(i-1);
+ long delta = je.getTimeStamp() - jep.getTimeStamp();
+ if (delta != 0) {
+ sb.append(" (+" + delta + " ms)");
+ }
+ }
+ sb.append("\n");
+ }
+ return sb.toString();
}
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index f4d7ddf..36f1c55 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -2308,7 +2308,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
} finally {
if (requestNeedsCancellation) store.cancelRequestedCompaction(compaction);
if (status != null) {
- LOG.debug("Compaction status journal for {}:\n\t{}", this.getRegionInfo().getEncodedName(),
+ LOG.debug("Compaction status journal for {}:\n{}", this.getRegionInfo().getEncodedName(),
status.prettyPrintJournal());
status.cleanup();
}
@@ -2456,7 +2456,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
} finally {
lock.readLock().unlock();
- LOG.debug("Flush status journal for {}:\n\t{}", this.getRegionInfo().getEncodedName(),
+ LOG.debug("Flush status journal for {}:\n{}", this.getRegionInfo().getEncodedName(),
status.prettyPrintJournal());
status.cleanup();
}