VisorNodeDataCollectorTask should be aware of passed nodes IDs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa499959 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa499959 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa499959 Branch: refs/heads/ignite-1232 Commit: aa499959d5551967ee6d4aba321e98a3415094ba Parents: f267a30 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Jul 6 18:17:52 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Jul 6 18:17:52 2016 +0700 ---------------------------------------------------------------------- .../visor/compute/VisorGatewayTask.java | 2 +- .../visor/node/VisorNodeDataCollectorTask.java | 26 -------------------- 2 files changed, 1 insertion(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/aa499959/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java index f1b22ff..2539a26 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java @@ -175,7 +175,7 @@ public class VisorGatewayTask implements ComputeTask<Object[], Object> { assert values.length >= 1; res.put(toSimpleObject(keyCls, values[0]), - values.length > 1 ? toSimpleObject(valCls, values[1]) : null); + values.length > 1 ? toSimpleObject(valCls, values[1]) : null); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/aa499959/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 494f902..746583d 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 @@ -18,22 +18,15 @@ package org.apache.ignite.internal.visor.node; import java.util.List; -import java.util.Map; import java.util.UUID; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterGroupEmptyException; -import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.compute.ComputeJob; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.visor.VisorMultiNodeTask; -import org.apache.ignite.internal.visor.VisorTaskArgument; import org.apache.ignite.internal.visor.util.VisorExceptionWrapper; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.logMapped; - /** * Collects current Grid state mostly topology and metrics. */ @@ -44,25 +37,6 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData private static final long serialVersionUID = 0L; /** {@inheritDoc} */ - @Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid, - VisorTaskArgument<VisorNodeDataCollectorTaskArg> arg) { - assert arg != null; - - Map<ComputeJob, ClusterNode> map = U.newHashMap(subgrid.size()); - - try { - for (ClusterNode node : subgrid) - map.put(job(taskArg), node); - - return map; - } - finally { - if (debug) - logMapped(ignite.log(), getClass(), map.values()); - } - } - - /** {@inheritDoc} */ @Override protected VisorNodeDataCollectorJob job(VisorNodeDataCollectorTaskArg arg) { return new VisorNodeDataCollectorJob(arg, debug); }
