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 98E4F17511 for ; Thu, 12 Feb 2015 02:16:16 +0000 (UTC) Received: (qmail 99834 invoked by uid 500); 12 Feb 2015 02:16:16 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 99727 invoked by uid 500); 12 Feb 2015 02:16:16 -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 99692 invoked by uid 99); 12 Feb 2015 02:16:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2015 02:16:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A5A5E05E3; Thu, 12 Feb 2015 02:16:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Thu, 12 Feb 2015 02:16:17 -0000 Message-Id: <129a994e6672421ea1750dcf854efea3@git.apache.org> In-Reply-To: <6769d3ab8ef34be6abfc4f5110e8091a@git.apache.org> References: <6769d3ab8ef34be6abfc4f5110e8091a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] accumulo git commit: ACCUMULO-3580 Make metadata iterator consume in the normal case ACCUMULO-3580 Make metadata iterator consume in the normal case Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33890b00 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33890b00 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33890b00 Branch: refs/heads/1.6 Commit: 33890b00e1cf7f353631439eb6278d646ce70194 Parents: c475c85 Author: Christopher Tubbs Authored: Wed Feb 11 17:12:01 2015 -0500 Committer: Christopher Tubbs Committed: Wed Feb 11 17:12:01 2015 -0500 ---------------------------------------------------------------------- .../accumulo/server/master/state/TabletStateChangeIterator.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33890b00/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java b/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java index 405bab7..b11809c 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java +++ b/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java @@ -142,11 +142,15 @@ public class TabletStateChangeIterator extends SkippingIterator { case HOSTED: if (!shouldBeOnline) return; + break; case ASSIGNED_TO_DEAD_SERVER: return; case UNASSIGNED: if (shouldBeOnline) return; + break; + default: + throw new AssertionError("Inconceivable! The tablet is an unrecognized state: " + tls.getState(current)); } // table is in the expected state so don't bother returning any information about it getSource().next();