You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/10/11 23:37:17 UTC
ignite git commit: IGNITE-3443 Fixed NPE in metrics collector task.
Repository: ignite
Updated Branches:
refs/heads/ignite-3443 6ed0bff1c -> 8811441fe
IGNITE-3443 Fixed NPE in metrics collector task.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8811441f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8811441f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8811441f
Branch: refs/heads/ignite-3443
Commit: 8811441fe13b219d8dda188ba477d4911a30aeca
Parents: 6ed0bff
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Oct 12 06:37:09 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Oct 12 06:37:09 2016 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheQueryMetricsCollectorTask.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8811441f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java
index 3a37fc5..60affe5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryMetricsCollectorTask.java
@@ -27,8 +27,8 @@ import org.apache.ignite.cache.query.QueryDetailsMetrics;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
+import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryDetailsMetricsAdapter;
-import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.visor.VisorJob;
@@ -119,9 +119,12 @@ public class VisorCacheQueryMetricsCollectorTask extends VisorMultiNodeTask<Void
for (String cacheName : cacheNames) {
if (!isSystemCache(cacheName) && !isIgfsCache(cfg, cacheName)) {
- GridCacheQueryManager<Object, Object> qryMgr = cacheProc.cache(cacheName).context().queries();
+ IgniteInternalCache<Object, Object> cache = cacheProc.cache(cacheName);
- aggregateMetrics(jobRes, qryMgr.detailsMetrics());
+ if (cache == null || !cache.context().started())
+ continue;
+
+ aggregateMetrics(jobRes, cache.context().queries().detailsMetrics());
}
}