accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/2] 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
Date Wed, 27 Nov 2013 14:48:19 GMT
Updated Branches:
  refs/heads/master 240436e6a -> e67763773


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


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/edae90f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edae90f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edae90f5

Branch: refs/heads/master
Commit: edae90f593da385e3a6d58063a2d41fbdbb543aa
Parents: c70d14e
Author: Eric Newton <eric.newton@gmail.com>
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Wed Nov 27 09:47:44 2013 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/tserver/TabletServer.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/edae90f5/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 1b4ccaf..fa29135 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -2819,8 +2819,13 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
 
             if (openingOverlapping.contains(extent) || onlineOverlapping.contains(extent))
               return;
+            
+            if (!unopenedOverlapping.contains(extent)) {
+              log.info("assignment " + extent + " no longer in the unopened set");
+              return;
+            }
 
-            if (!unopenedTablets.contains(extent) || unopenedOverlapping.size() != 1 || openingOverlapping.size()
> 0 || onlineOverlapping.size() > 0) {
+            if (unopenedOverlapping.size() != 1 || openingOverlapping.size() > 0 || onlineOverlapping.size()
> 0) {
               throw new IllegalStateException("overlaps assigned " + extent + " " + !unopenedTablets.contains(extent)
+ " " + unopenedOverlapping + " "
                   + openingOverlapping + " " + onlineOverlapping);
             }


Mime
View raw message