accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/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
Date Fri, 24 Jan 2014 16:52:43 GMT
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 4cac84ecd -> 4e89c6145
  refs/heads/1.6.0-SNAPSHOT 6afef02fc -> d2e36ebb0
  refs/heads/master d44ece4e4 -> 6aed342bf


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/1.5.1-SNAPSHOT
Commit: 4e89c614533b730dc41ff437d2451b5c93fe243b
Parents: 4cac84e
Author: Eric Newton <eric.newton@gmail.com>
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Josh Elser <elserj@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);
             }


Mime
View raw message