Repository: accumulo Updated Branches: refs/heads/master fad97f7a6 -> aba5278bd
ACCUMULO-3725 stop minc tracing before follow-on majc is initiated Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aba5278b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aba5278b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aba5278b Branch: refs/heads/master Commit: aba5278bd7c4b2f1db2c41783dc3dfae59cbd0ec Parents: fad97f7 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Tue Apr 14 11:16:21 2015 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Tue Apr 14 17:52:42 2015 -0700 ---------------------------------------------------------------------- .../apache/accumulo/tserver/tablet/MinorCompactionTask.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/aba5278b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java index 53bf5c2..1b8347e 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java @@ -85,6 +85,11 @@ class MinorCompactionTask implements Runnable { mergeFile, true, queued, commitSession, flushId, mincReason); span.stop(); + minorCompaction.data("extent", tablet.getExtent().toString()); + minorCompaction.data("numEntries", Long.toString(this.stats.getNumEntries())); + minorCompaction.data("size", Long.toString(this.stats.getSize())); + minorCompaction.stop(); + if (tablet.needsSplit()) { tablet.getTabletServer().executeSplit(tablet); } else { @@ -95,9 +100,6 @@ class MinorCompactionTask implements Runnable { throw new RuntimeException(t); } finally { tablet.minorCompactionComplete(); - minorCompaction.data("extent", tablet.getExtent().toString()); - minorCompaction.data("numEntries", Long.toString(this.stats.getNumEntries())); - minorCompaction.data("size", Long.toString(this.stats.getSize())); minorCompaction.stop(); } }
