Jenkins build became unstable: ActiveMQ-Java7-All-UnitTests #154
See https://builds.apache.org/job/ActiveMQ-Java7-All-UnitTests/154/changes
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5863 - fix and test - sequenceId state in messageid needs to be cleared before doing a store
Repository: activemq
Updated Branches:
refs/heads/master 97cd60fb7 - b6fea8312
https://issues.apache.org/jira/browse/AMQ-5863 - fix and test - sequenceId
state in messageid needs to be cleared before doing a store
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b6fea831
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b6fea831
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b6fea831
Branch: refs/heads/master
Commit: b6fea83126a5d0a7a99f9a6054e3eff17b40ff80
Parents: 97cd60f
Author: gtully gary.tu...@gmail.com
Authored: Thu Jun 25 12:49:22 2015 +0100
Committer: gtully gary.tu...@gmail.com
Committed: Thu Jun 25 12:49:52 2015 +0100
--
.../apache/activemq/broker/region/Queue.java| 1 +
.../org/apache/activemq/util/BrokerSupport.java | 1 -
.../activemq/store/kahadb/KahaDBStore.java | 1 -
.../bugs/AMQ5863CompositePublishTest.java | 113 +++
4 files changed, 114 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq/blob/b6fea831/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 232a7ba..af61e19 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
@@ -824,6 +824,7 @@ public class Queue extends BaseDestination implements Task,
UsageListener, Index
try {
message.getMessageId().setBrokerSequenceId(getDestinationSequenceId());
if (store != null message.isPersistent()) {
+message.getMessageId().setFutureOrSequenceLong(null);
try {
if (messages.isCacheEnabled()) {
result = store.asyncAddQueueMessage(context, message,
isOptimizeStorage());
http://git-wip-us.apache.org/repos/asf/activemq/blob/b6fea831/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java
--
diff --git
a/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java
b/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java
index ca19b8b..f3f3b78 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java
@@ -55,7 +55,6 @@ public final class BrokerSupport {
message.setDestination(deadLetterDestination);
message.setTransactionId(null);
message.setMemoryUsage(null);
-message.getMessageId().setFutureOrSequenceLong(null);
message.setRedeliveryCounter(0);
boolean originalFlowControl = context.isProducerFlowControl();
try {
http://git-wip-us.apache.org/repos/asf/activemq/blob/b6fea831/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
--
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index 7e06a57..8ceef36 100644
---
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -375,7 +375,6 @@ public class KahaDBStore extends MessageDatabase implements
PersistenceAdapter {
result.aquireLocks();
addQueueTask(this, result);
if (indexListener != null) {
-// allow concurrent dispatch by setting entry locator,
indexListener.onAdd(new
IndexListener.MessageContext(context, message, null));
}
return future;
http://git-wip-us.apache.org/repos/asf/activemq/blob/b6fea831/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5863CompositePublishTest.java
--
diff --git
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5863CompositePublishTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5863CompositePublishTest.java
new file mode 100644
index 000..615f3e5
--- /dev/null
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5863CompositePublishTest.java
@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license
buildbot failure in ASF Buildbot on activemq-site-production
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/10220 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
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5864 - fix and test. A replayed update command did not check if already updated
Repository: activemq
Updated Branches:
refs/heads/master b6fea8312 - 2c53dbcc6
https://issues.apache.org/jira/browse/AMQ-5864 - fix and test. A replayed
update command did not check if already updated
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2c53dbcc
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2c53dbcc
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2c53dbcc
Branch: refs/heads/master
Commit: 2c53dbcc634920b42ab19a02a183219e58f1ecac
Parents: b6fea83
Author: gtully gary.tu...@gmail.com
Authored: Thu Jun 25 15:53:45 2015 +0100
Committer: gtully gary.tu...@gmail.com
Committed: Thu Jun 25 15:53:45 2015 +0100
--
.../activemq/store/kahadb/MessageDatabase.java | 11 +-
.../activemq/broker/RedeliveryRecoveryTest.java | 139 +++
2 files changed, 147 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq/blob/2c53dbcc/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
--
diff --git
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index e86bed0..0ff203c 100644
---
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -1320,8 +1320,12 @@ public abstract class MessageDatabase extends
ServiceSupport implements BrokerSe
}
metadata.lastUpdate = location;
} else {
-// If the message ID is indexed, then the broker asked us to
store a duplicate before the message was dispatched and acked, we ignore this
add attempt
-LOG.warn(Duplicate message add attempt rejected. Destination:
{}://{}, Message id: {}, command.getDestination().getType(),
command.getDestination().getName(), command.getMessageId());
+
+MessageKeys messageKeys = sd.orderIndex.get(tx, previous);
+if (messageKeys != null
messageKeys.location.compareTo(location) 0) {
+// If the message ID is indexed, then the broker asked us
to store a duplicate before the message was dispatched and acked, we ignore
this add attempt
+LOG.warn(Duplicate message add attempt rejected.
Destination: {}://{}, Message id: {}, command.getDestination().getType(),
command.getDestination().getName(), command.getMessageId());
+}
sd.messageIdIndex.put(tx, command.getMessageId(), previous);
sd.locationIndex.remove(tx, location);
id = -1;
@@ -1365,7 +1369,8 @@ public abstract class MessageDatabase extends
ServiceSupport implements BrokerSe
new MessageKeys(command.getMessageId(), location)
);
sd.locationIndex.put(tx, location, id);
-if(previousKeys != null) {
+// on first update previous is original location, on
recovery/replay it may be the updated location
+if(previousKeys != null
!previousKeys.location.equals(location)) {
sd.locationIndex.remove(tx, previousKeys.location);
}
metadata.lastUpdate = location;
http://git-wip-us.apache.org/repos/asf/activemq/blob/2c53dbcc/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java
--
diff --git
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java
new file mode 100644
index 000..7a59c06
--- /dev/null
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/RedeliveryRecoveryTest.java
@@ -0,0 +1,139 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under
Jenkins build is back to normal : ActiveMQ-Java8 » ActiveMQ :: Unit Tests #396
See https://builds.apache.org/job/ActiveMQ-Java8/org.apache.activemq$activemq-unit-tests/396/changes
Jenkins build is unstable: ActiveMQ-Java8 #396
See https://builds.apache.org/job/ActiveMQ-Java8/396/changes
Jenkins build is unstable: ActiveMQ-Java8 » ActiveMQ :: Web Demo #396
See https://builds.apache.org/job/ActiveMQ-Java8/org.apache.activemq$activemq-web-demo/396/
Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: LevelDB Store #396
See https://builds.apache.org/job/ActiveMQ-Java8/org.apache.activemq$activemq-leveldb-store/396/
[1/2] activemq-artemis git commit: [ARTEMIS-144] adding Browse and a few other improvements
Repository: activemq-artemis
Updated Branches:
refs/heads/master e332eedad - ab00b7c57
[ARTEMIS-144] adding Browse and a few other improvements
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/aa4a0632
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/aa4a0632
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/aa4a0632
Branch: refs/heads/master
Commit: aa4a06329f91b37e64df6ffb40ca9bf891bf38f0
Parents: e332eed
Author: Clebert Suconic clebertsuco...@apache.org
Authored: Thu Jun 25 10:22:58 2015 -0400
Committer: Clebert Suconic clebertsuco...@apache.org
Committed: Thu Jun 25 15:02:05 2015 -0400
--
.../apache/activemq/artemis/cli/Artemis.java| 80 +++---
.../activemq/artemis/cli/commands/Action.java | 9 ++
.../artemis/cli/commands/ActionAbstract.java| 78 ++
.../activemq/artemis/cli/commands/Browse.java | 84 +++
.../artemis/cli/commands/Configurable.java | 40 +
.../activemq/artemis/cli/commands/Consumer.java | 14 +-
.../activemq/artemis/cli/commands/Create.java | 7 +-
.../artemis/cli/commands/DestAbstract.java | 3 -
.../artemis/cli/commands/HelpAction.java| 25
.../activemq/artemis/cli/commands/Producer.java | 9 +-
.../artemis/cli/commands/tools/HelpData.java| 25
.../cli/commands/tools/XmlDataImporter.java | 4 +-
.../cli/commands/util/ConsumerThread.java | 146 ++-
.../activemq/artemis/test/ArtemisTest.java | 49 ++-
.../artemis/jms/client/ActiveMQMessage.java | 18 +--
.../artemis/core/config/Configuration.java | 4 +-
.../core/config/impl/ConfigurationImpl.java | 6 +-
.../integration/journal/RelativePathTest.java | 4 +-
18 files changed, 505 insertions(+), 100 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/aa4a0632/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
--
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
index 636d729..1f4710e 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
@@ -16,12 +16,14 @@
*/
package org.apache.activemq.artemis.cli;
+import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import io.airlift.airline.Cli;
import org.apache.activemq.artemis.cli.commands.Action;
import org.apache.activemq.artemis.cli.commands.ActionContext;
+import org.apache.activemq.artemis.cli.commands.Browse;
import org.apache.activemq.artemis.cli.commands.Consumer;
import org.apache.activemq.artemis.cli.commands.Create;
import org.apache.activemq.artemis.cli.commands.HelpAction;
@@ -39,21 +41,69 @@ import
org.apache.activemq.artemis.cli.commands.tools.XmlDataImporter;
public class Artemis
{
@SuppressWarnings(unchecked)
- public static void main(String...args) throws Exception
+ public static void main(String... args) throws Exception
{
- String instance = System.getProperty(artemis.instance);
+ try
+ {
+ execute(args);
+ }
+ catch (ConfigurationException configException)
+ {
+ System.err.println(configException.getMessage());
+ System.out.println();
+ System.out.println(Configuration should be specified as
'scheme:location'. Default configuration is
'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml');
+ }
+ catch (RuntimeException re)
+ {
+ System.err.println(re.getMessage());
+ System.out.println();
+
+ CliAction parser = builder(null).build();
+
+ parser.parse(help).execute(ActionContext.system());
+ }
+ }
+
+ public static Object execute(String... args) throws Exception
+ {
+ return execute(null, null, args);
+ }
+
+ public static Object execute(File artemisHome, File artemisInstance,
String... args) throws Exception
+ {
+ Action action = builder(artemisInstance).build().parse(args);
+ action.setHomeValues(artemisHome, artemisInstance);
+
+ if (action.isVerbose())
+ {
+ System.out.print(Executing + action.getClass().getName() + );
+ for (String arg : args)
+ {
+System.out.print(arg + );
+ }
+ System.out.println();
+ System.out.println(Home:: + action.getBrokerHome() + , Instance::
+ action.getBrokerInstance());
+ }
+
+ return action.execute(ActionContext.system());
+ }
+
+ private static Cli.CliBuilderAction builder(File artemisInstance)
+ {
+ String instance =
[2/2] activemq-artemis git commit: This closes #50 Adding Browse command and other tweaks to the CLI
This closes #50 Adding Browse command and other tweaks to the CLI Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ab00b7c5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ab00b7c5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ab00b7c5 Branch: refs/heads/master Commit: ab00b7c5739c736680a381562f1e1c12de7ede79 Parents: e332eed aa4a063 Author: Clebert Suconic clebertsuco...@apache.org Authored: Thu Jun 25 15:02:51 2015 -0400 Committer: Clebert Suconic clebertsuco...@apache.org Committed: Thu Jun 25 15:02:51 2015 -0400 -- .../apache/activemq/artemis/cli/Artemis.java| 80 +++--- .../activemq/artemis/cli/commands/Action.java | 9 ++ .../artemis/cli/commands/ActionAbstract.java| 78 ++ .../activemq/artemis/cli/commands/Browse.java | 84 +++ .../artemis/cli/commands/Configurable.java | 40 + .../activemq/artemis/cli/commands/Consumer.java | 14 +- .../activemq/artemis/cli/commands/Create.java | 7 +- .../artemis/cli/commands/DestAbstract.java | 3 - .../artemis/cli/commands/HelpAction.java| 25 .../activemq/artemis/cli/commands/Producer.java | 9 +- .../artemis/cli/commands/tools/HelpData.java| 25 .../cli/commands/tools/XmlDataImporter.java | 4 +- .../cli/commands/util/ConsumerThread.java | 146 ++- .../activemq/artemis/test/ArtemisTest.java | 49 ++- .../artemis/jms/client/ActiveMQMessage.java | 18 +-- .../artemis/core/config/Configuration.java | 4 +- .../core/config/impl/ConfigurationImpl.java | 6 +- .../integration/journal/RelativePathTest.java | 4 +- 18 files changed, 505 insertions(+), 100 deletions(-) --
buildbot success in ASF Buildbot on activemq-site-production
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/10221 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
