Repository: activemq-artemis Updated Branches: refs/heads/master f369142e2 -> 800cc461c
forcing libaio option Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/800cc461 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/800cc461 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/800cc461 Branch: refs/heads/master Commit: 800cc461ca7be67bd3bed3241655d6f12e5315a8 Parents: f369142 Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Wed Aug 12 14:46:46 2015 -0400 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Aug 12 15:31:09 2015 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/cli/commands/Create.java | 9 ++++++++- .../apache/activemq/artemis/maven/ArtemisCreatePlugin.java | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/800cc461/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index 6262fd2..8a2d60e 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -157,6 +157,9 @@ public class Create extends InputAbstract { @Option(name = "--topics", description = "comma separated list of jms topics ") String topics; + @Option(name = "--aio", description = "Force aio journal on the configuration regardless of the library being available or not.") + boolean forceLibaio; + boolean IS_WINDOWS; boolean IS_CYGWIN; @@ -665,7 +668,11 @@ public class Create extends InputAbstract { } private boolean supportsLibaio() { - if (LibaioContext.isLoaded()) { + if (forceLibaio) { + // forcing libaio + return true; + } + else if (LibaioContext.isLoaded()) { try (LibaioContext context = new LibaioContext(1, true)) { File tmpFile = new File(directory, "validateAIO.bin"); boolean supportsLibaio = true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/800cc461/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java ---------------------------------------------------------------------- diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java index acb9466..a60c341 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java @@ -251,6 +251,10 @@ public class ArtemisCreatePlugin extends ArtemisAbstractPlugin { add(listCommands, "--verbose"); + if ("Linux".equals(System.getProperty("os.name"))) { + add(listCommands, "--aio"); + } + for (String str : args) { add(listCommands, str); }
