You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/10 11:52:54 UTC
[1/4] incubator-ignite git commit: master: visor debug reworked
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-21 dae4b9428 -> ce518b187
master: visor debug reworked
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0e5f1bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0e5f1bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0e5f1bb
Branch: refs/heads/ignite-21
Commit: a0e5f1bb9abdf979b6603927f2deb0db02101ce9
Parents: 20872dc
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Dec 10 12:26:04 2014 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Dec 10 12:26:04 2014 +0300
----------------------------------------------------------------------
.../grid/kernal/visor/VisorMultiNodeTask.java | 31 +++++++---
.../visor/node/VisorNodeDataCollectorJob.java | 64 ++++++++++++++++----
.../visor/node/VisorNodeDataCollectorTask.java | 24 ++++----
3 files changed, 88 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0e5f1bb/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
index 8db90e0..de6d88b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
import org.apache.ignite.resources.*;
import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.util.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -48,8 +47,8 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
protected abstract VisorJob<A, J> job(A arg);
/** {@inheritDoc} */
- @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
- @Nullable VisorTaskArgument<A> arg) throws GridException {
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, VisorTaskArgument<A> arg)
+ throws GridException {
assert arg != null;
start = U.currentTimeMillis();
@@ -61,13 +60,24 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
if (debug)
logStart(g.log(), getClass(), start);
+ return map0(subgrid, arg);
+ }
+
+ /**
+ * Actual map logic.
+ *
+ * @param arg Task execution argument.
+ * @param subgrid Nodes available for this task execution.
+ * @return Map of grid jobs assigned to subgrid node.
+ * @throws GridException If mapping could not complete successfully.
+ */
+ protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid, VisorTaskArgument<A> arg)
+ throws GridException {
Collection<UUID> nodeIds = arg.nodes();
Map<ComputeJob, ClusterNode> map = U.newHashMap(nodeIds.size());
try {
- taskArg = arg.argument();
-
for (ClusterNode node : subgrid)
if (nodeIds.contains(node.id()))
map.put(job(taskArg), node);
@@ -75,8 +85,7 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
return map;
}
finally {
- if (debug)
- logMapped(g.log(), getClass(), map.values());
+ logMapped(g.log(), getClass(), map.values());
}
}
@@ -87,7 +96,13 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
return ComputeJobResultPolicy.WAIT;
}
- /** {@inheritDoc} */
+ /**
+ * Actual reduce logic.
+ *
+ * @param results Job results.
+ * @return Task result.
+ * @throws GridException If reduction or results caused an error.
+ */
@Nullable protected abstract R reduce0(List<ComputeJobResult> results) throws GridException;
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0e5f1bb/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
index 1b5df78..7b3cec1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
@@ -86,8 +86,17 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
for (GridCache cache : g.cachesx()) {
String cacheName = cache.name();
- if (arg.systemCaches() || !(isSystemCache(cacheName) || isGgfsCache(cfg, cacheName)))
- res.caches().add(VisorCache.from(g, cache, arg.sample()));
+ if (arg.systemCaches() || !(isSystemCache(cacheName) || isGgfsCache(cfg, cacheName))) {
+ long start0 = U.currentTimeMillis();
+
+ try {
+ res.caches().add(VisorCache.from(g, cache, arg.sample()));
+ }
+ finally {
+ if (debug)
+ log(g.log(), "Collected cache: " + cache.name(), getClass(), start0);
+ }
+ }
}
}
catch (Throwable cachesEx) {
@@ -101,16 +110,24 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
GridGgfsProcessorAdapter ggfsProc = ((GridKernal)g).context().ggfs();
for (IgniteFs ggfs : ggfsProc.ggfss()) {
- Collection<GridIpcServerEndpoint> endPoints = ggfsProc.endpoints(ggfs.name());
+ long start0 = U.currentTimeMillis();
- if (endPoints != null) {
- for (GridIpcServerEndpoint ep : endPoints)
- if (ep.isManagement())
- res.ggfsEndpoints().add(new VisorGgfsEndpoint(ggfs.name(), g.name(),
- ep.getHost(), ep.getPort()));
- }
+ try {
+ Collection<GridIpcServerEndpoint> endPoints = ggfsProc.endpoints(ggfs.name());
- res.ggfss().add(VisorGgfs.from(ggfs));
+ if (endPoints != null) {
+ for (GridIpcServerEndpoint ep : endPoints)
+ if (ep.isManagement())
+ res.ggfsEndpoints().add(new VisorGgfsEndpoint(ggfs.name(), g.name(),
+ ep.getHost(), ep.getPort()));
+ }
+
+ res.ggfss().add(VisorGgfs.from(ggfs));
+ }
+ finally {
+ if (debug)
+ log(g.log(), "Collected GGFS: " + ggfs.name(), getClass(), start0);
+ }
}
}
catch (Throwable ggfssEx) {
@@ -124,8 +141,17 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
StreamerConfiguration[] cfgs = g.configuration().getStreamerConfiguration();
if (cfgs != null) {
- for (StreamerConfiguration cfg : cfgs)
- res.streamers().add(VisorStreamer.from(g.streamer(cfg.getName())));
+ for (StreamerConfiguration cfg : cfgs) {
+ long start0 = U.currentTimeMillis();
+
+ try {
+ res.streamers().add(VisorStreamer.from(g.streamer(cfg.getName())));
+ }
+ finally {
+ if (debug)
+ log(g.log(), "Collected streamer: " + cfg.getName(), getClass(), start0);
+ }
+ }
}
}
catch (Throwable streamersEx) {
@@ -144,14 +170,28 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
res.topologyVersion(g.topologyVersion());
+ long start0 = U.currentTimeMillis();
+
events(res, arg);
+ if (debug)
+ start0 = log(g.log(), "Collected events", getClass(), start0);
+
caches(res, arg);
+ if (debug)
+ start0 = log(g.log(), "Collected caches", getClass(), start0);
+
ggfs(res);
+ if (debug)
+ start0 = log(g.log(), "Collected ggfs", getClass(), start0);
+
streamers(res);
+ if (debug)
+ log(g.log(), "Collected streamers", getClass(), start0);
+
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0e5f1bb/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
index 7ff18e9..6107d4a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
@@ -19,6 +19,8 @@ import org.jetbrains.annotations.*;
import java.util.*;
+import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
+
/**
* Collects current Grid state mostly topology and metrics.
*/
@@ -29,21 +31,21 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
- @Nullable VisorTaskArgument<VisorNodeDataCollectorTaskArg> arg) throws GridException {
+ @Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid,
+ VisorTaskArgument<VisorNodeDataCollectorTaskArg> arg) throws GridException {
assert arg != null;
- taskArg = arg.argument();
-
- Collection<ClusterNode> nodes = g.nodes();
-
- Map<ComputeJob, ClusterNode> map = U.newHashMap(nodes.size());
+ Map<ComputeJob, ClusterNode> map = U.newHashMap(subgrid.size());
- // Collect data from ALL nodes.
- for (ClusterNode node : nodes)
- map.put(job(taskArg), node);
+ try {
+ for (ClusterNode node : subgrid)
+ map.put(job(taskArg), node);
- return map;
+ return map;
+ }
+ finally {
+ logMapped(g.log(), getClass(), map.values());
+ }
}
/** {@inheritDoc} */
[2/4] incubator-ignite git commit: # Ignite Fixed class names
Posted by sb...@apache.org.
# Ignite Fixed class names
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99ee7a70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99ee7a70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99ee7a70
Branch: refs/heads/ignite-21
Commit: 99ee7a70110a4551df335c34b5f4c748518c9bdf
Parents: 20872dc
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 10 13:40:00 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Dec 10 13:40:00 2014 +0300
----------------------------------------------------------------------
.../ignite/spi/deployment/DeploymentSpi.java | 2 +-
modules/core/src/test/config/tests.properties | 2 +-
...loymentClassLoaderMultiThreadedSelfTest.java | 4 ++--
.../GridUriDeploymentFileProcessorSelfTest.java | 2 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 2 +-
.../file/GridFileDeploymentSelfTest.java | 24 ++++++++++----------
.../GridFileDeploymentUndeploySelfTest.java | 4 ++--
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
9 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
index 78b251c..df035de 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.*;
* Gridgain provides the following {@code GridDeploymentSpi} implementations:
* <ul>
* <li>{@link org.apache.ignite.spi.deployment.local.LocalDeploymentSpi}</li>
- * <li>{@gglink org.gridgain.grid.spi.deployment.uri.GridUriDeploymentSpi}</li>
+ * <li>{@gglink org.apache.ignite.spi.deployment.uri.GridUriDeploymentSpi}</li>
* </ul>
* <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
* internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/core/src/test/config/tests.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/tests.properties b/modules/core/src/test/config/tests.properties
index 09d2711..f093d27 100644
--- a/modules/core/src/test/config/tests.properties
+++ b/modules/core/src/test/config/tests.properties
@@ -52,7 +52,7 @@ deploy.uri.http=http://216.93.179.140/gridgain/gg-test/deployment/
# Http scanner URI for secure SSL HTTPs deployment.
deploy.uri.https=https://216.93.179.140:8445/gridgain/gg-test/deployment/
# Directory with descriptors to construct GAR files.
-deploy.gar.descriptor.dir=modules/urideploy/src/test/java/org/gridgain/grid/spi/deployment/uri/META-INF
+deploy.gar.descriptor.dir=modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF
# Directory with a number of descriptors for the Ant gar task.
ant.gar.descriptor.dir=modules/extdata/p2p/META-INF
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
index 90c664d..83d483e 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
@@ -40,7 +40,7 @@ public class GridUriDeploymentClassLoaderMultiThreadedSelfTest extends GridCommo
multithreaded(
new Callable<Object>() {
@Nullable @Override public Object call() throws Exception {
- ldr.loadClass("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ ldr.loadClass("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
return null;
}
@@ -55,7 +55,7 @@ public class GridUriDeploymentClassLoaderMultiThreadedSelfTest extends GridCommo
multithreaded(
new Callable<Object>() {
@Nullable @Override public Object call() throws Exception {
- ldr0.loadClassGarOnly("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ ldr0.loadClassGarOnly("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java
index bff2278..8359793 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java
@@ -27,7 +27,7 @@ public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbs
*/
public void testTaskCorrect() throws Exception {
proceedTest("correct.gar", "gridgain.xml",
- "org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0", true);
+ "org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0", true);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
index ebfae24..6b6d0f7 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
@@ -23,7 +23,7 @@ public class GridUriDeploymentMultiScannersSelfTest extends GridUriDeploymentAbs
* @throws Exception If failed.
*/
public void testDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
index e8b7e4a..0009e2e 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
@@ -33,7 +33,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testDeploymentFromFolder() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
checkTask("GridUriDeploymentTestWithNameTask0");
}
@@ -43,7 +43,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testDeploymentFromFile() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
checkTask("GridUriDeploymentTestWithNameTask3");
}
@@ -60,7 +60,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testNoDescriptorDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask4");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask4");
checkTask("GridUriDeploymentTestWithNameTask4");
}
@@ -75,10 +75,10 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testBadDeployment() throws Exception {
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentAbstractTestTask");
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridInnerTestTask");
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentInterfaceTestTask");
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentNonePublicTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentAbstractTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridInnerTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentInterfaceTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentNonePublicTestTask");
}
/**
@@ -95,7 +95,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testDependenceDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask1");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask1");
}
/**
@@ -112,7 +112,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testNoDescriptorDependenceDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask2");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask2");
}
/**
@@ -130,12 +130,12 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testSignedDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask5");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask5");
checkTask("GridUriDeploymentTestWithNameTask5");
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask6") == null :
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask6") == null :
"Task from GAR with invalid signature should not be deployed.";
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask6")
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask6")
== null : "Task from GAR with invalid signature should not be deployed.";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
index 9ed0cc7..51b4c8f 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
@@ -63,7 +63,7 @@ public class GridFileDeploymentUndeploySelfTest extends GridSpiAbstractTest<Grid
Thread.sleep(GridUriDeploymentSpi.DFLT_DISK_SCAN_FREQUENCY + 3000);
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") != null :
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") != null :
"Failed to find resource for added GAR file.";
assert getSpi().findResource("GridUriDeploymentTestWithNameTask3") != null;
@@ -75,7 +75,7 @@ public class GridFileDeploymentUndeploySelfTest extends GridSpiAbstractTest<Grid
Thread.sleep(GridUriDeploymentSpi.DFLT_DISK_SCAN_FREQUENCY + 3000);
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") == null;
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") == null;
assert getSpi().findResource("GridUriDeploymentTestWithNameTask3") == null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
index 1309216..8b57126 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
@@ -23,7 +23,7 @@ public class GridFtpDeploymentTest extends GridUriDeploymentAbstractSelfTest {
* @throws Exception If failed.
*/
public void testDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
checkTask("GridUriDeploymentTestWithNameTask3");
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
index 27a91b4..6301925 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
@@ -65,7 +65,7 @@ public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception if failed.
*/
public void testDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
checkTask("GridUriDeploymentTestWithNameTask3");
}
[4/4] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-21
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-21
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce518b18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce518b18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce518b18
Branch: refs/heads/ignite-21
Commit: ce518b187e6af490da9e67a91e3d861c0c9f270f
Parents: dae4b94 682e47f
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 10 13:52:44 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Dec 10 13:52:44 2014 +0300
----------------------------------------------------------------------
.../ignite/spi/deployment/DeploymentSpi.java | 2 +-
.../grid/kernal/visor/VisorMultiNodeTask.java | 31 +++++++---
.../visor/node/VisorNodeDataCollectorJob.java | 64 ++++++++++++++++----
.../visor/node/VisorNodeDataCollectorTask.java | 24 ++++----
modules/core/src/test/config/tests.properties | 2 +-
...loymentClassLoaderMultiThreadedSelfTest.java | 4 +-
.../GridUriDeploymentFileProcessorSelfTest.java | 2 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 2 +-
.../file/GridFileDeploymentSelfTest.java | 24 ++++----
.../GridFileDeploymentUndeploySelfTest.java | 4 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
12 files changed, 110 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/682e47fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/682e47fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/682e47fe
Branch: refs/heads/ignite-21
Commit: 682e47fe205dc19f374130fb5bcd7de545fac275
Parents: 99ee7a7 a0e5f1b
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 10 13:40:52 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Dec 10 13:40:52 2014 +0300
----------------------------------------------------------------------
.../grid/kernal/visor/VisorMultiNodeTask.java | 31 +++++++---
.../visor/node/VisorNodeDataCollectorJob.java | 64 ++++++++++++++++----
.../visor/node/VisorNodeDataCollectorTask.java | 24 ++++----
3 files changed, 88 insertions(+), 31 deletions(-)
----------------------------------------------------------------------