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 2015/06/19 15:09:34 UTC
incubator-ignite git commit: #Added logging.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-yardstick-client e85fa0635 -> 2ac41de97
#Added logging.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ac41de9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ac41de9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ac41de9
Branch: refs/heads/ignite-yardstick-client
Commit: 2ac41de97c4cf8d2777e4f02fce702f974b7cc38
Parents: e85fa06
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Jun 19 16:09:10 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Jun 19 16:09:10 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 4 ++++
modules/yardstick/pom.xml | 8 +++++++-
.../org/apache/ignite/yardstick/IgniteAbstractBenchmark.java | 4 ++--
.../main/java/org/apache/ignite/yardstick/IgniteNode.java | 2 +-
.../cache/IgnitePutGetClientPerThreadBenchmark.java | 2 ++
5 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac41de9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index fef6f4f..66c1e56 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -645,6 +645,8 @@ class ClientImpl extends TcpDiscoveryImpl {
joinErr = err;
+ log.error("ClientImpl.joinError", err);
+
joinLatch.countDown();
}
@@ -1024,6 +1026,8 @@ class ClientImpl extends TcpDiscoveryImpl {
else
msgWorker.addMessage(SPI_RECONNECT_FAILED);
}
+ else
+ log.info("Connected to socket: " + sock);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac41de9/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index c4cb122..ce6ec5a 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -55,7 +55,13 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-indexing</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-log4j</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.yardstickframework</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac41de9/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
index b848ad1..b9e553f 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
@@ -44,13 +44,13 @@ public abstract class IgniteAbstractBenchmark extends BenchmarkDriverAdapter {
jcommander(cfg.commandLineArguments(), args, "<ignite-driver>");
if (Ignition.state() != IgniteState.STARTED) {
- node = new IgniteNode(args.isClientOnly() && !args.isNearCache());
+ node = new IgniteNode(false);
node.start(cfg);
}
else
// Support for mixed benchmarks mode.
- node = new IgniteNode(args.isClientOnly() && !args.isNearCache(), Ignition.ignite());
+ node = new IgniteNode(false, Ignition.ignite());
waitForNodes();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac41de9/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index 705ae08..f6aaefb 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -142,7 +142,7 @@ public class IgniteNode implements BenchmarkServer {
spi.setNetworkTimeout(30_000);
spi.setSocketTimeout(30_000);
- spi.setJoinTimeout(30_000);
+ spi.setJoinTimeout(0);
c.setCommunicationSpi(commSpi);
c.setDiscoverySpi(spi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac41de9/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
index e33b7b7..5aa8550 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetClientPerThreadBenchmark.java
@@ -50,6 +50,8 @@ public class IgnitePutGetClientPerThreadBenchmark extends IgniteCacheAbstractBen
nodes.put(idSeq.getAndIncrement(), node);
}
+ else
+ TimeUnit.SECONDS.sleep(1);
int key = nextRandom(args.range());