From 2c69fbe538f66497a5b6cc1a1ac8900bd7efb7ef Mon Sep 17 00:00:00 2001 From: Pavel Kuznetsov Date: Mon, 3 Sep 2018 21:37:20 +0300 Subject: [PATCH] IGNITE-9458: Changed behaviour of --mvcc flag in benchmark server. --- .../apache/ignite/yardstick/IgniteBenchmarkArguments.java | 8 ++++++-- .../main/java/org/apache/ignite/yardstick/IgniteNode.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) 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 bbe2ab37e4ccd..f67deaaea881b 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 @@ -25,6 +25,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.tostring.GridToStringBuilder; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.transactions.TransactionConcurrency; @@ -269,11 +270,14 @@ public class IgniteBenchmarkArguments { private int streamerBufSize = IgniteDataStreamer.DFLT_PER_NODE_BUFFER_SIZE; /** */ - @Parameter(names = {"-mvcc", "--mvcc"}, description = "Enable MVCC for cache") + @Parameter(names = {"-mvcc", "--mvcc"}, description = "Forcibly turn on mvcc") private boolean mvcc; /** - * @return {@code True} if need enable cache mvcc (see {@link CacheConfiguration#isMvccEnabled()}). + * Returns {@code true} if yardstick server need to enable mvcc in {@link IgniteConfiguration}; + * {@code false} - to use value from config. + * + * @see IgniteConfiguration#isMvccEnabled(). */ public boolean mvccEnabled() { return mvcc; 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 a259cbf575748..368b8a8eccc78 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 @@ -103,7 +103,8 @@ public IgniteNode(boolean clientMode, Ignite ignite) { CacheConfiguration[] ccfgs = c.getCacheConfiguration(); - c.setMvccEnabled(args.mvccEnabled()); + if (args.mvccEnabled()) + c.setMvccEnabled(true); if (ccfgs != null) { for (CacheConfiguration cc : ccfgs) {