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 80DB11153E for ; Mon, 22 Sep 2014 22:33:22 +0000 (UTC) Received: (qmail 13758 invoked by uid 500); 22 Sep 2014 22:33:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 13707 invoked by uid 500); 22 Sep 2014 22:33:22 -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 13691 invoked by uid 99); 22 Sep 2014 22:33:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2014 22:33:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1420B8A6162; Mon, 22 Sep 2014 22:33:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Mon, 22 Sep 2014 22:33:22 -0000 Message-Id: In-Reply-To: <66cb5d5489774294a44710db4aaaddbd@git.apache.org> References: <66cb5d5489774294a44710db4aaaddbd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/7] git commit: ACCUMULO-3157 close scanners ACCUMULO-3157 close scanners Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7983b2f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7983b2f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7983b2f2 Branch: refs/heads/master Commit: 7983b2f2a0fbb543518ada541554793994215392 Parents: 6340cbc Author: Eric Newton Authored: Mon Sep 22 11:51:08 2014 -0400 Committer: Josh Elser Committed: Mon Sep 22 16:33:54 2014 -0400 ---------------------------------------------------------------------- .../server/util/FindOfflineTablets.java | 42 +++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7983b2f2/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java b/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java index 42ebbe2..020e4ce 100644 --- a/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java +++ b/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java @@ -46,26 +46,30 @@ public class FindOfflineTablets { Instance instance = opts.getInstance(); MetaDataTableScanner rootScanner = new MetaDataTableScanner(instance, SecurityConstants.getSystemCredentials(), Constants.METADATA_ROOT_TABLET_KEYSPACE); MetaDataTableScanner metaScanner = new MetaDataTableScanner(instance, SecurityConstants.getSystemCredentials(), Constants.NON_ROOT_METADATA_KEYSPACE); - @SuppressWarnings("unchecked") - Iterator scanner = (Iterator)new IteratorChain(rootScanner, metaScanner); - LiveTServerSet tservers = new LiveTServerSet(instance, DefaultConfiguration.getDefaultConfiguration(), new Listener() { - @Override - public void update(LiveTServerSet current, Set deleted, Set added) { - if (!deleted.isEmpty() && scanning.get()) - log.warn("Tablet servers deleted while scanning: " + deleted); - if (!added.isEmpty() && scanning.get()) - log.warn("Tablet servers added while scanning: " + added); + try { + @SuppressWarnings("unchecked") + Iterator scanner = (Iterator)new IteratorChain(rootScanner, metaScanner); + LiveTServerSet tservers = new LiveTServerSet(instance, DefaultConfiguration.getDefaultConfiguration(), new Listener() { + @Override + public void update(LiveTServerSet current, Set deleted, Set added) { + if (!deleted.isEmpty() && scanning.get()) + log.warn("Tablet servers deleted while scanning: " + deleted); + if (!added.isEmpty() && scanning.get()) + log.warn("Tablet servers added while scanning: " + added); + } + }); + tservers.startListeningForTabletServerChanges(); + scanning.set(true); + while (scanner.hasNext()) { + TabletLocationState locationState = scanner.next(); + TabletState state = locationState.getState(tservers.getCurrentServers()); + if (state != null && state != TabletState.HOSTED && TableManager.getInstance().getTableState(locationState.extent.getTableId().toString()) != TableState.OFFLINE) + if (!locationState.extent.equals(Constants.ROOT_TABLET_EXTENT)) + System.out.println(locationState + " is " + state + " #walogs:" + locationState.walogs.size()); } - }); - tservers.startListeningForTabletServerChanges(); - scanning.set(true); - while (scanner.hasNext()) { - TabletLocationState locationState = scanner.next(); - TabletState state = locationState.getState(tservers.getCurrentServers()); - if (state != null && state != TabletState.HOSTED && TableManager.getInstance().getTableState(locationState.extent.getTableId().toString()) != TableState.OFFLINE) - if (!locationState.extent.equals(Constants.ROOT_TABLET_EXTENT)) - System.out.println(locationState + " is " + state + " #walogs:" + locationState.walogs.size()); + } finally { + rootScanner.close(); + metaScanner.close(); } } - }