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:43 UTC

[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

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 <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);
             }

[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

Posted by el...@apache.org.
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);
             }

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


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

Branch: refs/heads/master
Commit: d2e36ebb099f815a7ca37d920eb9470dbf26368e
Parents: 6afef02 4e89c61
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 24 11:49:30 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 24 11:49:30 2014 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d2e36ebb099f815a7ca37d920eb9470dbf26368e
Parents: 6afef02 4e89c61
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 24 11:49:30 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 24 11:49:30 2014 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 6aed342bf2c7277fc0fdec58c70ae61edb1ce9e8
Parents: d44ece4 d2e36eb
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 24 11:49:38 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 24 11:49:38 2014 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[2/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

Posted by el...@apache.org.
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.6.0-SNAPSHOT
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);
             }