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 9BABF18C4C for ; Thu, 4 Jun 2015 09:36:59 +0000 (UTC) Received: (qmail 59787 invoked by uid 500); 4 Jun 2015 09:36:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 59754 invoked by uid 500); 4 Jun 2015 09:36:46 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 59744 invoked by uid 99); 4 Jun 2015 09:36:46 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2015 09:36:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 61D45C0B58 for ; Thu, 4 Jun 2015 09:36:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Q_z4RIBVmm-O for ; Thu, 4 Jun 2015 09:36:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 10D5927614 for ; Thu, 4 Jun 2015 09:36:17 +0000 (UTC) Received: (qmail 57503 invoked by uid 99); 4 Jun 2015 09:36: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, 04 Jun 2015 09:36:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BFB25E0FE2; Thu, 4 Jun 2015 09:36:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 04 Jun 2015 09:36:26 -0000 Message-Id: <22c67621e92b40ababae1f56b593a1e8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/50] incubator-ignite git commit: ignite-968 avoid wait for affinity future on metrics creation ignite-968 avoid wait for affinity future on metrics creation Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3c1f0caa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3c1f0caa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3c1f0caa Branch: refs/heads/ignite-gg-9621 Commit: 3c1f0caae8266cf65079f345f95063bea5d5e2a8 Parents: 4e563ed Author: sboikov Authored: Tue Jun 2 10:30:29 2015 +0300 Committer: sboikov Committed: Tue Jun 2 10:30:29 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 4 +++- .../ignite/internal/processors/cache/CacheMetricsImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3c1f0caa/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 4ef602e..1db0b07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -695,7 +695,9 @@ public class GridDiscoveryManager extends GridManagerAdapter { Map metrics = null; for (GridCacheAdapter cache : caches) { - if (cache.context().started() && cache.configuration().isStatisticsEnabled()) { + if (cache.configuration().isStatisticsEnabled() && + cache.context().started() && + cache.context().affinity().affinityTopologyVersion().topologyVersion() > 0) { if (metrics == null) metrics = U.newHashMap(caches.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3c1f0caa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java index 4e6a447..74ba100 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java @@ -225,7 +225,7 @@ public class CacheMetricsImpl implements CacheMetrics { /** {@inheritDoc} */ @Override public long getOffHeapPrimaryEntriesCount() { try { - return cctx.swap().offheapEntriesCount(true, false, NONE); + return cctx.swap().offheapEntriesCount(true, false, cctx.affinity().affinityTopologyVersion()); } catch (IgniteCheckedException e) { return 0; @@ -235,7 +235,7 @@ public class CacheMetricsImpl implements CacheMetrics { /** {@inheritDoc} */ @Override public long getOffHeapBackupEntriesCount() { try { - return cctx.swap().offheapEntriesCount(false, true, NONE); + return cctx.swap().offheapEntriesCount(false, true, cctx.affinity().affinityTopologyVersion()); } catch (IgniteCheckedException e) { return 0;