You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/05/22 03:40:05 UTC
[2/6] accumulo git commit: ACCUMULO-3725 stop minc tracing before
follow-on majc is initiated
ACCUMULO-3725 stop minc tracing before follow-on majc is initiated
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4f6e5e0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4f6e5e0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4f6e5e0
Branch: refs/heads/1.7
Commit: b4f6e5e02af80cfd36487bc5316bfb0fa8eb3814
Parents: 53b9861
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Tue Apr 14 11:16:21 2015 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 21 21:28:12 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/Tablet.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4f6e5e0/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 2b25125..6fe2f31 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -2162,6 +2162,11 @@ public class Tablet {
mincReason);
span.stop();
+ minorCompaction.data("extent", extent.toString());
+ minorCompaction.data("numEntries", Long.toString(this.stats.getNumEntries()));
+ minorCompaction.data("size", Long.toString(this.stats.getSize()));
+ minorCompaction.stop();
+
if (needsSplit()) {
tabletServer.executeSplit(Tablet.this);
} else {
@@ -2172,9 +2177,6 @@ public class Tablet {
throw new RuntimeException(t);
} finally {
minorCompactionInProgress = false;
- minorCompaction.data("extent", extent.toString());
- minorCompaction.data("numEntries", Long.toString(this.stats.getNumEntries()));
- minorCompaction.data("size", Long.toString(this.stats.getSize()));
minorCompaction.stop();
}
}