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 2014/01/24 17:52:45 UTC
[3/6] git commit: ACCUMULO-1937 decrease log severity for expected
case of a tablet no longer being in the unopened set at the moment it is
being loaded
ACCUMULO-1937 decrease log severity for expected case of a tablet no longer being in the unopened set at the moment it is being loaded
Conflicts:
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e89c614
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e89c614
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e89c614
Branch: refs/heads/master
Commit: 4e89c614533b730dc41ff437d2451b5c93fe243b
Parents: 4cac84e
Author: Eric Newton <er...@gmail.com>
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 24 11:49:18 2014 -0500
----------------------------------------------------------------------
.../apache/accumulo/server/tabletserver/TabletServer.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e89c614/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 8f2bbed..2ce6b9d 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2430,8 +2430,13 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
if (openingOverlapping.contains(extent) || onlineOverlapping.contains(extent))
return;
-
- if (!unopenedTablets.contains(extent) || unopenedOverlapping.size() != 1 || openingOverlapping.size() > 0 || onlineOverlapping.size() > 0) {
+
+ if (!unopenedOverlapping.contains(extent)) {
+ log.info("assignment " + extent + " no longer in the unopened set");
+ return;
+ }
+
+ if (unopenedOverlapping.size() != 1 || openingOverlapping.size() > 0 || onlineOverlapping.size() > 0) {
throw new IllegalStateException("overlaps assigned " + extent + " " + !unopenedTablets.contains(extent) + " " + unopenedOverlapping + " "
+ openingOverlapping + " " + onlineOverlapping);
}