Repository: accumulo Updated Branches: refs/heads/master da242bc1a -> f6e574b03
ACCUMULO-2893 waiting to start means a compaction is underway Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b458df58 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b458df58 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b458df58 Branch: refs/heads/master Commit: b458df585eaa0507f6e96d1512f7581a3f02cbee Parents: 668c9e3 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Jun 13 11:27:55 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Jun 13 11:27:55 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b458df58/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java index 7182a34..0799d90 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java @@ -2059,7 +2059,7 @@ public class Tablet implements TabletCommitter { } public boolean isMajorCompactionRunning() { - return majorCompactionState == CompactionState.IN_PROGRESS; + return majorCompactionState != null; } public boolean isMinorCompactionQueued() {
