You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/07/21 14:57:23 UTC
activemq-artemis git commit: Revert "Change on buffer timeout..."
Repository: activemq-artemis
Updated Branches:
refs/heads/master a298b203a -> 82639f590
Revert "Change on buffer timeout..."
This reverts commit 522c399bd27621f7caa5b755656e7272e77b85dd.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/82639f59
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/82639f59
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/82639f59
Branch: refs/heads/master
Commit: 82639f590b44c3fbf0062e0a7f28303d986b4f12
Parents: a298b20
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 21 13:57:07 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 21 13:57:07 2015 +0100
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 6 ------
.../test/java/org/apache/activemq/cli/test/ArtemisTest.java | 2 +-
.../core/journal/impl/AbstractSequentialFileFactory.java | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82639f59/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 4c5b440..52d665e 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -35,12 +35,6 @@ under the License.
<paging-directory>${data.dir}/paging</paging-directory>
- <!-- Nanosecond time for batching timeout before IO operations
- This will batch multiple writes before IO writes.
- Increasing this timeout would benefit scalabitility of multiple
- producers and consumers -->
- <journal-buffer-timeout>100</journal-buffer-timeout>
-
<bindings-directory>${data.dir}/bindings</bindings-directory>
<journal-directory>${data.dir}/journal</journal-directory>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82639f59/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
index e939f68..99c8f23 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -75,7 +75,7 @@ public class ArtemisTest
Artemis.main("create", temporaryFolder.getRoot().getAbsolutePath(), "--force", "--silent-input", "--no-web");
System.setProperty("artemis.instance", temporaryFolder.getRoot().getAbsolutePath());
// Some exceptions may happen on the initialization, but they should be ok on start the basic core protocol
- Artemis.execute("run");
+ Artemis.main("run");
Assert.assertEquals(Integer.valueOf(70), Artemis.execute("producer", "--txt-size", "50", "--message-count", "70", "--verbose"));
Assert.assertEquals(Integer.valueOf(70), Artemis.execute("consumer", "--txt-size", "50", "--verbose", "--break-on-null", "--receive-timeout", "100"));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82639f59/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java
index fcb8586..ec0ab4d 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java
@@ -71,7 +71,7 @@ abstract class AbstractSequentialFileFactory implements SequentialFileFactory
{
this.journalDir = journalDir;
- if (buffered && bufferTimeout > 0)
+ if (buffered)
{
timedBuffer = new TimedBuffer(bufferSize, bufferTimeout, logRates);
}