Repository: ignite Updated Branches: refs/heads/master 7ceecc43f -> d3d129a77
IGNITE-10800 Added WAL mode parameter and warning message - Fixes #5734. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d3d129a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d3d129a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d3d129a7 Branch: refs/heads/master Commit: d3d129a7776d2d807819963a19f4adaf2e141449 Parents: 7ceecc4 Author: oleg-ostanin <oosta...@gridagin.com> Authored: Fri Dec 28 15:43:07 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Fri Dec 28 15:43:07 2018 +0300 ---------------------------------------------------------------------- .../ignite/yardstick/IgniteBenchmarkArguments.java | 11 +++++++++++ .../java/org/apache/ignite/yardstick/IgniteNode.java | 6 ++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d3d129a7/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 4f8b83b..72cb486 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 @@ -251,6 +251,10 @@ public class IgniteBenchmarkArguments { private boolean persistentStoreEnabled; /** */ + @Parameter(names = {"-wm", "--walMode"}, description = "WAL mode") + private String walMode = "LOG_ONLY"; + + /** */ @Parameter(names = {"-stcp", "--streamerCachesPrefix"}, description = "Cache name prefix for streamer benchmark") private String streamerCachesPrefix = "streamer"; @@ -302,6 +306,13 @@ public class IgniteBenchmarkArguments { } /** + * @return Wal mode. + */ + public String walMode() { + return walMode; + } + + /** * @return List of enabled load test operations. */ public List<String> allowedLoadTestOps() { http://git-wip-us.apache.org/repos/asf/ignite/blob/d3d129a7/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 4698e86..e107f78 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 @@ -32,6 +32,7 @@ import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; +import org.apache.ignite.configuration.WALMode; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; @@ -180,10 +181,15 @@ public class IgniteNode implements BenchmarkServer { // Set data storage configuration with persistence only if there is no data storage configuration // in configuration file. if (args.persistentStoreEnabled() && c.getDataStorageConfiguration() == null) { + BenchmarkUtils.println(String.format("Setting 'persistenceEnabled' property to 'true'. WAL mode is %s", + args.walMode())); + DataStorageConfiguration pcCfg = new DataStorageConfiguration(); pcCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(true); + pcCfg.setWalMode(WALMode.valueOf(args.walMode())); + c.setBinaryConfiguration(new BinaryConfiguration().setCompactFooter(false)); c.setDataStorageConfiguration(pcCfg);
