Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #1359

This commit is contained in:
Clebert Suconic 2017-06-22 10:48:10 -04:00
parent 37d1d5ff7b fbe27682a1
commit 902e0c49ab
10 changed files with 84 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
View File

@ -261,6 +261,9 @@ public final class ActiveMQDefaultConfiguration {
// The percentage of live data on which we consider compacting the journal
private static int DEFAULT_JOURNAL_COMPACT_PERCENTAGE = 30;
// The time to wait when opening a new journal file before failing
private static int DEFAULT_JOURNAL_FILE_OPEN_TIMEOUT = 5;
// The minimal number of data files before we can start compacting
private static int DEFAULT_JOURNAL_COMPACT_MIN_FILES = 10;
@ -796,6 +799,10 @@ public final class ActiveMQDefaultConfiguration {
return DEFAULT_JOURNAL_COMPACT_PERCENTAGE;
}
public static int getDefaultJournalFileOpenTimeout() {
return DEFAULT_JOURNAL_FILE_OPEN_TIMEOUT;
}
/**
* The minimal number of data files before we can start compacting
*/

10
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
View File

@ -81,6 +81,8 @@ public class JournalFilesRepository {
private final AtomicInteger freeFilesCount = new AtomicInteger(0);
private final int journalFileOpenTimeout;
private Executor openFilesExecutor;
private final Runnable pushOpenRunnable = new Runnable() {
@ -103,7 +105,8 @@ public class JournalFilesRepository {
final int maxAIO,
final int fileSize,
final int minFiles,
final int poolSize) {
final int poolSize,
final int journalFileOpenTimeout) {
if (filePrefix == null) {
throw new IllegalArgumentException("filePrefix cannot be null");
}
@ -122,6 +125,7 @@ public class JournalFilesRepository {
this.poolSize = poolSize;
this.userVersion = userVersion;
this.journal = journal;
this.journalFileOpenTimeout = journalFileOpenTimeout;
}
// Public --------------------------------------------------------
@ -421,7 +425,7 @@ public class JournalFilesRepository {
pushOpen();
nextFile = openedFiles.poll(5, TimeUnit.SECONDS);
nextFile = openedFiles.poll(journalFileOpenTimeout, TimeUnit.SECONDS);
}
if (openedFiles.isEmpty()) {
@ -431,7 +435,7 @@ public class JournalFilesRepository {
if (nextFile == null) {
logger.debug("Could not get a file in 5 seconds, it will retry directly, without an executor");
logger.debug("Could not get a file in " + journalFileOpenTimeout + " seconds, it will retry directly, without an executor");
try {
nextFile = takeFile(true, true, true, false);
} catch (Exception e) {

33
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
View File

@ -234,7 +234,21 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final String fileExtension,
final int maxAIO,
final int userVersion) {
this(null, fileSize, minFiles, poolSize, compactMinFiles, compactPercentage, fileFactory, filePrefix, fileExtension, maxAIO, userVersion);
this(null, fileSize, minFiles, poolSize, compactMinFiles, compactPercentage, 5, fileFactory, filePrefix, fileExtension, maxAIO, userVersion);
}
public JournalImpl(final int fileSize,
final int minFiles,
final int poolSize,
final int compactMinFiles,
final int compactPercentage,
final int journalFileOpenTimeout,
final SequentialFileFactory fileFactory,
final String filePrefix,
final String fileExtension,
final int maxAIO,
final int userVersion) {
this(null, fileSize, minFiles, poolSize, compactMinFiles, compactPercentage, journalFileOpenTimeout, fileFactory, filePrefix, fileExtension, maxAIO, userVersion);
}
public JournalImpl(final ExecutorFactory ioExecutors,
@ -248,6 +262,21 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final String fileExtension,
final int maxAIO,
final int userVersion) {
this(ioExecutors, fileSize, minFiles, poolSize, compactMinFiles, compactPercentage, 5, fileFactory, filePrefix, fileExtension, maxAIO, userVersion);
}
public JournalImpl(final ExecutorFactory ioExecutors,
final int fileSize,
final int minFiles,
final int poolSize,
final int compactMinFiles,
final int compactPercentage,
final int journalFileOpenTimeout,
final SequentialFileFactory fileFactory,
final String filePrefix,
final String fileExtension,
final int maxAIO,
final int userVersion) {
super(fileFactory.isSupportsCallbacks(), fileSize);
@ -275,7 +304,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
this.fileFactory = fileFactory;
filesRepository = new JournalFilesRepository(fileFactory, this, filePrefix, fileExtension, userVersion, maxAIO, fileSize, minFiles, poolSize);
filesRepository = new JournalFilesRepository(fileFactory, this, filePrefix, fileExtension, userVersion, maxAIO, fileSize, minFiles, poolSize, journalFileOpenTimeout);
this.userVersion = userVersion;
}

10
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
View File

@ -645,6 +645,16 @@ public interface Configuration {
*/
int getJournalCompactPercentage();
/**
* @return How long to wait when opening a new Journal file before failing
*/
int getJournalFileOpenTimeout();
/**
* Sets the journal file open timeout
*/
Configuration setJournalFileOpenTimeout(int journalFileOpenTimeout);
/**
* Sets the percentage of live data before compacting the journal.
*/

13
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View File

@ -173,6 +173,8 @@ public class ConfigurationImpl implements Configuration, Serializable {
protected int journalCompactPercentage = ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage();
protected int journalFileOpenTimeout = ActiveMQDefaultConfiguration.getDefaultJournalFileOpenTimeout();
protected int journalFileSize = ActiveMQDefaultConfiguration.getDefaultJournalFileSize();
protected int journalPoolFiles = ActiveMQDefaultConfiguration.getDefaultJournalPoolFiles();
@ -1145,6 +1147,17 @@ public class ConfigurationImpl implements Configuration, Serializable {
return this;
}
@Override
public int getJournalFileOpenTimeout() {
return journalFileOpenTimeout;
}
@Override
public Configuration setJournalFileOpenTimeout(int journalFileOpenTimeout) {
this.journalFileOpenTimeout = journalFileOpenTimeout;
return this;
}
@Override
public ConfigurationImpl setJournalCompactPercentage(final int percentage) {
journalCompactPercentage = percentage;

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
View File

@ -561,6 +561,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
config.setJournalMaxIO_NIO(journalMaxIO);
}
config.setJournalFileOpenTimeout(getInteger(e, "journal-file-open-timeout", ActiveMQDefaultConfiguration.getDefaultJournalFileOpenTimeout(), Validators.GT_ZERO));
config.setJournalMinFiles(getInteger(e, "journal-min-files", config.getJournalMinFiles(), Validators.GT_ZERO));
config.setJournalPoolFiles(getInteger(e, "journal-pool-files", config.getJournalPoolFiles(), Validators.MINUS_ONE_OR_GT_ZERO));

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

@ -120,7 +120,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
bindingsFF = new NIOSequentialFileFactory(config.getBindingsLocation(), criticalErrorListener, config.getJournalMaxIO_NIO());
bindingsFF.setDatasync(config.isJournalDatasync());
Journal localBindings = new JournalImpl(ioExecutors, 1024 * 1024, 2, config.getJournalCompactMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactPercentage(), bindingsFF, "activemq-bindings", "bindings", 1, 0);
Journal localBindings = new JournalImpl(ioExecutors, 1024 * 1024, 2, config.getJournalCompactMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), bindingsFF, "activemq-bindings", "bindings", 1, 0);
bindingsJournal = localBindings;
originalBindingsJournal = localBindings;

14
artemis-server/src/main/resources/schema/artemis-configuration.xsd
View File

@ -692,6 +692,14 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="journal-file-open-timeout" type="xsd:int" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
the length of time to wait when opening a new Journal file before timing out and failing
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="server-dump-interval" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@ -764,7 +772,7 @@
a list of security settings
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:choice>
@ -862,7 +870,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="broker-plugins" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@ -886,7 +894,7 @@
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
</xsd:element>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
</xsd:element>

1
artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
View File

@ -101,6 +101,7 @@ public class FileConfigurationTest extends ConfigurationImplTest {
Assert.assertEquals(10000, conf.getJournalBufferSize_NIO());
Assert.assertEquals(1000, conf.getJournalBufferTimeout_NIO());
Assert.assertEquals(56546, conf.getJournalMaxIO_NIO());
Assert.assertEquals(9876, conf.getJournalFileOpenTimeout());
Assert.assertEquals(false, conf.isJournalSyncTransactional());
Assert.assertEquals(true, conf.isJournalSyncNonTransactional());

1
artemis-server/src/test/resources/ConfigurationTest-full-config.xml
View File

@ -232,6 +232,7 @@
<journal-compact-percentage>33</journal-compact-percentage>
<journal-compact-min-files>123</journal-compact-min-files>
<journal-max-io>56546</journal-max-io>
<journal-file-open-timeout>9876</journal-file-open-timeout>
<server-dump-interval>5000</server-dump-interval>
<memory-warning-threshold>95</memory-warning-threshold>
<memory-measure-interval>54321</memory-measure-interval>