[jboss-cvs] JBoss Messaging SVN: r7677 - in trunk: src/main/org/jboss/messaging/core/config and 22 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 6 18:10:03 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-08-06 18:10:03 -0400 (Thu, 06 Aug 2009)
New Revision: 7677
Modified:
trunk/src/config/common/schema/jbm-configuration.xsd
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java
trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java
trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/config/ConfigurationTest-full-config.xml
trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageCleanupTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/persistence/DeleteQueueRestartTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingManagerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
Log:
JBMESSAGING-1705 - Removing Global Max Size
Modified: trunk/src/config/common/schema/jbm-configuration.xsd
===================================================================
--- trunk/src/config/common/schema/jbm-configuration.xsd 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/config/common/schema/jbm-configuration.xsd 2009-08-06 22:10:03 UTC (rev 7677)
@@ -128,10 +128,6 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="paging-directory" type="xsd:string">
</xsd:element>
- <xsd:element maxOccurs="1" minOccurs="0" name="global-page-size" type="xsd:long">
- </xsd:element>
- <xsd:element maxOccurs="1" minOccurs="0" name="paging-max-global-size-bytes" type="xsd:long">
- </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="bindings-directory" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="create-bindings-dir" type="xsd:boolean">
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -237,14 +237,6 @@
void setPagingDirectory(String dir);
- long getPagingMaxGlobalSizeBytes();
-
- void setPagingMaxGlobalSizeBytes(long maxGlobalSize);
-
- int getGlobalPagingSize();
-
- void setGlobalPagingSize(int globalPageSize);
-
// Large Messages Properties ------------------------------------------------------------
String getLargeMessagesDirectory();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -75,10 +75,6 @@
public static final String DEFAULT_PAGING_DIR = "data/paging";
- public static final int DEFAULT_GLOBAL_PAGE_SIZE = 10 * 1024 * 1024;
-
- public static final long DEFAULT_PAGE_MAX_GLOBAL_SIZE = -1;
-
public static final String DEFAULT_LARGE_MESSAGES_DIR = "data/largemessages";
public static final boolean DEFAULT_CREATE_JOURNAL_DIR = true;
@@ -215,10 +211,6 @@
// Paging related attributes ------------------------------------------------------------
- protected long pagingMaxGlobalSize = DEFAULT_PAGE_MAX_GLOBAL_SIZE;
-
- protected int globalPageSize = DEFAULT_GLOBAL_PAGE_SIZE;
-
protected String pagingDirectory = DEFAULT_PAGING_DIR;
// File related attributes -----------------------------------------------------------
@@ -766,32 +758,6 @@
this.journalAIOBufferSize = size;
}
- public long getPagingMaxGlobalSizeBytes()
- {
- return pagingMaxGlobalSize;
- }
-
- public void setPagingMaxGlobalSizeBytes(final long maxGlobalSize)
- {
- pagingMaxGlobalSize = maxGlobalSize;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.messaging.core.config.Configuration#getPagingDefaultSize()
- */
- public int getGlobalPagingSize()
- {
- return globalPageSize;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.messaging.core.config.Configuration#setPagingDefaultSize(long)
- */
- public void setGlobalPagingSize(final int pageSize)
- {
- globalPageSize = pageSize;
- }
-
public String getLargeMessagesDirectory()
{
return largeMessagesDirectory;
@@ -892,8 +858,7 @@
cother.getJournalType() == getJournalType() &&
cother.getScheduledThreadPoolMaxSize() == getScheduledThreadPoolMaxSize() &&
cother.getSecurityInvalidationInterval() == getSecurityInvalidationInterval() &&
- cother.getManagementAddress().equals(getManagementAddress()) &&
- cother.getGlobalPagingSize() == getGlobalPagingSize();
+ cother.getManagementAddress().equals(getManagementAddress());
}
/* (non-Javadoc)
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -286,10 +286,6 @@
pagingDirectory = getString(e, "paging-directory", pagingDirectory, NOT_NULL_OR_EMPTY);
- pagingMaxGlobalSize = getLong(e, "paging-max-global-size-bytes", pagingMaxGlobalSize, MINUS_ONE_OR_GT_ZERO);
-
- globalPageSize = getInteger(e, "global-page-size", globalPageSize, GT_ZERO);
-
createJournalDir = getBoolean(e, "create-journal-dir", createJournalDir);
String s = getString(e, "journal-type", journalType.toString(), Validators.JOURNAL_TYPE);
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -92,8 +92,6 @@
int getAIOBufferTimeout();
- public long getPagingMaxGlobalSizeBytes();
-
public String getPagingDirectory();
boolean isPersistDeliveryCountBeforeDelivery();
@@ -112,8 +110,6 @@
boolean isPersistIDCache();
- int getGlobalPageSize();
-
String getLargeMessagesDirectory();
boolean isWildcardRoutingEnabled();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -187,11 +187,6 @@
return configuration.getJournalType().toString();
}
- public long getPagingMaxGlobalSizeBytes()
- {
- return configuration.getPagingMaxGlobalSizeBytes();
- }
-
public String getPagingDirectory()
{
return configuration.getPagingDirectory();
@@ -613,11 +608,6 @@
return configuration.getMessageExpiryThreadPriority();
}
- public int getGlobalPageSize()
- {
- return configuration.getGlobalPagingSize();
- }
-
public long getQueueActivationTimeout()
{
return configuration.getQueueActivationTimeout();
Modified: trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -136,11 +136,6 @@
return localControl.getPagingDirectory();
}
- public long getPagingMaxGlobalSizeBytes()
- {
- return localControl.getPagingMaxGlobalSizeBytes();
- }
-
public int getScheduledThreadPoolMaxSize()
{
return localControl.getScheduledThreadPoolMaxSize();
@@ -366,11 +361,6 @@
return localControl.getMessageExpiryThreadPriority();
}
- public int getGlobalPageSize()
- {
- return localControl.getGlobalPageSize();
- }
-
public long getQueueActivationTimeout()
{
return localControl.getQueueActivationTimeout();
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -61,17 +61,14 @@
boolean isBackup();
- /** The system is paging because of global-page-mode */
- boolean isGlobalPageMode();
-
- /** During startup PostOffice may set GlobalPageMode as true */
- void setGlobalPageMode(boolean globalMode);
-
/** To return the PageStore associated with the address */
PagingStore getPageStore(SimpleString address) throws Exception;
/** An injection point for the PostOffice to inject itself */
void setPostOffice(PostOffice postOffice);
+
+ /** Used to start depaging every paged destination, after a reload/restart */
+ void resumeDepages() throws Exception;
/**
* To be used by transactions only.
@@ -116,11 +113,6 @@
void sync(Collection<SimpleString> destinationsToSync) throws Exception;
/**
- * @return
- */
- long getGlobalPageSize();
-
- /**
* @param transactionID
*/
void removeTransaction(long transactionID);
@@ -128,11 +120,6 @@
/**
* @return
*/
- long getMaxMemory();
-
- /**
- * @return
- */
long getTotalMemory();
/**
@@ -142,11 +129,6 @@
long addSize(long size);
/**
- *
- */
- void startGlobalDepage();
-
- /**
* Reload previously created PagingStores into memory
* @throws Exception
*/
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -64,6 +64,8 @@
boolean page(PagedMessage message, boolean sync, boolean duplicateDetection) throws Exception;
public boolean readPage() throws Exception;
+
+ Page getCurrentPage();
/**
*
@@ -72,9 +74,6 @@
*/
boolean startDepaging();
- /** When start depaging from a global perspective, we don't want all the stores depaging at once what could saturate the servers */
- boolean startDepaging(Executor executor);
-
/**
* @param memoryEstimate
* @return
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -42,8 +42,6 @@
{
PagingStore newStore(SimpleString destinationName, AddressSettings addressSettings) throws Exception;
- Executor getGlobalDepagerExecutor();
-
void stop() throws InterruptedException;
void setPagingManager(PagingManager manager);
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -57,14 +57,10 @@
private volatile boolean started = false;
- private final long maxGlobalSize;
-
private volatile boolean backup;
private final AtomicLong totalMemoryBytes = new AtomicLong(0);
- private final AtomicBoolean globalMode = new AtomicBoolean(false);
-
private final ConcurrentMap<SimpleString, PagingStore> stores = new ConcurrentHashMap<SimpleString, PagingStore>();
private final HierarchicalRepository<AddressSettings> addressSettingsRepository;
@@ -73,8 +69,6 @@
private final StorageManager storageManager;
- private final long globalPageSize;
-
private final boolean syncNonTransactional;
private final ConcurrentMap</*TransactionID*/Long, PageTransactionInfo> transactions = new ConcurrentHashMap<Long, PageTransactionInfo>();
@@ -90,16 +84,12 @@
public PagingManagerImpl(final PagingStoreFactory pagingSPI,
final StorageManager storageManager,
final HierarchicalRepository<AddressSettings> addressSettingsRepository,
- final long maxGlobalSize,
- final long globalPageSize,
- final boolean syncNonTransactional,
+ final boolean syncNonTransactional,
final boolean backup)
{
pagingStoreFactory = pagingSPI;
this.addressSettingsRepository = addressSettingsRepository;
this.storageManager = storageManager;
- this.globalPageSize = globalPageSize;
- this.maxGlobalSize = maxGlobalSize;
this.syncNonTransactional = syncNonTransactional;
this.backup = backup;
}
@@ -114,7 +104,13 @@
{
backup = false;
- startGlobalDepage();
+ for (PagingStore store : stores.values())
+ {
+ if (store.isPaging())
+ {
+ store.startDepaging();
+ }
+ }
}
public boolean isBackup()
@@ -122,16 +118,6 @@
return backup;
}
- public boolean isGlobalPageMode()
- {
- return globalMode.get();
- }
-
- public void setGlobalPageMode(final boolean globalMode)
- {
- this.globalMode.set(globalMode);
- }
-
/* (non-Javadoc)
* @see org.jboss.messaging.core.paging.PagingManager#reloadStores()
*/
@@ -188,11 +174,6 @@
pagingStoreFactory.setPostOffice(postOffice);
}
- public long getGlobalPageSize()
- {
- return globalPageSize;
- }
-
public boolean isPaging(final SimpleString destination) throws Exception
{
return getPageStore(destination).isPaging();
@@ -279,17 +260,15 @@
pagingStoreFactory.stop();
totalMemoryBytes.set(0);
-
- globalMode.set(false);
}
- public void startGlobalDepage()
+ public void resumeDepages()
{
if (!started)
{
// If stop the server while depaging, the server may call a rollback,
// the rollback may addSizes back and that would fire a globalDepage.
- // Because of that we must ignore any startGlobalDepage calls,
+ // Because of that we must ignore any startGlobalDepage calls,
// and this check needs to be done outside of the lock
return;
}
@@ -297,10 +276,12 @@
{
if (!isBackup())
{
- setGlobalPageMode(true);
for (PagingStore store : stores.values())
{
- store.startDepaging(pagingStoreFactory.getGlobalDepagerExecutor());
+ if (store.isPaging())
+ {
+ store.startDepaging();
+ }
}
}
}
@@ -322,14 +303,6 @@
return totalMemoryBytes.addAndGet(size);
}
- /* (non-Javadoc)
- * @see org.jboss.messaging.core.paging.PagingManager#getMaxGlobalSize()
- */
- public long getMaxMemory()
- {
- return maxGlobalSize;
- }
-
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
@@ -338,7 +311,8 @@
private PagingStore newStore(final SimpleString destinationName) throws Exception
{
- return pagingStoreFactory.newStore(destinationName, addressSettingsRepository.getMatch(destinationName.toString()));
+ return pagingStoreFactory.newStore(destinationName,
+ addressSettingsRepository.getMatch(destinationName.toString()));
}
// Inner classes -------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -68,8 +68,6 @@
private final ExecutorFactory executorFactory;
- private final Executor globalDepagerExecutor;
-
private PagingManager pagingManager;
private StorageManager storageManager;
@@ -85,17 +83,10 @@
this.directory = directory;
this.executorFactory = executorFactory;
-
- globalDepagerExecutor = executorFactory.getExecutor();
}
// Public --------------------------------------------------------
- public Executor getGlobalDepagerExecutor()
- {
- return globalDepagerExecutor;
- }
-
public void stop()
{
}
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -232,18 +232,14 @@
}
else
{
- final long currentGlobalSize = pagingManager.addSize(size);
+ pagingManager.addSize(size);
- final long maxGlobalSize = pagingManager.getMaxMemory();
-
final long addressSize = addAddressSize(size);
if (size > 0)
{
- if (maxGlobalSize > 0 && currentGlobalSize > maxGlobalSize)
+ if (maxSize > 0 && addressSize > maxSize)
{
- pagingManager.setGlobalPageMode(true);
-
if (startPaging())
{
if (isTrace)
@@ -252,42 +248,12 @@
}
}
}
- else if (maxSize > 0 && addressSize > maxSize)
- {
- if (startPaging())
- {
- if (isTrace)
- {
- trace("Starting paging on " + getStoreName() + ", size = " + addressSize + ", maxSize=" + maxSize);
- }
- }
- }
}
else
{
// When in Global mode, we use the default page size as the mark to start depage
-
- if (isTrace)
+ if (maxSize > 0 && currentPage != null && addressSize <= maxSize - pageSize && !depaging.get())
{
-
- log.trace(" globalDepage = " + pagingManager.isGlobalPageMode() +
- " currentGlobalSize = " +
- currentGlobalSize +
- " GlobalPageSize = " +
- pagingManager.getGlobalPageSize() +
- " maxGlobalSize = " +
- maxGlobalSize +
- " maxGlobalSize - defaultPageSize = " +
- (maxGlobalSize - pagingManager.getGlobalPageSize()));
- }
-
- if (maxGlobalSize > 0 && pagingManager.isGlobalPageMode() &&
- currentGlobalSize < maxGlobalSize - pagingManager.getGlobalPageSize())
- {
- pagingManager.startGlobalDepage();
- }
- else if (maxSize > 0 && addressSize < maxSize - pageSize)
- {
if (startDepaging())
{
log.info("Starting depaging Thread, size = " + addressSize);
@@ -364,7 +330,7 @@
ByteBuffer buff = ByteBuffer.wrap(bytes);
buff.putLong(msg.getMessageID());
-
+
msg.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, bytes);
}
@@ -437,11 +403,6 @@
public boolean startDepaging()
{
- return startDepaging(executor);
- }
-
- public boolean startDepaging(final Executor executor)
- {
if (!running)
{
return false;
@@ -498,7 +459,7 @@
if (running)
{
running = false;
-
+
if (currentPage != null)
{
currentPage.close();
@@ -652,6 +613,11 @@
}
+ public Page getCurrentPage()
+ {
+ return currentPage;
+ }
+
// TestSupportPageStore ------------------------------------------
public void forceAnotherPage() throws Exception
@@ -905,20 +871,11 @@
/**
* @return
*/
- private boolean isFull(final long nextPageSize)
+ private boolean isAddressFull(final long nextPageSize)
{
return getMaxSizeBytes() > 0 && getAddressSize() + nextPageSize > getMaxSizeBytes();
}
- /**
- * @param nextPageSize
- * @return
- */
- private boolean isGlobalFull(final long nextPageSize)
- {
- return pagingManager.getMaxMemory() > 0 && pagingManager.getTotalMemory() + nextPageSize > pagingManager.getMaxMemory();
- }
-
private long addAddressSize(final long delta)
{
return sizeInBytes.addAndGet(delta);
@@ -931,15 +888,27 @@
*/
private synchronized boolean clearDepage()
{
- final boolean pageFull = isFull(getPageSizeBytes());
- final boolean globalFull = isGlobalFull(getPageSizeBytes());
- if (pageFull || globalFull || !isPaging())
+ final boolean addressFull = isAddressFull(getPageSizeBytes());
+
+ if (isTrace)
{
+ trace("Clear Depage on Address = " + this.getStoreName() +
+ " PagingManager size " +
+ pagingManager.getTotalMemory() +
+ " addressSize = " +
+ this.getAddressSize() +
+ " addressMax " +
+ this.getMaxSizeBytes() +
+ " isPaging = " +
+ isPaging() +
+ " addressFull = " +
+ addressFull);
+ }
+
+ // It should stop the executor when the destination is full or when there is nothing else to be depaged
+ if (addressFull || !isPaging())
+ {
depaging.set(false);
- if (!globalFull)
- {
- pagingManager.setGlobalPageMode(false);
- }
return true;
}
else
@@ -1000,9 +969,7 @@
// To be used on isDropMessagesWhenFull
private boolean isDrop()
{
- return getMaxSizeBytes() > 0 && getAddressSize() > getMaxSizeBytes() ||
- pagingManager.getMaxMemory() > 0 &&
- pagingManager.getTotalMemory() > pagingManager.getMaxMemory();
+ return getMaxSizeBytes() > 0 && getAddressSize() > getMaxSizeBytes();
}
// Inner classes -------------------------------------------------
@@ -1022,7 +989,7 @@
{
if (running)
{
- if (!isFull(getPageSizeBytes()) && !isGlobalFull(getPageSizeBytes()))
+ if (!isAddressFull(getPageSizeBytes()))
{
readPage();
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -762,9 +762,7 @@
return new PagingManagerImpl(new PagingStoreFactoryNIO(configuration.getPagingDirectory(), executorFactory),
storageManager,
addressSettingsRepository,
- configuration.getPagingMaxGlobalSizeBytes(),
- configuration.getGlobalPagingSize(),
- configuration.isJournalSyncNonTransactional(),
+ configuration.isJournalSyncNonTransactional(),
configuration.isBackup());
}
@@ -1030,7 +1028,7 @@
deploymentManager.start();
}
- pagingManager.startGlobalDepage();
+ pagingManager.resumeDepages();
initialised = true;
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-08-06 22:10:03 UTC (rev 7677)
@@ -30,8 +30,6 @@
<backup>true</backup>
<persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
<paging-directory>pagingdir</paging-directory>
- <global-page-size>123</global-page-size>
- <paging-max-global-size-bytes>4567</paging-max-global-size-bytes>
<bindings-directory>somedir</bindings-directory>
<create-bindings-dir>false</create-bindings-dir>
<journal-directory>somedir2</journal-directory>
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -1575,11 +1575,12 @@
{
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(20 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ final int PAGE_MAX = 20 * 1024;
- server = createServer(realFiles, config, new HashMap<String, AddressSettings>());
+ final int PAGE_SIZE = 10 * 1024;
+ server = createServer(realFiles, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
+
server.start();
final int numberOfBytes = 1024;
@@ -1639,7 +1640,7 @@
{
server.stop();
- server = createServer(true, config, new HashMap<String, AddressSettings>());
+ server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
server.start();
sf = createInVMFactory();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -61,6 +61,10 @@
private static final int RECEIVE_TIMEOUT = 30000;
+ private static final int PAGE_MAX = 100 * 1024;
+
+ private static final int PAGE_SIZE = 10 * 1024;
+
// Attributes ----------------------------------------------------
// Static --------------------------------------------------------
@@ -77,11 +81,8 @@
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ MessagingServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
- MessagingServer server = createServer(true, config, new HashMap<String, AddressSettings>());
-
server.start();
final int numberOfIntegers = 256;
@@ -129,14 +130,22 @@
session.close();
+ assertTrue("TotalMemory expected to be > 0 when it was " + server.getPostOffice()
+ .getPagingManager()
+ .getTotalMemory(),
+ server.getPostOffice().getPagingManager().getTotalMemory() > 0);
+
server.stop();
- server = createServer(true, config, new HashMap<String, AddressSettings>());
+ server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
server.start();
sf = createInVMFactory();
- assertTrue(server.getPostOffice().getPagingManager().getTotalMemory() > 0);
+ assertTrue("TotalMemory expected to be > 0 when it was " + server.getPostOffice()
+ .getPagingManager()
+ .getTotalMemory(),
+ server.getPostOffice().getPagingManager().getTotalMemory() > 0);
session = sf.createSession(null, null, false, true, true, false, 0);
@@ -202,11 +211,8 @@
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ MessagingServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
- MessagingServer server = createServer(true, config, new HashMap<String, AddressSettings>());
-
server.start();
final int numberOfIntegers = 256;
@@ -341,17 +347,14 @@
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ MessagingServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
- MessagingServer server = createServer(true, config, new HashMap<String, AddressSettings>());
-
server.start();
- final int numberOfIntegers = 256;
-
final int numberOfMessages = 10000;
+ final int numberOfBytes = 1024;
+
try
{
ClientSessionFactory sf = createInVMFactory();
@@ -368,31 +371,24 @@
ClientMessage message = null;
- byte[] body = null;
+ byte[] body = new byte[numberOfBytes];
+ for (int j = 0; j < numberOfBytes; j++)
+ {
+ body[j] = getSamplebyte(j);
+ }
+
long scheduledTime = System.currentTimeMillis() + 5000;
for (int i = 0; i < numberOfMessages; i++)
{
message = session.createClientMessage(true);
- MessagingBuffer bodyLocal = message.getBody();
-
- for (int j = 1; j <= numberOfIntegers; j++)
- {
- bodyLocal.writeInt(j);
- }
-
- if (body == null)
- {
- body = bodyLocal.array();
- }
-
- message.setBody(bodyLocal);
+ message.setBody(ChannelBuffers.wrappedBuffer(body));
message.putIntProperty(new SimpleString("id"), i);
// Worse scenario possible... only schedule what's on pages
- if (server.getPostOffice().getPagingManager().isPaging(ADDRESS))
+ if (server.getPostOffice().getPagingManager().getPageStore(ADDRESS).getCurrentPage() != null)
{
message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, scheduledTime);
}
@@ -406,7 +402,7 @@
server.stop();
- server = createServer(true, config, new HashMap<String, AddressSettings>());
+ server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
server.start();
sf = createInVMFactory();
@@ -420,6 +416,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
+
ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
assertNotNull(message2);
@@ -472,11 +469,8 @@
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ MessagingServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
- MessagingServer server = createServer(true, config, new HashMap<String, AddressSettings>());
-
server.start();
final int numberOfIntegers = 256;
@@ -548,11 +542,8 @@
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ MessagingServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
- MessagingServer server = createServer(true, config, new HashMap<String, AddressSettings>());
-
server.start();
final int numberOfIntegers = 10;
@@ -634,18 +625,8 @@
internalTestPageMultipleDestinations(true);
}
- public void testDropMessagesQueueMax() throws Exception
+ public void testDropMessages() throws Exception
{
- testDropMessages(false);
- }
-
- public void testDropMessagesGlobalMax() throws Exception
- {
- testDropMessages(true);
- }
-
- private void testDropMessages(boolean global) throws Exception
- {
clearData();
Configuration config = createDefaultConfig();
@@ -657,21 +638,8 @@
settings.put(ADDRESS.toString(), set);
- if (global)
- {
- set.setMaxSizeBytes(-1);
- config.setPagingMaxGlobalSizeBytes(10 * 1024);
- }
- else
- {
- config.setPagingMaxGlobalSizeBytes(-1);
- set.setMaxSizeBytes(10 * 1024);
- }
+ MessagingServer server = createServer(true, config, 10 * 1024, 10 * 1024, settings);
- config.setGlobalPagingSize(10 * 1024);
-
- MessagingServer server = createServer(true, config, settings);
-
server.start();
final int numberOfMessages = 1000;
@@ -805,11 +773,8 @@
int NUMBER_OF_MESSAGES = 2;
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ MessagingServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
- MessagingServer server = createServer(true, config, new HashMap<String, AddressSettings>());
-
server.start();
try
@@ -850,7 +815,7 @@
server.stop();
- server = createServer(true, config, new HashMap<String, AddressSettings>());
+ server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
server.start();
sf = createInVMFactory();
@@ -916,9 +881,6 @@
Configuration configuration = createDefaultConfig();
- configuration.setPagingMaxGlobalSizeBytes(0);
- configuration.setGlobalPagingSize(0);
-
Map<String, AddressSettings> addresses = new HashMap<String, AddressSettings>();
addresses.put("#", new AddressSettings());
@@ -929,7 +891,7 @@
addresses.put(PAGED_ADDRESS.toString(), pagedDestination);
- MessagingServer server = createServer(true, configuration, addresses);
+ MessagingServer server = createServer(true, configuration, -1, -1, addresses);
try
{
@@ -1023,9 +985,6 @@
Configuration configuration = createDefaultConfig();
- configuration.setPagingMaxGlobalSizeBytes(0);
- configuration.setGlobalPagingSize(0);
-
Map<String, AddressSettings> addresses = new HashMap<String, AddressSettings>();
addresses.put("#", new AddressSettings());
@@ -1044,7 +1003,7 @@
addresses.put(PAGED_ADDRESS_B.toString(), pagedDestinationB);
- MessagingServer server = createServer(true, configuration, addresses);
+ MessagingServer server = createServer(true, configuration, -1, -1, addresses);
try
{
@@ -1150,274 +1109,6 @@
}
}
- public void testPagingDifferentSizesAndGlobal() throws Exception
- {
- SimpleString PAGED_ADDRESS_A = new SimpleString("paged-a");
- SimpleString PAGED_ADDRESS_B = new SimpleString("paged-b");
- SimpleString PAGED_ADDRESS_GLOBAL = new SimpleString("paged-global");
-
- Configuration configuration = createDefaultConfig();
-
- configuration.setPagingMaxGlobalSizeBytes(30 * 1024);
- configuration.setGlobalPagingSize(1024);
-
- Map<String, AddressSettings> addresses = new HashMap<String, AddressSettings>();
-
- addresses.put("#", new AddressSettings());
-
- AddressSettings pagedDestinationA = new AddressSettings();
- pagedDestinationA.setPageSizeBytes(1024);
- pagedDestinationA.setMaxSizeBytes(10 * 1024);
-
- int NUMBER_MESSAGES_BEFORE_PAGING = 20;
-
- addresses.put(PAGED_ADDRESS_A.toString(), pagedDestinationA);
-
- AddressSettings pagedDestinationB = new AddressSettings();
- pagedDestinationB.setPageSizeBytes(2024);
- pagedDestinationB.setMaxSizeBytes(20 * 1024);
-
- addresses.put(PAGED_ADDRESS_B.toString(), pagedDestinationB);
-
- MessagingServer server = createServer(true, configuration, addresses);
-
- try
- {
- server.start();
-
- ClientSessionFactory sf = createInVMFactory();
-
- ClientSession session = sf.createSession(false, true, false);
-
- session.createQueue(PAGED_ADDRESS_A, PAGED_ADDRESS_A, true);
-
- session.createQueue(PAGED_ADDRESS_B, PAGED_ADDRESS_B, true);
-
- session.createQueue(PAGED_ADDRESS_GLOBAL, PAGED_ADDRESS_GLOBAL, true);
-
- ClientProducer producerA = session.createProducer(PAGED_ADDRESS_A);
- ClientProducer producerB = session.createProducer(PAGED_ADDRESS_B);
-
- int NUMBER_OF_MESSAGES = 100;
-
- for (int i = 0; i < NUMBER_MESSAGES_BEFORE_PAGING; i++)
- {
- ClientMessage msg = session.createClientMessage(true);
- msg.getBody().writeBytes(new byte[512]);
-
- producerA.send(msg);
- producerB.send(msg);
- }
-
- session.commit(); // commit was called to clean the buffer only (making sure everything is on the server side)
-
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
- assertFalse(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_B).isPaging());
-
- for (int i = 0; i < NUMBER_MESSAGES_BEFORE_PAGING; i++)
- {
- ClientMessage msg = session.createClientMessage(true);
- msg.getBody().writeBytes(new byte[512]);
-
- producerA.send(msg);
- producerB.send(msg);
- }
-
- session.commit(); // commit was called to clean the buffer only (making sure everything is on the server side)
-
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_B).isPaging());
-
- for (int i = NUMBER_MESSAGES_BEFORE_PAGING * 2; i < NUMBER_OF_MESSAGES; i++)
- {
- ClientMessage msg = session.createClientMessage(true);
- msg.getBody().writeBytes(new byte[512]);
-
- producerA.send(msg);
- producerB.send(msg);
- }
-
- session.close();
-
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_B).isPaging());
-
- session = sf.createSession(null, null, false, true, true, false, 0);
-
- session.start();
-
- ClientConsumer consumerA = session.createConsumer(PAGED_ADDRESS_A);
-
- ClientConsumer consumerB = session.createConsumer(PAGED_ADDRESS_B);
-
- for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
- {
- ClientMessage msg = consumerA.receive(5000);
- assertNotNull("Couldn't receive a message on consumerA, iteration = " + i, msg);
- msg.acknowledge();
- }
-
- assertNull(consumerA.receiveImmediate());
-
- consumerA.close();
-
- session.commit();
-
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_B).isPaging());
-
- for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
- {
- ClientMessage msg = consumerB.receive(5000);
- assertNotNull(msg);
- msg.acknowledge();
- session.commit();
- }
-
- assertNull(consumerB.receiveImmediate());
-
- consumerB.close();
-
- session.close();
- }
- finally
- {
- if (server.isStarted())
- {
- server.stop();
- }
- }
- }
-
- public void testPageTwoDestinationsGlobalAndAddresSettings() throws Exception
- {
- clearData();
-
- SimpleString PAGED_ADDRESS_A = new SimpleString("paged-a");
- SimpleString PAGED_ADDRESS_GLOBAL = new SimpleString("paged-global");
-
- Configuration configuration = createDefaultConfig();
- configuration.setPagingMaxGlobalSizeBytes(104857600);
-
- Map<String, AddressSettings> addresses = new HashMap<String, AddressSettings>();
-
- addresses.put("#", new AddressSettings());
-
- AddressSettings pagedDestinationA = new AddressSettings();
- pagedDestinationA.setPageSizeBytes(20000);
- pagedDestinationA.setMaxSizeBytes(100000);
-
- addresses.put(PAGED_ADDRESS_A.toString(), pagedDestinationA);
-
- MessagingServer server = createServer(true, configuration, addresses);
-
- ClientSession session = null;
-
- try
- {
- server.start();
-
- ClientSessionFactory sf = createInVMFactory();
-
- session = sf.createSession(false, true, false);
-
- session.createQueue(PAGED_ADDRESS_A, PAGED_ADDRESS_A, true);
-
- session.start();
-
- session.createQueue(PAGED_ADDRESS_GLOBAL, PAGED_ADDRESS_GLOBAL, true);
-
- ClientProducer producerA = session.createProducer(PAGED_ADDRESS_A);
-
- ClientProducer producerGlobal = session.createProducer(PAGED_ADDRESS_GLOBAL);
-
- int NUMBER_OF_MESSAGES_A = 20;
-
- int NUMBER_OF_MESSAGES_GLOBAL = 30000;
-
- ClientMessage msg = session.createClientMessage(false);
- msg.getBody().writeBytes(new byte[10 * 1024]);
-
- for (int i = 0; i < NUMBER_OF_MESSAGES_A; i++)
- {
- producerA.send(msg);
- }
-
- session.commit(); // commit was called to clean the buffer only (making sure everything is on the server side)
-
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
- assertFalse(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_GLOBAL).isPaging());
-
- System.out.println("AddressA.size = " + server.getPostOffice()
- .getPagingManager()
- .getPageStore(PAGED_ADDRESS_A)
- .getAddressSize() +
- " globalSize = " +
- server.getPostOffice().getPagingManager().getTotalMemory());
-
- for (int i = 0; i < NUMBER_OF_MESSAGES_GLOBAL; i++)
- {
- producerGlobal.send(msg);
- }
-
-
- System.out.println("AddressA.size = " + server.getPostOffice()
- .getPagingManager()
- .getPageStore(PAGED_ADDRESS_A)
- .getAddressSize() +
- " globalSize = " +
- server.getPostOffice().getPagingManager().getTotalMemory());
-
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
- assertTrue(server.getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_GLOBAL).isPaging());
-
- ClientConsumer consumerGlobal = session.createConsumer(PAGED_ADDRESS_GLOBAL);
-
- for (int i = 0; i < NUMBER_OF_MESSAGES_GLOBAL; i++)
- {
- msg = consumerGlobal.receive(5000);
- assertNotNull("Couldn't receive a message on consumerGlobal, iteration = " + i, msg);
- msg.acknowledge();
- if (i % 1000 == 0)
- {
- session.commit();
- }
- }
-
- session.commit();
-
- assertNull(consumerGlobal.receiveImmediate());
-
- ClientConsumer consumerA = session.createConsumer(PAGED_ADDRESS_A);
-
- for (int i = 0; i < NUMBER_OF_MESSAGES_A; i++)
- {
- msg = consumerA.receive(5000);
- assertNotNull("Couldn't receive a message on consumerA, iteration = " + i, msg);
- msg.acknowledge();
- session.commit();
- }
-
- assertNull(consumerA.receiveImmediate());
-
- consumerA.close();
-
- session.commit();
-
- session.close();
- }
- finally
- {
- if (session != null)
- {
- session.close();
- }
- if (server.isStarted())
- {
- server.stop();
- }
- }
- }
-
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -85,12 +85,12 @@
backupParams));
}
- protected void setUpFileBased(final long maxGlobalSize) throws Exception
+ protected void setUpFileBased(final int maxGlobalSize) throws Exception
{
setUpFileBased(maxGlobalSize, 20 * 1024);
}
- protected void setUpFileBased(final long maxGlobalSize, final int pageSize) throws Exception
+ protected void setUpFileBased(final int maxGlobalSize, final int pageSize) throws Exception
{
setUpFailoverServers(true, maxGlobalSize, pageSize);
}
@@ -101,7 +101,7 @@
*/
protected void setUpFailoverServers(boolean fileBased,
- final long maxGlobalSize,
+ final int maxAddressSize,
final int pageSize) throws Exception
{
deleteDirectory(new File(getTestDir()));
@@ -126,9 +126,14 @@
backupConf.setJournalType(JournalType.ASYNCIO);
- backupConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
- backupConf.setGlobalPagingSize(pageSize);
+
+
backupServer = Messaging.newMessagingServer(backupConf);
+
+ AddressSettings defaultSetting = new AddressSettings();
+ defaultSetting.setPageSizeBytes(pageSize);
+ defaultSetting.setMaxSizeBytes(maxAddressSize);
+ backupServer.getAddressSettingsRepository().addMatch("#", defaultSetting);
}
else
{
@@ -160,8 +165,6 @@
liveConf.setBindingsDirectory(getBindingsDir(getTestDir() + "/live"));
liveConf.setPagingDirectory(getPageDir(getTestDir() + "/live"));
- liveConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
- liveConf.setGlobalPagingSize(pageSize);
liveConf.setJournalFileSize(100 * 1024);
liveConf.setJournalType(JournalType.ASYNCIO);
@@ -170,6 +173,12 @@
if (fileBased)
{
liveServer = Messaging.newMessagingServer(liveConf);
+
+ AddressSettings defaultSetting = new AddressSettings();
+ defaultSetting.setPageSizeBytes(pageSize);
+ defaultSetting.setMaxSizeBytes(maxAddressSize);
+ liveServer.getAddressSettingsRepository().addMatch("#", defaultSetting);
+
}
else
{
@@ -210,9 +219,8 @@
backupConf.setJournalType(JournalType.ASYNCIO);
- backupConf.setPagingMaxGlobalSizeBytes(-1);
- backupConf.setGlobalPagingSize(-1);
backupServer = Messaging.newMessagingServer(backupConf);
+
}
else
{
@@ -259,8 +267,6 @@
liveConf.setBindingsDirectory(getBindingsDir(getTestDir() + "/live"));
liveConf.setPagingDirectory(getPageDir(getTestDir() + "/live"));
- liveConf.setPagingMaxGlobalSizeBytes(-1);
- liveConf.setGlobalPagingSize(-1);
liveConf.setJournalFileSize(100 * 1024);
liveConf.setJournalType(JournalType.ASYNCIO);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -105,9 +105,9 @@
public void testFoo()
{
-
+
}
-
+
// Currently disabled - https://jira.jboss.org/jira/browse/JBMESSAGING-1558
public void disabled_testB() throws Exception
{
@@ -364,7 +364,7 @@
}
- protected void setUpFailoverServers(boolean fileBased, final long maxGlobalSize, final int pageSize) throws Exception
+ protected void setUpFailoverServers(boolean fileBased, final int maxGlobalSize, final int pageSize) throws Exception
{
deleteDirectory(new File(getTestDir()));
@@ -388,9 +388,14 @@
backupConf.setJournalType(JournalType.ASYNCIO);
- backupConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
- backupConf.setGlobalPagingSize(pageSize);
backupServer = Messaging.newMessagingServer(backupConf);
+
+ AddressSettings defaultSetting = new AddressSettings();
+ defaultSetting.setPageSizeBytes(pageSize);
+ defaultSetting.setMaxSizeBytes(maxGlobalSize);
+
+ backupServer.getAddressSettingsRepository().addMatch("#", defaultSetting);
+
}
else
{
@@ -422,16 +427,18 @@
liveConf.setBindingsDirectory(getBindingsDir(getTestDir() + "/live"));
liveConf.setPagingDirectory(getPageDir(getTestDir() + "/live"));
- liveConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
- liveConf.setGlobalPagingSize(pageSize);
liveConf.setJournalFileSize(100 * 1024);
liveConf.setJournalType(JournalType.ASYNCIO);
- }
- if (fileBased)
- {
liveServer = Messaging.newMessagingServer(liveConf);
+
+ AddressSettings defaultSetting = new AddressSettings();
+ defaultSetting.setPageSizeBytes(pageSize);
+ defaultSetting.setMaxSizeBytes(maxGlobalSize);
+
+ liveServer.getAddressSettingsRepository().addMatch("#", defaultSetting);
+
}
else
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageCleanupTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageCleanupTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageCleanupTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -79,7 +79,7 @@
Configuration config = createDefaultConfig();
- server = createServer(true, config, new HashMap<String, AddressSettings>());
+ server = createServer(true, config, -1, -1, new HashMap<String, AddressSettings>());
server.start();
@@ -102,11 +102,8 @@
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(20 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ server = createServer(true, config, 10 * 1024, 20 * 1024, new HashMap<String, AddressSettings>());
- server = createServer(true, config, new HashMap<String, AddressSettings>());
-
server.start();
final int numberOfBytes = 2 * 1024 * 1024;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -107,8 +107,6 @@
assertEquals(conf.isCreateBindingsDir(), serverControl.isCreateBindingsDir());
assertEquals(conf.isCreateJournalDir(), serverControl.isCreateJournalDir());
assertEquals(conf.getPagingDirectory(), serverControl.getPagingDirectory());
- assertEquals(conf.getPagingMaxGlobalSizeBytes(), serverControl.getPagingMaxGlobalSizeBytes());
- assertEquals(conf.getGlobalPagingSize(), serverControl.getGlobalPageSize());
assertEquals(conf.getLargeMessagesDirectory(), serverControl.getLargeMessagesDirectory());
assertEquals(conf.isWildcardRoutingEnabled(), serverControl.isWildcardRoutingEnabled());
assertEquals(conf.getTransactionTimeout(), serverControl.getTransactionTimeout());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -93,11 +93,8 @@
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
+ MessagingServer messagingService = createServer(true, config, 10 * 1024, 100 * 1024, new HashMap<String, AddressSettings>());
- MessagingServer messagingService = createServer(true, config, new HashMap<String, AddressSettings>());
-
messagingService.start();
try
@@ -135,9 +132,6 @@
clearData();
Configuration config = createDefaultConfig();
- config.setPagingMaxGlobalSizeBytes(100 * 1024);
- config.setGlobalPagingSize(10 * 1024);
-
MessagingServer server = newMessagingServer(config);
server.start();
@@ -230,7 +224,8 @@
MessagingServer server = new FailingMessagingServerImpl(configuration, securityManager);
AddressSettings defaultSetting = new AddressSettings();
- defaultSetting.setPageSizeBytes(configuration.getGlobalPagingSize());
+ defaultSetting.setPageSizeBytes(10 * 1024);
+ defaultSetting.setMaxSizeBytes(100 * 1024);
server.getAddressSettingsRepository().addMatch("#", defaultSetting);
@@ -255,9 +250,7 @@
return new PagingManagerImpl(new FailurePagingStoreFactoryNIO(super.getConfiguration().getPagingDirectory()),
super.getStorageManager(),
super.getAddressSettingsRepository(),
- super.getConfiguration().getPagingMaxGlobalSizeBytes(),
- super.getConfiguration().getGlobalPagingSize(),
- super.getConfiguration().isJournalSyncNonTransactional(),
+ super.getConfiguration().isJournalSyncNonTransactional(),
false);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/persistence/DeleteQueueRestartTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/persistence/DeleteQueueRestartTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/persistence/DeleteQueueRestartTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -72,8 +72,6 @@
{
MessagingServer server = createServer(true);
- server.getConfiguration().setPagingMaxGlobalSizeBytes(0);
-
server.start();
ClientSessionFactory factory = createInVMFactory();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -56,7 +56,6 @@
configuration = createDefaultConfig();
configuration.setSecurityEnabled(false);
configuration.setJournalMinFiles(2);
- configuration.setPagingMaxGlobalSizeBytes(-1);
server = createServer(true, configuration);
server.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -65,7 +65,6 @@
configuration = createDefaultConfig();
configuration.setSecurityEnabled(false);
configuration.setJournalMinFiles(2);
- configuration.setPagingMaxGlobalSizeBytes(-1);
server = createServer(true, configuration);
server.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -81,7 +81,7 @@
configuration.setJournalMinFiles(2);
configuration.setPagingDirectory(getPageDir());
- server = createServer(true, configuration, addressSettings);
+ server = createServer(true, configuration, -1, -1, addressSettings);
// start the server
server.start();
@@ -1215,7 +1215,7 @@
clientSession = null;
server.stop();
server = null;
- server = createServer(true, configuration, addressSettings);
+ server = createServer(true, configuration, -1, -1, addressSettings);
server.start();
createClients();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -77,9 +77,8 @@
configuration.setSecurityEnabled(false);
configuration.setJournalMinFiles(2);
configuration.setPagingDirectory(getPageDir());
- configuration.setPagingMaxGlobalSizeBytes(0); // no paging for these tests
- messagingService = createServer(false, configuration, addressSettings);
+ messagingService = createServer(false, configuration, -1, -1, addressSettings);
// start the server
messagingService.start();
@@ -340,7 +339,7 @@
messagingService.stop();
// do the same test with a file persistence now
- messagingService = createServer(true, configuration, addressSettings);
+ messagingService = createServer(true, configuration, -1, -1, addressSettings);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -78,9 +78,7 @@
HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>();
- config.setPagingMaxGlobalSizeBytes(20 * 1024);
-
- MessagingServer messagingService = createServer(true, config, settings);
+ MessagingServer messagingService = createServer(true, config, 10 * 1024, 20 * 1024, settings);
messagingService.start();
try
{
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -47,38 +47,17 @@
// Public --------------------------------------------------------
- public void testStopDuringGlobalDepage() throws Exception
+ public void testStopDuringDepage() throws Exception
{
- testStopDuringDepage(true);
- }
-
- public void testStopDuringRegularDepage() throws Exception
- {
- testStopDuringDepage(false);
- }
-
- public void testStopDuringDepage(final boolean globalPage) throws Exception
- {
Configuration config = createDefaultConfig();
HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>();
- if (globalPage)
- {
- config.setPagingMaxGlobalSizeBytes(20 * 1024 * 1024);
- AddressSettings setting = new AddressSettings();
- setting.setMaxSizeBytes(-1);
- settings.put("page-adr", setting);
- }
- else
- {
- config.setPagingMaxGlobalSizeBytes(-1);
- AddressSettings setting = new AddressSettings();
- setting.setMaxSizeBytes(20 * 1024 * 1024);
- settings.put("page-adr", setting);
- }
+ AddressSettings setting = new AddressSettings();
+ setting.setMaxSizeBytes(20 * 1024 * 1024);
+ settings.put("page-adr", setting);
- messagingService = createServer(true, config, settings);
+ messagingService = createServer(true, config, 10 * 1024 * 1024, 20 * 1024 * 1024, settings);
messagingService.start();
ClientSessionFactory factory = createInVMFactory();
@@ -139,7 +118,7 @@
System.out.println("server stopped, nr msgs: " + msgs);
- messagingService = createServer(true, config, settings);
+ messagingService = createServer(true, config, 20 * 1024 * 1024, 10 * 1024 * 1024, settings);
messagingService.start();
factory = createInVMFactory();
@@ -178,38 +157,17 @@
}
- public void testGlobalPageOnMultipleDestinations() throws Exception
+ public void testPageOnMultipleDestinations() throws Exception
{
- testPageOnMultipleDestinations(true);
- }
-
- public void testRegularPageOnMultipleDestinations() throws Exception
- {
- testPageOnMultipleDestinations(false);
- }
-
- public void testPageOnMultipleDestinations(final boolean globalPage) throws Exception
- {
Configuration config = createDefaultConfig();
HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>();
- if (globalPage)
- {
- config.setPagingMaxGlobalSizeBytes(20 * 1024 * 1024);
- AddressSettings setting = new AddressSettings();
- setting.setMaxSizeBytes(-1);
- settings.put("page-adr", setting);
- }
- else
- {
- config.setPagingMaxGlobalSizeBytes(-1);
- AddressSettings setting = new AddressSettings();
- setting.setMaxSizeBytes(20 * 1024 * 1024);
- settings.put("page-adr", setting);
- }
+ AddressSettings setting = new AddressSettings();
+ setting.setMaxSizeBytes(20 * 1024 * 1024);
+ settings.put("page-adr", setting);
- messagingService = createServer(true, config, settings);
+ messagingService = createServer(true, config, 10 * 1024 * 1024, 20 * 1024 * 1024, settings);
messagingService.start();
ClientSessionFactory factory = createInVMFactory();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -123,10 +123,6 @@
assertEquals(ConfigurationImpl.DEFAULT_CREATE_JOURNAL_DIR, conf.isCreateJournalDir());
assertEquals(ConfigurationImpl.DEFAULT_PAGING_DIR, conf.getPagingDirectory());
-
- assertEquals(ConfigurationImpl.DEFAULT_PAGE_MAX_GLOBAL_SIZE, conf.getPagingMaxGlobalSizeBytes());
-
- assertEquals(ConfigurationImpl.DEFAULT_GLOBAL_PAGE_SIZE, conf.getGlobalPagingSize());
assertEquals(ConfigurationImpl.DEFAULT_LARGE_MESSAGES_DIR, conf.getLargeMessagesDirectory());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -72,8 +72,6 @@
assertEquals(true, conf.isBackup());
assertEquals(true, conf.isPersistDeliveryCountBeforeDelivery());
assertEquals("pagingdir", conf.getPagingDirectory());
- assertEquals(123, conf.getGlobalPagingSize());
- assertEquals(4567, conf.getPagingMaxGlobalSizeBytes());
assertEquals("somedir", conf.getBindingsDirectory());
assertEquals(false, conf.isCreateBindingsDir());
assertEquals("somedir2", conf.getJournalDirectory());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingManagerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingManagerImplTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingManagerImplTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -72,8 +72,6 @@
PagingManagerImpl managerImpl = new PagingManagerImpl(new PagingStoreFactoryNIO(getPageDir(), new OrderedExecutorFactory(Executors.newCachedThreadPool())),
new NullStorageManager(),
addressSettings,
- -1,
- 1024 * 1024,
true,
false);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -747,11 +747,6 @@
return null;
}
- public long getGlobalPageSize()
- {
- return ConfigurationImpl.DEFAULT_GLOBAL_PAGE_SIZE;
- }
-
public long getTotalMemory()
{
return 0;
@@ -814,7 +809,7 @@
{
}
- public void startGlobalDepage()
+ public void resumeDepages()
{
}
@@ -835,6 +830,14 @@
{
}
+ /* (non-Javadoc)
+ * @see org.jboss.messaging.core.paging.PagingManager#isGlobalFull()
+ */
+ public boolean isGlobalFull()
+ {
+ return false;
+ }
+
}
class FakeStorageManager implements StorageManager
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -91,7 +91,7 @@
configuration.setJournalType(JournalType.ASYNCIO);
ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE);
-
+
journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
journal.start();
@@ -201,11 +201,6 @@
return null;
}
- public long getGlobalPageSize()
- {
- return ConfigurationImpl.DEFAULT_GLOBAL_PAGE_SIZE;
- }
-
public long getTotalMemory()
{
return 0;
@@ -268,7 +263,7 @@
{
}
- public void startGlobalDepage()
+ public void resumeDepages()
{
}
@@ -289,6 +284,14 @@
{
}
+ /* (non-Javadoc)
+ * @see org.jboss.messaging.core.paging.PagingManager#isGlobalFull()
+ */
+ public boolean isGlobalFull()
+ {
+ return false;
+ }
+
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java 2009-08-06 19:36:50 UTC (rev 7676)
+++ trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java 2009-08-06 22:10:03 UTC (rev 7677)
@@ -113,6 +113,8 @@
protected MessagingServer createServer(final boolean realFiles,
final Configuration configuration,
+ int pageSize,
+ int maxAddressSize,
final Map<String, AddressSettings> settings)
{
MessagingServer server;
@@ -132,7 +134,8 @@
}
AddressSettings defaultSetting = new AddressSettings();
- defaultSetting.setPageSizeBytes(configuration.getGlobalPagingSize());
+ defaultSetting.setPageSizeBytes(pageSize);
+ defaultSetting.setMaxSizeBytes(maxAddressSize);
server.getAddressSettingsRepository().addMatch("#", defaultSetting);
@@ -161,8 +164,6 @@
}
AddressSettings defaultSetting = new AddressSettings();
- defaultSetting.setPageSizeBytes(configuration.getGlobalPagingSize());
-
server.getAddressSettingsRepository().addMatch("#", defaultSetting);
return server;
@@ -170,12 +171,12 @@
protected MessagingServer createServer(final boolean realFiles)
{
- return createServer(realFiles, createDefaultConfig(), new HashMap<String, AddressSettings>());
+ return createServer(realFiles, createDefaultConfig(), -1, -1, new HashMap<String, AddressSettings>());
}
protected MessagingServer createServer(final boolean realFiles, final Configuration configuration)
{
- return createServer(realFiles, configuration, new HashMap<String, AddressSettings>());
+ return createServer(realFiles, configuration, -1, -1, new HashMap<String, AddressSettings>());
}
protected MessagingServer createServer(final boolean realFiles, final Configuration configuration,
@@ -200,7 +201,6 @@
}
AddressSettings defaultSetting = new AddressSettings();
- defaultSetting.setPageSizeBytes(configuration.getGlobalPagingSize());
server.getAddressSettingsRepository().addMatch("#", defaultSetting);
@@ -212,7 +212,7 @@
final Map<String, Object> params)
{
return createServer(realFiles,
- createClusteredDefaultConfig(index, params, INVM_ACCEPTOR_FACTORY),
+ createClusteredDefaultConfig(index, params, INVM_ACCEPTOR_FACTORY), -1, -1,
new HashMap<String, AddressSettings>());
}
More information about the jboss-cvs-commits
mailing list