Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-03-08 10:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change on buffer timeout..."

Browse Source 
This reverts commit 522c399bd27621f7caa5b755656e7272e77b85dd.
This commit is contained in:
Clebert Suconic 2015-07-21 13:57:07 +01:00
parent a298b203a7
commit 82639f590b
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
View File

@ -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>

2
artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
View File

@ -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"));

2
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java
View File

@ -71,7 +71,7 @@ abstract class AbstractSequentialFileFactory implements SequentialFileFactory
{
this.journalDir = journalDir;
if (buffered && bufferTimeout > 0)
if (buffered)
{
timedBuffer = new TimedBuffer(bufferSize, bufferTimeout, logRates);
}