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 DB9FF17FD8 for ; Mon, 2 Feb 2015 22:53:18 +0000 (UTC) Received: (qmail 51126 invoked by uid 500); 2 Feb 2015 22:53:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 51075 invoked by uid 500); 2 Feb 2015 22:53: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 51066 invoked by uid 99); 2 Feb 2015 22:53:19 -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; Mon, 02 Feb 2015 22:53:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 956BFE04D2; Mon, 2 Feb 2015 22:53: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: Mon, 02 Feb 2015 22:53:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: ACCUMULO-3549 updated with [~kturner]'s comments ACCUMULO-3549 updated with [~kturner]'s comments Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5d2bd54 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5d2bd54 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5d2bd54 Branch: refs/heads/master Commit: c5d2bd54a961ce59946304c6d440b42caa9bdbbb Parents: ed12e1f Author: Eric C. Newton Authored: Mon Feb 2 17:37:17 2015 -0500 Committer: Eric C. Newton Committed: Mon Feb 2 17:37:17 2015 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/impl/TabletLocator.java | 4 ++++ .../org/apache/accumulo/tserver/TabletServer.java | 14 ++------------ 2 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5d2bd54/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java index 1d35af0..5f30ddc 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java @@ -92,6 +92,10 @@ public abstract class TabletLocator { private static HashMap locators = new HashMap(); + public static synchronized void clearLocators() { + locators.clear(); + } + public static synchronized TabletLocator getLocator(Instance instance, Text tableId) { LocatorKey key = new LocatorKey(instance.getInstanceID(), tableId); http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5d2bd54/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 948d0f0..dbececd 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 @@ -65,7 +65,6 @@ import javax.management.StandardMBean; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; -import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.impl.CompressedIterators; import org.apache.accumulo.core.client.impl.CompressedIterators.IterConfig; @@ -287,16 +286,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu SimpleTimer.getInstance().schedule(new Runnable() { @Override public void run() { - try { - SystemCredentials creds = SystemCredentials.get(); - Connector connector = instance.getConnector(creds.getPrincipal(), creds.getToken()); - for (String id : connector.tableOperations().tableIdMap().values()) { - TabletLocator locator = TabletLocator.getLocator(instance, new Text(id)); - locator.invalidateCache(); - } - } catch (Exception ex) { - log.error("Error clearing locator cache, ignoring", ex); - } + TabletLocator.clearLocators(); } }, jitter(TIME_BETWEEN_LOCATOR_CACHE_CLEARS), jitter(TIME_BETWEEN_LOCATOR_CACHE_CLEARS)); } @@ -304,7 +294,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu private static long jitter(long ms) { Random r = new Random(); // add a random 10% wait - return (long)(1. + (r.nextDouble() / 10) * ms); + return (long)((1. + (r.nextDouble() / 10)) * ms); } private synchronized static void logGCInfo(AccumuloConfiguration conf) {