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

Use a different TaskFactory for PersistenceAdaptors - allowing the thread priority 

to be set differently for PersistenceAdaptors (e.g. Journal) than normal tasks.

This is part of the work necessary for http://issues.apache.org/activemq/browse/AMQ-845

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@440108 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2006-09-04 15:40:53 +00:00
parent 802296d5d9
commit 3fe77a2cf8
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -109,6 +109,7 @@ public class BrokerService implements Service, Serializable {
private ManagementContext managementContext;
private ObjectName brokerObjectName;
private TaskRunnerFactory taskRunnerFactory;
private TaskRunnerFactory persistenceTaskRunnerFactory;
private UsageManager memoryManager;
private PersistenceAdapter persistenceAdapter;
private PersistenceAdapterFactory persistenceFactory;
@ -139,6 +140,8 @@ public class BrokerService implements Service, Serializable {
private DestinationInterceptor[] destinationInterceptors;
private ActiveMQDestination[] destinations;
private Store tempDataStore;
private int persistenceThreadPriority = Thread.MAX_PRIORITY;
/**
* Adds a new transport connector for the given bind address
@ -617,6 +620,19 @@ public class BrokerService implements Service, Serializable {
public void setTaskRunnerFactory(TaskRunnerFactory taskRunnerFactory) {
this.taskRunnerFactory = taskRunnerFactory;
}
public TaskRunnerFactory getPersistenceTaskRunnerFactory(){
if (taskRunnerFactory == null) {
persistenceTaskRunnerFactory = new TaskRunnerFactory("Persistence Adaptor Task", persistenceThreadPriority, true, 1000);
}
return persistenceTaskRunnerFactory;
}
public void setPersistenceTaskRunnerFactory(TaskRunnerFactory persistenceTaskRunnerFactory){
this.persistenceTaskRunnerFactory=persistenceTaskRunnerFactory;
}
public boolean isUseJmx() {
return useJmx;
@ -947,6 +963,14 @@ public class BrokerService implements Service, Serializable {
public void setTempDataStore(Store tempDataStore){
this.tempDataStore=tempDataStore;
}
public int getPersistenceThreadPriority(){
return persistenceThreadPriority;
}
public void setPersistenceThreadPriority(int persistenceThreadPriority){
this.persistenceThreadPriority=persistenceThreadPriority;
}
// Implementation methods
// -------------------------------------------------------------------------
@ -1223,7 +1247,7 @@ public class BrokerService implements Service, Serializable {
protected DefaultPersistenceAdapterFactory createPersistenceFactory() {
DefaultPersistenceAdapterFactory factory = new DefaultPersistenceAdapterFactory();
factory.setDataDirectoryFile(getDataDirectory());
factory.setTaskRunnerFactory(getTaskRunnerFactory());
factory.setTaskRunnerFactory(getPersistenceTaskRunnerFactory());
return factory;
}
@ -1428,5 +1452,10 @@ public class BrokerService implements Service, Serializable {
}
}
}

13
activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java
View File

@ -53,6 +53,7 @@ public class DefaultPersistenceAdapterFactory extends DataSourceSupport implemen
private boolean useQuickJournal=false;
private File journalArchiveDirectory;
private boolean failIfJournalIsLocked=false;
private int journalThreadPriority = Thread.MAX_PRIORITY;
private JDBCPersistenceAdapter jdbcPersistenceAdapter = new JDBCPersistenceAdapter();
public PersistenceAdapter createPersistenceAdapter() throws IOException {
@ -107,7 +108,7 @@ public class DefaultPersistenceAdapterFactory extends DataSourceSupport implemen
public TaskRunnerFactory getTaskRunnerFactory() {
if( taskRunnerFactory == null ) {
taskRunnerFactory = new TaskRunnerFactory();
taskRunnerFactory = new TaskRunnerFactory("Persistence Adaptor Task", journalThreadPriority, true, 1000);
}
return taskRunnerFactory;
}
@ -177,6 +178,14 @@ public class DefaultPersistenceAdapterFactory extends DataSourceSupport implemen
public void setCreateTablesOnStartup(boolean createTablesOnStartup) {
jdbcPersistenceAdapter.setCreateTablesOnStartup(createTablesOnStartup);
}
public int getJournalThreadPriority(){
return journalThreadPriority;
}
public void setJournalThreadPriority(int journalThreadPriority){
this.journalThreadPriority=journalThreadPriority;
}
/**
* @throws IOException
@ -201,4 +210,6 @@ public class DefaultPersistenceAdapterFactory extends DataSourceSupport implemen
}
}
}