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 #2460

This commit is contained in:
Francesco Nigro 2018-12-14 11:32:13 +01:00
parent aac7b8373f a3001fd9bd
commit e41a24af78
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,6 +242,10 @@ public class JournalFilesRepository {
return dataFiles.size(); return dataFiles.size();
} }
public int getJournalFileOpenTimeout() {
return journalFileOpenTimeout;
}
public Collection<JournalFile> getDataFiles() { public Collection<JournalFile> getDataFiles() {
return dataFiles; return dataFiles;
} }

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

@ -29,7 +29,10 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin; import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy; import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
@ -670,6 +673,35 @@ public class FileConfigurationTest extends ConfigurationImplTest {
assertTrue("check failed, " + defaultConfirmationWinSize + ":" + defaultIdCacheSize, ConfigurationImpl.checkoutDupCacheSize(defaultConfirmationWinSize, defaultIdCacheSize)); assertTrue("check failed, " + defaultConfirmationWinSize + ":" + defaultIdCacheSize, ConfigurationImpl.checkoutDupCacheSize(defaultConfirmationWinSize, defaultIdCacheSize));
} }
@Test
public void testJournalFileOpenTimeoutDefaultValue() throws Exception {
ActiveMQServerImpl server = new ActiveMQServerImpl();
try {
server.start();
JournalImpl journal = (JournalImpl) server.getStorageManager().getBindingsJournal();
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileOpenTimeout(), journal.getFilesRepository().getJournalFileOpenTimeout());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileOpenTimeout(), server.getConfiguration().getJournalFileOpenTimeout());
} finally {
server.stop();
}
}
@Test
public void testJournalFileOpenTimeoutValue() throws Exception {
int timeout = RandomUtil.randomPositiveInt();
Configuration configuration = createConfiguration("shared-store-master-hapolicy-config.xml");
configuration.setJournalFileOpenTimeout(timeout);
ActiveMQServerImpl server = new ActiveMQServerImpl(configuration);
try {
server.start();
JournalImpl journal = (JournalImpl) server.getStorageManager().getBindingsJournal();
Assert.assertEquals(timeout, journal.getFilesRepository().getJournalFileOpenTimeout());
Assert.assertEquals(timeout, server.getConfiguration().getJournalFileOpenTimeout());
} finally {
server.stop();
}
}
@Override @Override
protected Configuration createConfiguration() throws Exception { protected Configuration createConfiguration() throws Exception {
FileConfiguration fc = new FileConfiguration(); FileConfiguration fc = new FileConfiguration();
@ -679,6 +711,14 @@ public class FileConfigurationTest extends ConfigurationImplTest {
return fc; return fc;
} }
private Configuration createConfiguration(String filename) throws Exception {
FileConfiguration fc = new FileConfiguration();
FileDeploymentManager deploymentManager = new FileDeploymentManager(filename);
deploymentManager.addDeployable(fc);
deploymentManager.readConfiguration();
return fc;
}
public static class EmptyPlugin1 implements ActiveMQServerPlugin { public static class EmptyPlugin1 implements ActiveMQServerPlugin {
} }