Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AE2C410ABC for ; Fri, 22 Nov 2013 21:28:19 +0000 (UTC) Received: (qmail 78538 invoked by uid 500); 22 Nov 2013 21:28:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 78465 invoked by uid 500); 22 Nov 2013 21:28:19 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 78453 invoked by uid 99); 22 Nov 2013 21:28:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Nov 2013 21:28:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 545659025C9; Fri, 22 Nov 2013 21:28:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Fri, 22 Nov 2013 21:28:19 -0000 Message-Id: <5024186bd251455b9b54b921bd50f34d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: ACCUMULO-1921 check for null Updated Branches: refs/heads/1.6.0-SNAPSHOT 40d491807 -> 7dd3592cd refs/heads/master 51a01e380 -> e63d902fe ACCUMULO-1921 check for null Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7dd3592c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7dd3592c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7dd3592c Branch: refs/heads/1.6.0-SNAPSHOT Commit: 7dd3592cdcc333d221477d6b97584e1f1c514e3b Parents: 40d4918 Author: Eric Newton Authored: Fri Nov 22 16:28:11 2013 -0500 Committer: Eric Newton Committed: Fri Nov 22 16:28:11 2013 -0500 ---------------------------------------------------------------------- .../apache/accumulo/tserver/TabletServer.java | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7dd3592c/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 e7ac7fc..cb8c83e 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 @@ -2838,21 +2838,23 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu SortedMap tabletsKeyValues = new TreeMap(); try { Pair pair = verifyTabletInformation(extent, TabletServer.this.getTabletSession(), tabletsKeyValues, getClientAddressString(), getLock()); - locationToOpen = pair.getFirst(); - if (pair.getSecond() != null) { - synchronized (openingTablets) { - openingTablets.remove(extent); - openingTablets.notifyAll(); - // it expected that the new extent will overlap the old one... if it does not, it should not be added to unopenedTablets - if (!KeyExtent.findOverlapping(extent, new TreeSet(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) { - throw new IllegalStateException("Fixed split does not overlap " + extent + " " + pair.getSecond()); + if (pair != null) { + locationToOpen = pair.getFirst(); + if (pair.getSecond() != null) { + synchronized (openingTablets) { + openingTablets.remove(extent); + openingTablets.notifyAll(); + // it expected that the new extent will overlap the old one... if it does not, it should not be added to unopenedTablets + if (!KeyExtent.findOverlapping(extent, new TreeSet(Arrays.asList(pair.getSecond()))).contains(pair.getSecond())) { + throw new IllegalStateException("Fixed split does not overlap " + extent + " " + pair.getSecond()); + } + unopenedTablets.add(pair.getSecond()); } - unopenedTablets.add(pair.getSecond()); - } - // split was rolled back... try again + // split was rolled back... try again new AssignmentHandler(pair.getSecond()).run(); return; } + } } catch (Exception e) { synchronized (openingTablets) { openingTablets.remove(extent);