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 E5C57171E9 for ; Fri, 29 May 2015 01:28:49 +0000 (UTC) Received: (qmail 57566 invoked by uid 500); 29 May 2015 01:28:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 57532 invoked by uid 500); 29 May 2015 01:28:49 -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 57493 invoked by uid 99); 29 May 2015 01:28:49 -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; Fri, 29 May 2015 01:28:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76FE3E1118; Fri, 29 May 2015 01:28:49 +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: Fri, 29 May 2015 01:28:55 -0000 Message-Id: In-Reply-To: <21d93d42b84a4a75ae712e4c48d8f342@git.apache.org> References: <21d93d42b84a4a75ae712e4c48d8f342@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/11] accumulo git commit: ACCUMULO-3867 Switch concurrently-accessed long to AtomicLong ACCUMULO-3867 Switch concurrently-accessed long to AtomicLong Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c112a06 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c112a06 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c112a06 Branch: refs/heads/1.7 Commit: 7c112a06fbd3337f0517f8a0f14fe7eeff7f9512 Parents: f7b0930 Author: Josh Elser Authored: Thu May 28 19:49:31 2015 -0400 Committer: Josh Elser Committed: Thu May 28 21:14:19 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/monitor/Monitor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c112a06/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index abdaa4b..6e00863 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TimerTask; +import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import org.apache.accumulo.core.Constants; @@ -105,7 +106,7 @@ public class Monitor { private static final Logger log = LoggerFactory.getLogger(Monitor.class); private static final int REFRESH_TIME = 5; - private static long lastRecalc = 0L; + private static AtomicLong lastRecalc = new AtomicLong(0L); private static double totalIngestRate = 0.0; private static double totalQueryRate = 0.0; private static double totalScanRate = 0.0; @@ -242,7 +243,7 @@ public class Monitor { // only recalc every so often long currentTime = System.currentTimeMillis(); - if (currentTime - lastRecalc < REFRESH_TIME * 1000) + if (currentTime - lastRecalc.get() < REFRESH_TIME * 1000) return; synchronized (Monitor.class) { @@ -376,7 +377,7 @@ public class Monitor { } finally { synchronized (Monitor.class) { fetching = false; - lastRecalc = currentTime; + lastRecalc.set(currentTime); } } }