Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1EAA718842 for ; Thu, 24 Mar 2016 10:59:36 +0000 (UTC) Received: (qmail 91684 invoked by uid 500); 24 Mar 2016 10:59:36 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 91650 invoked by uid 500); 24 Mar 2016 10:59:36 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 91640 invoked by uid 99); 24 Mar 2016 10:59:36 -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, 24 Mar 2016 10:59:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E0A15DFC11; Thu, 24 Mar 2016 10:59:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Message-Id: <9e44a034ee9e4db89104a1c685c3e7f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-1071 IgniteCache.metrics() method returns local metrics Date: Thu, 24 Mar 2016 10:59:35 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1071 [created] 5069a2da1 IGNITE-1071 IgniteCache.metrics() method returns local metrics Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5069a2da Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5069a2da Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5069a2da Branch: refs/heads/ignite-1071 Commit: 5069a2da1befa44a3acdf765bee33d35aad0311a Parents: aa8dcd1 Author: Anton Vinogradov Authored: Thu Mar 24 13:58:17 2016 +0300 Committer: Anton Vinogradov Committed: Thu Mar 24 13:58:17 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheMetricsSnapshot.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 49 ++++++++++++++++++-- ...cheTransactionalAbstractMetricsSelfTest.java | 2 +- 4 files changed, 47 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5069a2da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java index fc7e9a7..3196900 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java @@ -353,7 +353,7 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable { reads += e.getCacheGets(); puts += e.getCachePuts(); hits += e.getCacheHits(); - misses += e.getCacheHits(); + misses += e.getCacheMisses(); txCommits += e.getCacheTxCommits(); txRollbacks += e.getCacheTxRollbacks(); evicts += e.getCacheEvictions(); http://git-wip-us.apache.org/repos/asf/ignite/blob/5069a2da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 9b7ac4c..b29014b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -222,7 +222,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter lsnr = new IgnitePredicate() { + @Override public boolean apply(Event ignore) { + latch.countDown(); + + return true; + } + }; + + for (int i = 0; i < gridCount(); i++) + grid(i).events().localListen(lsnr, EVT_NODE_METRICS_UPDATED); + + latch.await(); // wait for heartbeat based metrics clear. } /** {@inheritDoc} */ @@ -539,12 +570,12 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract expReads += expectedReadsPerPut(isPrimary); expMisses += expectedMissesPerPut(isPrimary); - info("Puts: " + cache0.metrics().getCachePuts()); + info("Puts: " + cache0.mxBean().getCachePuts()); for (int j = 0; j < gridCount(); j++) { IgniteCache cache = grid(j).cache(null); - int cacheWrites = (int)cache.metrics().getCachePuts(); + int cacheWrites = (int)cache.mxBean().getCachePuts(); assertEquals("Wrong cache metrics [i=" + i + ", grid=" + j + ']', i + 1, cacheWrites); } @@ -561,7 +592,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract int misses = 0; for (int i = 0; i < gridCount(); i++) { - CacheMetrics m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).mxBean(); puts += m.getCachePuts(); reads += m.getCacheGets(); @@ -589,12 +620,12 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract for (int i = 0; i < keyCnt; i++) { cache0.getAndPut(i, i); // +1 read - info("Puts: " + cache0.metrics().getCachePuts()); + info("Puts: " + cache0.mxBean().getCachePuts()); for (int j = 0; j < gridCount(); j++) { IgniteCache cache = grid(j).cache(null); - long cacheWrites = cache.metrics().getCachePuts(); + long cacheWrites = cache.mxBean().getCachePuts(); assertEquals("Wrong cache metrics [i=" + i + ", grid=" + j + ']', i + 1, cacheWrites); } @@ -606,6 +637,14 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract for (int i = 0; i < gridCount(); i++) { CacheMetrics m = grid(i).cache(null).metrics(); + GridTestUtils.waitForCondition( + new GridAbsPredicate() { + @Override public boolean apply() { + return m.getCachePuts() == keyCnt * 2; + } + }, + 20_000); + assertEquals(m.getCacheHits() * 100f / m.getCacheGets(), m.getCacheHitPercentage(), 0.1f); assertEquals(m.getCacheMisses() * 100f / m.getCacheGets(), m.getCacheMissPercentage(), 0.1f); } http://git-wip-us.apache.org/repos/asf/ignite/blob/5069a2da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index 4bd4c59..3160965 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -231,7 +231,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int i = 0; i < gridCount(); i++) { TransactionMetrics metrics = grid(i).transactions().metrics(); - CacheMetrics cacheMetrics = grid(i).cache(null).metrics(); + CacheMetrics cacheMetrics = grid(i).cache(null).mxBean(); if (i == 0) { assertEquals(TX_CNT, metrics.txCommits());