Skip to content

HBASE-24823 Port HBASE-22762 Print the delta between phases in the sp… #2204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sguggilam wants to merge 2 commits into from
Closed

HBASE-24823 Port HBASE-22762 Print the delta between phases in the sp… #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4269962
HBASE-24823 Port HBASE-22762 Print the delta between phases in the sp…
Aug 5, 2020
cde232b
Check for journal enabled beforre printing
Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
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;
Expand Down Expand Up @@ -271,7 +270,23 @@ public void disableStatusJournal() {

@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++) {
Copy link
Member

@liuml07 liuml07 Aug 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will journal be null ever?

Copy link
Contributor Author

@sguggilam sguggilam Aug 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@liuml07 That's a good point. It would thrown an NPE and thereafter abort the master if we print the journal without enabling it. Pushed the change to have a safety check before printing the journal entries

Copy link
Member

@liuml07 liuml07 Aug 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense. Thanks

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();
}

}
4 changes: 2 additions & 2 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2341,7 +2341,7 @@ public boolean compact(CompactionContext compaction, HStore store,
} 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();
}
Expand Down Expand Up @@ -2506,7 +2506,7 @@ public FlushResultImpl flushcache(List<byte[]> families,
}
} 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();
}
Expand Down