Jenkins build is unstable: ActiveMQ-Java7 #443

2014-09-11 Thread Apache Jenkins Server
See https://builds.apache.org/job/ActiveMQ-Java7/443/



Jenkins build is unstable: ActiveMQ-Java7 ยป ActiveMQ :: Unit Tests #443

2014-09-11 Thread Apache Jenkins Server
See 
https://builds.apache.org/job/ActiveMQ-Java7/org.apache.activemq$activemq-unit-tests/443/



buildbot failure in ASF Buildbot on activemq-site-production

2014-09-11 Thread buildbot
The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/activemq-site-production/builds/3411

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

BUILD FAILED: failed compile

sincerely,
 -The Buildbot





Build failed in Jenkins: ActiveMQ-Java8 #108

2014-09-11 Thread Apache Jenkins Server
See https://builds.apache.org/job/ActiveMQ-Java8/108/

--
[...truncated 5533 lines...]
Sending artifact delta relative to ActiveMQ-Java8 ? ActiveMQ :: Run Jar #107
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 24860 bytes
Compression is 0.0%
Took 0.11 sec
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-mqtt/pom.xml to 
org.apache.activemq/activemq-mqtt/5.11-SNAPSHOT/activemq-mqtt-5.11-SNAPSHOT.pom
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-mqtt/target/activemq-mqtt-5.11-SNAPSHOT.jar
 to 
org.apache.activemq/activemq-mqtt/5.11-SNAPSHOT/activemq-mqtt-5.11-SNAPSHOT.jar
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-mqtt/target/activemq-mqtt-5.11-SNAPSHOT-sources.jar
 to 
org.apache.activemq/activemq-mqtt/5.11-SNAPSHOT/activemq-mqtt-5.11-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java8 ? ActiveMQ :: MQTT Protocol 
#107
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 161629 bytes
Compression is 0.0%
Took 2.1 sec
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-shiro/pom.xml to 
org.apache.activemq/activemq-shiro/5.11-SNAPSHOT/activemq-shiro-5.11-SNAPSHOT.pom
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-shiro/target/activemq-shiro-5.11-SNAPSHOT.jar
 to 
org.apache.activemq/activemq-shiro/5.11-SNAPSHOT/activemq-shiro-5.11-SNAPSHOT.jar
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-shiro/target/activemq-shiro-5.11-SNAPSHOT-sources.jar
 to 
org.apache.activemq/activemq-shiro/5.11-SNAPSHOT/activemq-shiro-5.11-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java8 ? ActiveMQ :: Shiro #107
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 98708 bytes
Compression is 0.0%
Took 0.19 sec
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-console/pom.xml to 
org.apache.activemq/activemq-console/5.11-SNAPSHOT/activemq-console-5.11-SNAPSHOT.pom
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-console/target/activemq-console-5.11-SNAPSHOT.jar
 to 
org.apache.activemq/activemq-console/5.11-SNAPSHOT/activemq-console-5.11-SNAPSHOT.jar
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-console/target/activemq-console-5.11-SNAPSHOT-sources.jar
 to 
org.apache.activemq/activemq-console/5.11-SNAPSHOT/activemq-console-5.11-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java8 ? ActiveMQ :: Console #107
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 325155 bytes
Compression is 0.0%
Took 0.24 sec
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-camel/pom.xml to 
org.apache.activemq/activemq-camel/5.11-SNAPSHOT/activemq-camel-5.11-SNAPSHOT.pom
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-camel/target/activemq-camel-5.11-SNAPSHOT.jar
 to 
org.apache.activemq/activemq-camel/5.11-SNAPSHOT/activemq-camel-5.11-SNAPSHOT.jar
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-camel/target/activemq-camel-5.11-SNAPSHOT-sources.jar
 to 
org.apache.activemq/activemq-camel/5.11-SNAPSHOT/activemq-camel-5.11-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java8 ? ActiveMQ :: Camel #107
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 108990 bytes
Compression is 0.0%
Took 0.19 sec
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-blueprint/pom.xml to 
org.apache.activemq/activemq-blueprint/5.11-SNAPSHOT/activemq-blueprint-5.11-SNAPSHOT.pom
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-blueprint/target/activemq-blueprint-5.11-SNAPSHOT.jar
 to 
org.apache.activemq/activemq-blueprint/5.11-SNAPSHOT/activemq-blueprint-5.11-SNAPSHOT.jar
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-blueprint/target/activemq-blueprint-5.11-SNAPSHOT-sources.jar
 to 
org.apache.activemq/activemq-blueprint/5.11-SNAPSHOT/activemq-blueprint-5.11-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java8 ? ActiveMQ :: Blueprint #107
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 18123 bytes
Compression is 0.0%
Took 0.11 sec
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-client/pom.xml to 
org.apache.activemq/activemq-client/5.11-SNAPSHOT/activemq-client-5.11-SNAPSHOT.pom
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-client/target/activemq-client-5.11-SNAPSHOT.jar
 to 
org.apache.activemq/activemq-client/5.11-SNAPSHOT/activemq-client-5.11-SNAPSHOT.jar
[JENKINS] Archiving 
https://builds.apache.org/job/ActiveMQ-Java8/ws/activemq-client/target/activemq-client-5.11-SNAPSHOT-sources.jar
 to 

buildbot success in ASF Buildbot on activemq-site-production

2014-09-11 Thread buildbot
The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/activemq-site-production/builds/3412

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

Build succeeded!

sincerely,
 -The Buildbot





[1/3] git commit: https://issues.apache.org/jira/browse/AMQ-5274 - we now only check expiry on non inflight messages so there is on contention on ack with the periodic expriy check thread - related ht

2014-09-11 Thread gtully
Repository: activemq
Updated Branches:
  refs/heads/trunk b1ede0559 - 8cdb5c2c1


https://issues.apache.org/jira/browse/AMQ-5274 - we now only check expiry on 
non inflight messages so there is on contention on ack with the periodic expriy 
check thread - related https://issues.apache.org/jira/browse/AMQ-2876


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/26807cd4
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/26807cd4
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/26807cd4

Branch: refs/heads/trunk
Commit: 26807cd4524460e22844d16136f03bc96fa9b4c8
Parents: b1ede05
Author: gtully gary.tu...@gmail.com
Authored: Thu Sep 11 16:13:43 2014 +0100
Committer: gtully gary.tu...@gmail.com
Committed: Thu Sep 11 16:13:43 2014 +0100

--
 .../apache/activemq/broker/region/Queue.java|   2 +-
 .../broker/region/QueueSubscription.java|   8 --
 ...JmsSendReceiveWithMessageExpirationTest.java |  21 ++-
 .../org/apache/activemq/bugs/AMQ5274Test.java   | 133 +++
 .../activemq/usecases/ExpiredMessagesTest.java  |   2 +-
 .../ExpiredMessagesWithNoConsumerTest.java  |  21 ++-
 6 files changed, 170 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/26807cd4/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index e9f2180..ff16dfc 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1169,7 +1169,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 ListMessageReference toExpire) throws Exception {
 for (Iterator? extends MessageReference i = refs.iterator(); 
i.hasNext()  l.size()  max;) {
 QueueMessageReference ref = (QueueMessageReference) i.next();
-if (ref.isExpired()) {
+if (ref.isExpired()  (ref.getLockOwner() == null)) {
 toExpire.add(ref);
 } else if (l.contains(ref.getMessage()) == false) {
 l.add(ref.getMessage());

http://git-wip-us.apache.org/repos/asf/activemq/blob/26807cd4/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
index 7c7027f..358f946 100755
--- 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
@@ -52,14 +52,6 @@ public class QueueSubscription extends PrefetchSubscription 
implements LockOwner
 final Destination q = (Destination) n.getRegionDestination();
 final QueueMessageReference node = (QueueMessageReference)n;
 final Queue queue = (Queue)q;
-
-if (n.isExpired()) {
-// sync with message expiry processing
-if (!broker.isExpired(n)) {
-LOG.debug(ignoring ack {}, for already expired message: {}, 
ack, n);
-return;
-}
-}
 queue.removeMessage(context, this, node, ack);
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/26807cd4/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
index 956fa40..391253e 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java
@@ -30,6 +30,10 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.Topic;
 
+import org.apache.activemq.broker.BrokerRegistry;
+import org.apache.activemq.broker.region.DestinationStatistics;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.util.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -151,7 +155,7 @@ public class JmsSendReceiveWithMessageExpirationTest 
extends TestSupport {
  received.acknowledge();

[3/3] git commit: https://issues.apache.org/jira/browse/AMQ-5266 - remove err message print on iterator limit

2014-09-11 Thread gtully
https://issues.apache.org/jira/browse/AMQ-5266 - remove err message print on 
iterator limit


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8cdb5c2c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8cdb5c2c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8cdb5c2c

Branch: refs/heads/trunk
Commit: 8cdb5c2c1d36416a827470661679087bc9e9a108
Parents: 5861d86
Author: gtully gary.tu...@gmail.com
Authored: Thu Sep 11 17:07:35 2014 +0100
Committer: gtully gary.tu...@gmail.com
Committed: Thu Sep 11 17:07:35 2014 +0100

--
 .../java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/8cdb5c2c/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java
index a53d5bf..b91a9fc 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java
@@ -113,7 +113,6 @@ public final class BTreeNodeKey,Value {
 }
 }  else {
 if (endKey != null  
current.keys[nextIndex].equals(endKey)) {
-System.err.println(Stopping iterator on reaching: 
 + endKey);
 break;
 }
 nextEntry = new KeyValueEntry(current.keys[nextIndex], 
current.values[nextIndex]);



[2/3] git commit: https://issues.apache.org/jira/browse/AMQ-5266 - fix edge case with optimizedDispatch=true where a single message could be pending till the next page in event

2014-09-11 Thread gtully
https://issues.apache.org/jira/browse/AMQ-5266 - fix edge case with 
optimizedDispatch=true where a single message could be pending till the next 
page in event


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5861d86a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5861d86a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5861d86a

Branch: refs/heads/trunk
Commit: 5861d86ad39cac1644b1a48157bd6c799a586ac4
Parents: 26807cd
Author: gtully gary.tu...@gmail.com
Authored: Thu Sep 11 16:59:50 2014 +0100
Committer: gtully gary.tu...@gmail.com
Committed: Thu Sep 11 16:59:50 2014 +0100

--
 .../apache/activemq/broker/region/Queue.java|  6 ++--
 .../org/apache/activemq/bugs/AMQ5266Test.java   | 29 
 2 files changed, 20 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/5861d86a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index ff16dfc..c7f768e 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -781,12 +781,12 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 sendLock.unlock();
 }
 for (MessageContext messageContext : orderedUpdates) {
-if (!messageContext.duplicate) {
-messageSent(messageContext.context, messageContext.message);
-}
 if (messageContext.onCompletion != null) {
 messageContext.onCompletion.run();
 }
+if (!messageContext.duplicate) {
+messageSent(messageContext.context, messageContext.message);
+}
 }
 orderedUpdates.clear();
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/5861d86a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java
index 626fe6e..efccefa 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java
@@ -87,22 +87,26 @@ public class AMQ5266Test {
 @Parameterized.Parameter(5)
 public boolean useDefaultStore = false;
 
-
@Parameterized.Parameters(name=#{0},producerThreads:{1},consumerThreads:{2},mL:{3},useCache:{4},useDefaultStore:{5})
+@Parameterized.Parameter(6)
+public boolean optimizeDispatch = false;
+
+
@Parameterized.Parameters(name=#{0},producerThreads:{1},consumerThreads:{2},mL:{3},useCache:{4},useDefaultStore:{5},optimizedDispatch:{6})
 public static IterableObject[] parameters() {
 return Arrays.asList(new Object[][]{
 // jdbc
-{1000, 20,  5,   50*1024,   true,  false},
-{100,  20,  5,   50*1024,   false, false},
-{1000, 5,   20,  50*1024,   true,  false},
-{1000, 20,  20,  1024*1024, true,  false},
-{1000, 100, 100, 1024*1024, true,  false},
+{1,1,   1,   50*1024,   false, false, true},
+{1000, 20,  5,   50*1024,   true,  false, false},
+{100,  20,  5,   50*1024,   false, false, false},
+{1000, 5,   20,  50*1024,   true,  false, false},
+{1000, 20,  20,  1024*1024, true,  false, false},
 
 // default store
-{1000, 20,  5,   50*1024,   true,  true},
-{100,  20,  5,   50*1024,   false, true},
-{1000, 5,   20,  50*1024,   true,  true},
-{1000, 20,  20,  1024*1024, true,  true},
-{1000, 100, 100, 1024*1024, true,  true}
+{1,1,   1,   50*1024,   false, true, true},
+{100,  5,   5,   50*1024,   false, true, false},
+{1000, 20,  5,   50*1024,   true,  true, false},
+{100,  20,  5,   50*1024,   false, true, false},
+{1000, 5,   20,  50*1024,   true,  true, false},
+{1000, 20,  20,  1024*1024, true,  true, false},
 });
 }
 
@@ -127,6 +131,7 @@ public class AMQ5266Test {
 kahaDBPersistenceAdapter.setConcurrentStoreAndDispatchQueues(true);
 }
 brokerService.setDeleteAllMessagesOnStartup(true);
+