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/09/15 11:14:49 UTC
ignite git commit: ignite-1490: setting RandomEvectionPolicy for
NearCacheConfiguration. Introduced new parameter 'nearCacheMaxSize'
Repository: ignite
Updated Branches:
refs/heads/ignite-1490 dc44a2a78 -> da7ebe6e4
ignite-1490: setting RandomEvectionPolicy for NearCacheConfiguration. Introduced new parameter 'nearCacheMaxSize'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da7ebe6e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da7ebe6e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da7ebe6e
Branch: refs/heads/ignite-1490
Commit: da7ebe6e453bb8b9f1d741ed01098e84ac8b9470
Parents: dc44a2a
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Sep 15 12:14:42 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Sep 15 12:14:42 2015 +0300
----------------------------------------------------------------------
modules/yardstick/README.txt | 1 +
.../ignite/yardstick/IgniteBenchmarkArguments.java | 16 ++++++++++++++--
.../org/apache/ignite/yardstick/IgniteNode.java | 12 +++++++++---
3 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/da7ebe6e/modules/yardstick/README.txt
----------------------------------------------------------------------
diff --git a/modules/yardstick/README.txt b/modules/yardstick/README.txt
index 8cbe3cf..9f328b3 100644
--- a/modules/yardstick/README.txt
+++ b/modules/yardstick/README.txt
@@ -60,6 +60,7 @@ The following Ignite benchmark properties can be defined in the benchmark config
* `-sm <mode>` or `-syncMode <mode>` - Synchronization mode (defined in `CacheWriteSynchronizationMode`)
* `-cl` or `--client` - Client flag
* `-nc` or `--nearCache` - Near cache flag
+* `-ncms` or `--nearCacheMaxSize` - Near cache max size flag
* `-wom <mode>` or `--writeOrderMode <mode>` - Write order mode for ATOMIC caches (defined in `CacheAtomicWriteOrderMode`)
* `-txc <value>` or `--txConcurrency <value>` - Cache transaction concurrency control, either `OPTIMISTIC` or `PESSIMISTIC` (defined in `CacheTxConcurrency`)
* `-txi <value>` or `--txIsolation <value>` - Cache transaction isolation (defined in `CacheTxIsolation`)
http://git-wip-us.apache.org/repos/asf/ignite/blob/da7ebe6e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 9710443..962549a 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@ -53,6 +53,10 @@ public class IgniteBenchmarkArguments {
private boolean nearCacheFlag = false;
/** */
+ @Parameter(names = {"-ncms", "--nearCacheMaxSize"}, description = "Near cache max size flag")
+ private int nearCacheMaxSize = 100_000;
+
+ /** */
@Parameter(names = {"-wom", "--writeOrderMode"}, description = "Write ordering mode")
private CacheAtomicWriteOrderMode orderMode;
@@ -162,6 +166,13 @@ public class IgniteBenchmarkArguments {
}
/**
+ * @return Near cache max size flag.
+ */
+ public int nearCacheMaxSize() {
+ return nearCacheMaxSize;
+ }
+
+ /**
* @return Synchronization.
*/
public CacheWriteSynchronizationMode syncMode() {
@@ -271,11 +282,12 @@ public class IgniteBenchmarkArguments {
*/
public String description() {
return "-nn=" + nodes + "-b=" + backups + "-sm=" + syncMode + "-cl=" + clientOnly + "-nc=" + nearCacheFlag +
- (orderMode == null ? "" : "-wom=" + orderMode) + "-txc=" + txConcurrency;
+ (nearCacheFlag ? "-ncms=" + nearCacheMaxSize : "") + (orderMode == null ? "" : "-wom=" + orderMode) +
+ "-txc=" + txConcurrency;
}
/** {@inheritDoc} */
@Override public String toString() {
return GridToStringBuilder.toString(IgniteBenchmarkArguments.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/da7ebe6e/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 8c3bc45..3b427cb 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
@@ -24,6 +24,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
+import org.apache.ignite.cache.eviction.random.RandomEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -86,8 +87,13 @@ public class IgniteNode implements BenchmarkServer {
if (cl)
c.setClientMode(true);
- if (args.isNearCache())
- cc.setNearConfiguration(new NearCacheConfiguration());
+ if (args.isNearCache()) {
+ NearCacheConfiguration ncCfg = new NearCacheConfiguration();
+
+ ncCfg.setNearEvictionPolicy(new RandomEvictionPolicy(args.nearCacheMaxSize()));
+
+ cc.setNearConfiguration(ncCfg);
+ }
cc.setWriteSynchronizationMode(args.syncMode());
@@ -204,4 +210,4 @@ public class IgniteNode implements BenchmarkServer {
public Ignite ignite() {
return ignite;
}
-}
\ No newline at end of file
+}