Repository: incubator-ignite Updated Branches: refs/heads/ignite-368 4eb92027c -> 3780457f7
# IGNITE-368 Review. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3780457f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3780457f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3780457f Branch: refs/heads/ignite-368 Commit: 3780457f71bcce90c57121fec88e09c30c198ea2 Parents: 4eb9202 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Mar 11 18:04:19 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Mar 11 18:04:19 2015 +0700 ---------------------------------------------------------------------- .../visor/node/VisorNodeDataCollectorJob.java | 2 ++ .../node/VisorNodeDataCollectorJobResult.java | 17 +++++++++++++++++ .../visor/node/VisorNodeDataCollectorTask.java | 2 ++ .../node/VisorNodeDataCollectorTaskResult.java | 10 ++++++++++ 4 files changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3780457f/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java index 661c990..9366099 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java @@ -229,6 +229,8 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa if (debug) start0 = log(ignite.log(), "Collected events", getClass(), start0); + res.errorCount(ignite.context().exceptionRegistry().errorCount()); + caches(res, arg); if (debug) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3780457f/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java index ea8a8fc..d711e06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java @@ -68,6 +68,9 @@ public class VisorNodeDataCollectorJobResult implements Serializable { /** Exception while collecting node streamers. */ private Throwable streamersEx; + /** Errors count. */ + private long errCnt; + /** * @return Grid name. */ @@ -200,4 +203,18 @@ public class VisorNodeDataCollectorJobResult implements Serializable { public void streamersEx(Throwable streamersEx) { this.streamersEx = streamersEx; } + + /** + * @return Errors count. + */ + public long errorCount() { + return errCnt; + } + + /** + * @param errorCount Errors count. + */ + public void errorCount(long errorCount) { + errCnt = errorCount; + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3780457f/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java index 72ab6dd..26f5be3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java @@ -109,6 +109,8 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData taskRes.taskMonitoringEnabled().put(nid, jobRes.taskMonitoringEnabled()); + taskRes.errorCounts().put(nid, jobRes.errorCount()); + if (!jobRes.events().isEmpty()) taskRes.events().addAll(jobRes.events()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3780457f/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java index f9f5214..7826a9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java @@ -44,6 +44,9 @@ public class VisorNodeDataCollectorTaskResult implements Serializable { /** All task monitoring state collected from nodes. */ private final Map<UUID, Boolean> taskMonitoringEnabled = new HashMap<>(); + /** Nodes error counts. */ + private final Map<UUID, Long> errCnts = new HashMap<>(); + /** All events collected from nodes. */ private final List<VisorGridEvent> evts = new ArrayList<>(); @@ -181,4 +184,11 @@ public class VisorNodeDataCollectorTaskResult implements Serializable { public Map<UUID, Throwable> streamersEx() { return streamersEx; } + + /** + * @return Nodes error counts. + */ + public Map<UUID, Long> errorCounts() { + return errCnts; + } }
