JBoss hornetq SVN: r10397 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 10:08:21 -0400 (Mon, 28 Mar 2011)
New Revision: 10397
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
Log:
use log.debug instead of log.info
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-03-28 14:07:56 UTC (rev 10396)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-03-28 14:08:21 UTC (rev 10397)
@@ -184,7 +184,7 @@
boolean isImmutable = immutables.contains(match);
if (isImmutable)
{
- log.info("Cannot remove match " + match + " since it came from a main config");
+ log.debug("Cannot remove match " + match + " since it came from a main config");
}
else
{
13 years, 3 months
JBoss hornetq SVN: r10396 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 10:07:56 -0400 (Mon, 28 Mar 2011)
New Revision: 10396
Removed:
tags/HornetQ_2_2_2_EAP_CR4/
Log:
renaming tag
13 years, 3 months
JBoss hornetq SVN: r10395 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 10:06:06 -0400 (Mon, 28 Mar 2011)
New Revision: 10395
Added:
tags/HornetQ_2_2_2_EAP_CR2/
Removed:
tags/HornetQ_2_2_1_EAP_GA/
Log:
Renaming tag to reflect QA's reality
13 years, 3 months
JBoss hornetq SVN: r10394 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 10:04:49 -0400 (Mon, 28 Mar 2011)
New Revision: 10394
Added:
tags/HornetQ_2_2_2_EAP_CR1/
Removed:
tags/HornetQ_2_2_EAP_GA/
Log:
Renaming tag to reflect QA's reality
13 years, 3 months
JBoss hornetq SVN: r10393 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 10:03:56 -0400 (Mon, 28 Mar 2011)
New Revision: 10393
Removed:
tags/HornetQ_2_2_EAP_CR1/
Log:
removing invalid tag
13 years, 3 months
JBoss hornetq SVN: r10392 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 10:00:54 -0400 (Mon, 28 Mar 2011)
New Revision: 10392
Added:
tags/HornetQ_2_2_2_EAP_CR4/
Log:
2.2.2 EAP CR4 pretag
13 years, 3 months
JBoss hornetq SVN: r10391 - in branches/Branch_2_2_EAP/src/main/org/hornetq/core: settings and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 09:52:31 -0400 (Mon, 28 Mar 2011)
New Revision: 10391
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
Log:
https://issues.jboss.org/browse/JBPAPP-6153 - fixing another small possibility of missing messages
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-03-28 13:10:11 UTC (rev 10390)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-03-28 13:52:31 UTC (rev 10391)
@@ -1532,7 +1532,7 @@
{
for (Map.Entry<String, Set<Role>> entry : configuration.getSecurityRoles().entrySet())
{
- securityRepository.addMatch(entry.getKey(), entry.getValue());
+ securityRepository.addMatch(entry.getKey(), entry.getValue(), true);
}
}
@@ -1552,7 +1552,7 @@
{
for (Map.Entry<String, AddressSettings> entry : configuration.getAddressesSettings().entrySet())
{
- addressSettingsRepository.addMatch(entry.getKey(), entry.getValue());
+ addressSettingsRepository.addMatch(entry.getKey(), entry.getValue(), true);
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java 2011-03-28 13:10:11 UTC (rev 10390)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/HierarchicalRepository.java 2011-03-28 13:52:31 UTC (rev 10391)
@@ -26,6 +26,8 @@
* @param value the value to hold agains the match
*/
void addMatch(String match, T value);
+
+ void addMatch(String match, T value, boolean immutableMatch);
/**
* return the value held against the nearest match
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-03-28 13:10:11 UTC (rev 10390)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-03-28 13:52:31 UTC (rev 10391)
@@ -17,8 +17,10 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.hornetq.core.logging.Logger;
@@ -45,6 +47,15 @@
* all the matches
*/
private final Map<String, Match<T>> matches = new HashMap<String, Match<T>>();
+
+ /**
+ * Certain values cannot be removed after installed.
+ * This is because we read a few records from the main config.
+ * JBoss AS deployer may remove them on undeploy, while we don't want to accept that since
+ * this could cause issues on shutdown.
+ * Notice you can still change these values. You just can't remove them.
+ */
+ private final Set<String> immutables = new HashSet<String>();
/**
* a regex comparator
@@ -61,15 +72,26 @@
*/
private final ArrayList<HierarchicalRepositoryChangeListener> listeners = new ArrayList<HierarchicalRepositoryChangeListener>();
+
+ public void addMatch(final String match, final T value)
+ {
+ addMatch(match, value, false);
+ }
+
+
/**
* Add a new match to the repository
*
* @param match The regex to use to match against
* @param value the value to hold agains the match
*/
- public void addMatch(final String match, final T value)
+ public void addMatch(final String match, final T value, final boolean immutableMatch)
{
clearCache();
+ if (immutableMatch)
+ {
+ immutables.add(match);
+ }
Match.verify(match);
Match<T> match1 = new Match<T>(match);
match1.setValue(value);
@@ -158,9 +180,18 @@
*/
public void removeMatch(final String match)
{
- matches.remove(match);
- clearCache();
- onChange();
+ new Exception("Removing match " + match).printStackTrace();
+ boolean isImmutable = immutables.contains(match);
+ if (isImmutable)
+ {
+ log.info("Cannot remove match " + match + " since it came from a main config");
+ }
+ else
+ {
+ matches.remove(match);
+ clearCache();
+ onChange();
+ }
}
public void registerListener(final HierarchicalRepositoryChangeListener listener)
13 years, 3 months
JBoss hornetq SVN: r10390 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/jms/misc.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-28 09:10:11 -0400 (Mon, 28 Mar 2011)
New Revision: 10390
Modified:
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java
Log:
Changing manifest test (do not merge this commit on trunk)
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2011-03-28 02:57:46 UTC (rev 10389)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2011-03-28 13:10:11 UTC (rev 10390)
@@ -75,7 +75,7 @@
Attributes attrs = manifest.getMainAttributes();
Assert.assertEquals(meta.getProviderVersion(), attrs.getValue("HornetQ-Version"));
- Assert.assertEquals("https://svn.jboss.org/repos/hornetq/trunk", attrs.getValue("HornetQ-SVN-URL"));
+ Assert.assertEquals("https://svn.jboss.org/repos/hornetq/branches/Branch_2_2_EAP", attrs.getValue("HornetQ-SVN-URL"));
}
finally
{
13 years, 3 months
JBoss hornetq SVN: r10389 - branches/Branch_2_2_EAP.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-27 22:57:46 -0400 (Sun, 27 Mar 2011)
New Revision: 10389
Modified:
branches/Branch_2_2_EAP/merges.txt
Log:
changing mergest.txt
Modified: branches/Branch_2_2_EAP/merges.txt
===================================================================
--- branches/Branch_2_2_EAP/merges.txt 2011-03-28 02:56:29 UTC (rev 10388)
+++ branches/Branch_2_2_EAP/merges.txt 2011-03-28 02:57:46 UTC (rev 10389)
@@ -4,3 +4,4 @@
- branch_2_2 - trunk - 10130:10363 - 25-mar-2011 - Andy
- branch_2_2 - trunk - 10363:10371 - 25-mar-2011 - Andy
- branch_2_2 - trunk - 10373:10374 - 25-mar-2011 - Clebert
+- branch_2_2 - trunk - 10384:10387 - 27-mar-2011 - Clebert
13 years, 3 months
JBoss hornetq SVN: r10388 - in trunk/tests/src/org/hornetq/tests/stress: paging and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-27 22:56:29 -0400 (Sun, 27 Mar 2011)
New Revision: 10388
Modified:
trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java
trunk/tests/src/org/hornetq/tests/stress/paging/PageCursorStressTest.java
trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java
Log:
merge Branch_2_2_eap -r10384:10387
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2011-03-28 02:51:02 UTC (rev 10387)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2011-03-28 02:56:29 UTC (rev 10388)
@@ -55,12 +55,12 @@
protected void setUp() throws Exception
{
super.setUp();
- setupServer(JournalType.ASYNCIO);
+ setupServer(JournalType.NIO);
}
public void testProduceAndConsume() throws Throwable
{
- int numberOfConsumers = 60;
+ int numberOfConsumers = 5;
// this test assumes numberOfConsumers == numberOfProducers
int numberOfProducers = numberOfConsumers;
int produceMessage = 10000;
@@ -120,7 +120,7 @@
server.stop();
- setupServer(JournalType.ASYNCIO);
+ setupServer(JournalType.NIO);
ClientSession sess = sf.createSession(true, true);
Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageCursorStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/paging/PageCursorStressTest.java 2011-03-28 02:51:02 UTC (rev 10387)
+++ trunk/tests/src/org/hornetq/tests/stress/paging/PageCursorStressTest.java 2011-03-28 02:56:29 UTC (rev 10388)
@@ -36,7 +36,6 @@
import org.hornetq.core.paging.cursor.PagedReference;
import org.hornetq.core.paging.cursor.impl.PageCursorProviderImpl;
import org.hornetq.core.paging.cursor.impl.PagePositionImpl;
-import org.hornetq.core.paging.cursor.impl.PageSubscriptionImpl;
import org.hornetq.core.paging.impl.PagingStoreImpl;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.persistence.impl.journal.OperationContextImpl;
@@ -527,12 +526,10 @@
assertNull(iterator.next());
}
- server.stop();
-
OperationContextImpl.clearContext();
+
+ ctx = generateCTX();
- createServer();
-
pageStore = lookupPageStore(ADDRESS);
cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
@@ -563,12 +560,8 @@
assertEquals(i, readMessage.getMessage().getIntProperty("key").intValue());
}
- server.stop();
-
OperationContextImpl.clearContext();
- createServer();
-
pageStore = lookupPageStore(ADDRESS);
cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
@@ -919,63 +912,6 @@
}
- public void testCloseNonPersistentConsumer() throws Exception
- {
-
- final int NUM_MESSAGES = 100;
-
- PageCursorProvider cursorProvider = lookupCursorProvider();
-
- PageSubscription cursor = cursorProvider.createSubscription(11, null, false);
- PageSubscriptionImpl cursor2 = (PageSubscriptionImpl)cursorProvider.createSubscription(12, null, false);
-
- this.queueList.add(new FakeQueue(new SimpleString("a"), 11));
-
- this.queueList.add(new FakeQueue(new SimpleString("b"), 12));
-
- int numberOfPages = addMessages(NUM_MESSAGES, 1024 * 1024);
-
- System.out.println("NumberOfPages = " + numberOfPages);
-
- queue.getPageSubscription().close();
-
- PagedReference msg;
- LinkedListIterator<PagedReference> iterator = cursor.iterator();
- LinkedListIterator<PagedReference> iterator2 = cursor2.iterator();
-
- cursor2.bookmark(new PagePositionImpl(1, -1));
-
- int key = 0;
- while ((msg = iterator.next()) != null)
- {
- System.out.println("key = " + key);
- assertEquals(key++, msg.getMessage().getIntProperty("key").intValue());
- cursor.ack(msg);
- }
- assertEquals(NUM_MESSAGES, key);
-
- forceGC();
-
- for (int i = 0; i < 10; i++)
- {
- assertTrue(iterator2.hasNext());
- msg = iterator2.next();
- assertEquals(i, msg.getMessage().getIntProperty("key").intValue());
- }
-
- assertSame(cursor2.getProvider(), cursorProvider);
-
- cursor2.close();
-
- lookupPageStore(ADDRESS).flushExecutors();
-
- server.stop();
- createServer();
- waitCleanup();
- assertEquals(1, lookupPageStore(ADDRESS).getNumberOfPages());
-
- }
-
public void testNoCursors() throws Exception
{
@@ -1000,54 +936,6 @@
}
- public void testFirstMessageInTheMiddle() throws Exception
- {
-
- final int NUM_MESSAGES = 100;
-
- PageCursorProvider cursorProvider = lookupCursorProvider();
-
- PageSubscription cursor = cursorProvider.createSubscription(2, null, false);
-
- queueList.add(new FakeQueue(new SimpleString("tmp"), 2));
-
- int numberOfPages = addMessages(NUM_MESSAGES, 1024 * 1024);
-
- System.out.println("NumberOfPages = " + numberOfPages);
-
- PageCache cache = cursorProvider.getPageCache(new PagePositionImpl(5, 0));
-
- queue.getPageSubscription().close();
-
- PagePosition startingPos = new PagePositionImpl(5, cache.getNumberOfMessages() / 2);
- cursor.bookmark(startingPos);
- PagedMessage msg = cache.getMessage(startingPos.getMessageNr() + 1);
- msg.initMessage(server.getStorageManager());
- int key = msg.getMessage().getIntProperty("key").intValue();
-
- msg = null;
-
- cache = null;
- LinkedListIterator<PagedReference> iterator = cursor.iterator();
-
- PagedReference msgCursor = null;
- while ((msgCursor = iterator.next()) != null)
- {
- assertEquals(key++, msgCursor.getMessage().getIntProperty("key").intValue());
- cursor.ack(msgCursor);
- }
- assertEquals(NUM_MESSAGES, key);
-
- forceGC();
-
- // assertTrue(cursorProvider.getCacheSize() < numberOfPages);
-
- server.stop();
- createServer();
- waitCleanup();
- assertEquals(1, lookupPageStore(ADDRESS).getNumberOfPages());
- }
-
public void testFirstMessageInTheMiddlePersistent() throws Exception
{
@@ -1264,6 +1152,8 @@
server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap<String, AddressSettings>());
server.start();
+
+ queueList.clear();
try
{
Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2011-03-28 02:51:02 UTC (rev 10387)
+++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2011-03-28 02:56:29 UTC (rev 10388)
@@ -221,15 +221,9 @@
ClientConsumer consumers[] = new ClientConsumer[] { session.createConsumer(queue[0]),
session.createConsumer(queue[1]) };
- int reads = 0;
-
while (true)
{
int msgs1 = readMessages(session, consumers[0], queue[0]);
- if (reads++ == 0)
- {
- Assert.assertTrue(msgs1 > 0 && msgs1 < NUMBER_OF_MESSAGES);
- }
int msgs2 = readMessages(session, consumers[1], queue[1]);
counters[0] += msgs1;
counters[1] += msgs2;
13 years, 3 months