9052 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon)
24a9fa79f4 https://issues.apache.org/jira/browse/AMQ-6129
fixing typo

(cherry picked from commit 7b7e362465d05ad42b3d6a6c8211097dd2053c2a)
2016-01-15 15:13:26 +00:00
Christopher L. Shannon (cshannon)
087e5da254 https://issues.apache.org/jira/browse/AMQ-6129
Adding NetworkBridgeStatistics and also a received count for bridges
when they are in duplex mode.

(cherry picked from commit 10c998b0bc9728276a738ed24d20c6fc82c6365a)
2016-01-15 14:58:30 +00:00
Timothy Bish
1d9fdbcbea https://issues.apache.org/jira/browse/AMQ-6108
Ensure that executor threads are created as daemon threads, fix a
try/finaly block, clean up some warnings.
(cherry picked from commit 5adbafef3b9ec05de7186caa9112f3639c7a6253)
2016-01-14 16:47:59 -05:00
gtully
741ee01e11 https://issues.apache.org/jira/browse/AMQ-6124 - fix and test - propagate broker info from prestarted backup transport
(cherry picked from commit db1506a5921f70134c3b647cec51204f0e1c1416)
2016-01-14 15:57:55 +00:00
Altaflux
aa8b64420b Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
(cherry picked from commit 6b1e87410da4a2033c286fcaa758371e48da62ec)
2016-01-14 15:57:41 +00:00
Timothy Bish
543851ba54 https://issues.apache.org/jira/browse/AMQ-6126
Add more configuration options to TaskRunnerFactory
(cherry picked from commit ebcc1b4eae194553e2e9764d9e0c337e0efc320f)
2016-01-14 10:43:56 -05:00
Timothy Bish
b32be1bb11 https://issues.apache.org/jira/browse/AMQ-6125
Ensure that the redelivery policy is never null in the consumer.
(cherry picked from commit 92870553389ef288d81c4ad670463c4fb1002c69)
2016-01-13 18:09:54 -05:00
Timothy Bish
b04cfeb8af https://issues.apache.org/jira/browse/AMQ-6059
Ensure that a message sent to the store for the DLQ is rewritten so that
its updated values are written to prevent exirpation loops and loss of
reollback cause etc.
(cherry picked from commit 505a76a8bb7180debbd36637dce1b9101150d0b4)
2016-01-12 12:00:41 -05:00
Timothy Bish
b4405bed5e AMQ-6121
AMQ-6122

Prevent messages on DLQ for looping back onto the same DLQ.  Prevents
expired messages from bouncing back and duplicate messages from the
store from causing a deadlock.
(cherry picked from commit 66cfc7bab3dfa2e079bbc5276312c97ab02cae4f)
2016-01-12 12:00:26 -05:00
Claus Ibsen
a558f8d4f1 Polished 2016-01-11 13:35:32 +01:00
Christopher L. Shannon (cshannon)
2f062488c3 https://issues.apache.org/jira/browse/AMQ-6112
Fixing file permissions in assembly tar.  Some permissions were not
being set explicitly which means the value used could change depending
on where the assembly was built. Permissions are now being set to fix
this.

(cherry picked from commit 43d493e527ccd7d940858646d37819d3bda0a806)
2016-01-07 15:39:14 +00:00
gtully
26665fa1b9 https://issues.apache.org/jira/browse/AMQ-6094 - regression via https://issues.apache.org/jira/browse/AMQ-6014 - incorrect ref count on message expiry event during cursor move for dispatch. Fix and test - thanks for the test
(cherry picked from commit e3df09b9db09d6cf2834b0beb901c253be9b6120)
2016-01-05 14:33:43 +00:00
Christopher L. Shannon (cshannon)
63f045e5c9 https://issues.apache.org/jira/browse/AMQ-6109
The chooseValue method in DestinationMap will now always return the
exact match, if there is one, else it will then sort as before.

(cherry picked from commit 8e2176d93c95d847c813f54d54aaf9bafba4d5c4)
2015-12-29 12:46:59 +00:00
Christopher L. Shannon (cshannon)
bf3c5e7873 https://issues.apache.org/jira/browse/AMQ-6104
Updating to Spring framework 4.1.9.RELEASE

(cherry picked from commit 35627d9d68128b7df62e4ed6f82aa5ef748bcfee)
2015-12-22 15:49:02 +00:00
Christopher L. Shannon (cshannon)
a73ada0629 https://issues.apache.org/jira/browse/AMQ-6097
Fixing JournalCorruptionEofIndexRecoveryTest class

Because of the size being stored in the message order index, the test
testRecoveryAftercorruptionCheckSumExistingIndex was no longer passing
as that test was corrupting the size value in the journal, but not the
size value in the index.  The test now corrupts both values so that the
expect exception occurs again.

(cherry picked from commit 507d40a79f15449ba6d79ef85d7fdf6bf50a3a65)
2015-12-22 13:14:44 +00:00
Christopher L. Shannon (cshannon)
b103932ccd https://issues.apache.org/jira/browse/AMQ-6097
remove un-needed import statements

(cherry picked from commit 370b1810995c48129521d1c86d7b0a31d1d966d9)
2015-12-22 13:14:44 +00:00
Christopher L. Shannon (cshannon)
51aa70eaae https://issues.apache.org/jira/browse/AMQ-6097
Fixing KahaDB so that the correct marshaller is used for the message
keys inside of the message order index.  This will ensure that message
size metrics are accurate.

(cherry picked from commit 246ccb8e04515c6e85544b32035537f60d92b5b9)
2015-12-22 13:14:44 +00:00
Timothy Bish
871f0a6005 https://issues.apache.org/jira/browse/AMQ-6102
Call to the statistics instance of the subscription to reset the
counters.
(cherry picked from commit 564d55023ec7386c31277db054ecc63d966e2b29)
2015-12-21 17:04:47 -05:00
Timothy Bish
7dd2330011 https://issues.apache.org/jira/browse/AMQ-6101
Update to v0.7.0 of Qpid JMS client libraries.
(cherry picked from commit ddd2812279e2e3f9750317e0a5a35f4187af9e20)
2015-12-21 12:48:56 -05:00
Christopher L. Shannon (cshannon)
a12c21061e https://issues.apache.org/jira/browse/AMQ-6091
The JavaRuntimeConfigurationBroker can now apply a subset of policy
properties retrospectively to existing destinations versus applying
all properties of the policy update.

(cherry picked from commit a253ad3c71a07bb4d1883fe84be217af9855cfc6)
2015-12-18 18:22:19 +00:00
Timothy Bish
5c66343bc9 https://issues.apache.org/jira/browse/AMQ-6096
Update proton to latest.
(cherry picked from commit 9ee92a1e16408c2174bfe29fe1ba1308821367da)
2015-12-18 10:38:38 -05:00
Christopher L. Shannon (cshannon)
f6c242ad64 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization

(cherry picked from commit b9dcb010f74675f6369f7e74b931b670e0ecab51)
2015-12-16 14:39:27 +00:00
Christopher L. Shannon (cshannon)
be38e92753 Adding activemq-5.12.2 to spring.schemas
(cherry picked from commit 09cbfa947772ad859fab49c37a08d1eb8d7ecdaa)
2015-12-15 15:13:35 +00:00
Dejan Bosanac
9aa6bdcf6e https://issues.apache.org/jira/browse/AMQ-6077 - define default values (based on system property) for connection factory and object message
(cherry picked from commit eeec0c07b06e6121ed33e20f7c663214538d0da1)
2015-12-15 12:52:00 +00:00
Dejan Bosanac
5e02e305ea https://issues.apache.org/jira/browse/AMQ-6077 - define object message trusted packages on connection factory
(cherry picked from commit 94446e53dc348b9109dff46e92484ed9e6cc1d72)
2015-12-14 19:12:28 +00:00
Christopher L. Shannon (cshannon)
27b08b03c5 https://issues.apache.org/jira/browse/AMQ-6088
The runtime plugins will now find the exact policy to update which means
that a destination can match more than one policy and the policy can
still be updated at runtime.

The java runtime broker also supports the ability to replace or add a
policy entry based on a flag on a new method call.

(cherry picked from commit 9e7fae0d83c584f98e99024ba6d20e53f14b81f7)
2015-12-14 19:09:16 +00:00
gtully
fc4120e850 https://issues.apache.org/jira/browse/AMQ-6086 - test cannot validate all start failures scenarios at this time, suffice that start and stop complete ok
(cherry picked from commit b7787bf6fbbb33b5d16b34dab07de52b76044a4c)
2015-12-14 19:09:15 +00:00
gtully
b4360c6e0e https://issues.apache.org/jira/browse/AMQ-6086 - avoid logging npe on attempted start of persistence adapter post stop
(cherry picked from commit 455a628305dc49476d7033701901d119db3fffdb)
2015-12-14 19:09:15 +00:00
gtully
2ffd7498a8 https://issues.apache.org/jira/browse/AMQ-6086 - start exception can prevent stop from exiting fully, need to be more selective in creation on stop.
(cherry picked from commit 35df815fb86d201e63b4f0f2d53bee3bae5c0752)
2015-12-14 19:09:15 +00:00
Dejan Bosanac
f3aedc753c https://issues.apache.org/jira/browse/AMQ-6077 - test
(cherry picked from commit 7951037f20e8d6752ab0bbd90189a8276bc61a55)
2015-12-14 19:09:14 +00:00
gtully
f8488916c2 revert sync ack send for https://issues.apache.org/jira/browse/AMQ-3519 due to rework in https://issues.apache.org/jira/browse/AMQ-5068 - sync send no longer needed because redelivered flag is persisted before dispatch. This avoids a roundtrip overhead on individual ack, ie priority or nonBlockingRedelivery options in the mix
(cherry picked from commit c78eddce7ed3045b5508dd6713252dca8766436c)
2015-12-11 17:34:35 +00:00
gtully
e5b86116c4 https://issues.apache.org/jira/browse/AMQ-6086 - add some determinism to interleaved stop and start calls on broker service
(cherry picked from commit da076f4a632af6ad1d66382523f4c50e9de9e62e)
2015-12-11 17:32:06 +00:00
gtully
aa2a85abe5 https://issues.apache.org/jira/browse/AMQ-6070 - rework regression - KahaDBStoreRecoveryExpiryTest had NPE in the logs, region dest not set on recovery listener for expiry case
(cherry picked from commit 93092f7ea0e231cd7d615f8ee6420c9b73a5367f)
2015-12-11 17:31:32 +00:00
gtully
9c82756ca9 https://issues.apache.org/jira/browse/AMQ-6083 - resolve some test regressions - AMQ2149Test - fail to start with missing data file. Ensure ack map is always saved on modification
(cherry picked from commit 31d99b6aa92aed27acfd90a4d2a278c077a47a33)
2015-12-11 09:53:22 -05:00
gtully
724a0e85f3 https://issues.apache.org/jira/browse/AMQ-6083 - ignore test scenario on leveldb store
(cherry picked from commit 8609f74db329d97eac054cca2d1dd188c2960ddd)
2015-12-11 12:34:36 +00:00
gtully
9e8f020301 https://issues.apache.org/jira/browse/AMQ-6005 - have plist whack it existing state on start. Start the temp store after the primary persistence adapter which does the locking
(cherry picked from commit 768fa17085ac938441915a82987c99b37ac52515)
2015-12-10 09:46:17 -05:00
gtully
2be754583c https://issues.apache.org/jira/browse/AMQ-6084 - add broker.adjustUsageLimits to disable the adjustment of limits to what is available. In this way, a broker will fail to start if constrained, ensuring it won't accept connections and block pending resources if it has earlier exited for that reason
(cherry picked from commit d7febddb6789171ccfd22faf0ee4f00f3e9c9490)
2015-12-10 09:46:03 -05:00
gtully
99fce5bae9 https://issues.apache.org/jira/browse/AMQ-6083 - ignoreMissingJournalfiles false - check for missing acks and corruption anywhere and error out so that corruption does not go unnoticed - fix and test
(cherry picked from commit 5db5f3e39a682640b64bc904f30cbd2e0e3de4da)
2015-12-09 09:20:48 -05:00
gtully
0952866273 with failover the reported exception may be wrapped by the failover listener
(cherry picked from commit 9c4ef26d5ca27fb789e88980112598a31d178a4f)
2015-12-09 09:20:36 -05:00
Christopher L. Shannon (cshannon)
785041d20f https://issues.apache.org/jira/browse/AMQ-6082
Propertly re-setting the storeOpenWireVersion from the BrokerService
on the KahaDB Metadata if a corrupted index is detected and the
Metadata has to be recreated.

(cherry picked from commit 7a7c70ad7524594339c4388b897fa1eac6988928)
2015-12-08 20:13:33 +00:00
gtully
c67590104b https://issues.apache.org/jira/browse/AMQ-5454 https://issues.apache.org/jira/browse/AMQ-6070 - in the case of duplicates from the store the regiondestination was not set
(cherry picked from commit 88ec9dad9dc47790a3fc4e0f5ad939ea5530dad7)
2015-12-08 09:51:37 -05:00
gtully
558dcc0479 https://issues.apache.org/jira/browse/AMQ-6070 - rework for virtual topic case, use the destination from the transient region destination rather than the message, such that consumer queue advisories work for delivered etc
(cherry picked from commit 179dc3acb28a8a7fc3c1eddf6c6ac54fe49836a5)
2015-12-08 09:51:23 -05:00
Christopher L. Shannon (cshannon)
1ebfa9ade2 https://issues.apache.org/jira/browse/AMQ-6080
fixing typos

(cherry picked from commit 5772e7bed88198f57fabb08c2f48a1de68dea72c)
2015-12-08 13:19:31 +00:00
Timothy Bish
6e2252d083 https://issues.apache.org/jira/browse/AMQ-6074
Make the transportConnector configs consistent across all four variants
by removing the enableCipherSuites option on openwire NIO+SSL.  RC4 was
enabled on the broker side but in later JDK releases that suite is
disbaled as it is insecure so the client side couldn't find a supported
suite.
(cherry picked from commit 315147c5ef3d545a868c74fe55d8ea7efb09f1d1)
2015-12-07 12:28:54 -05:00
Christopher L. Shannon (cshannon)
a4845253d0 https://issues.apache.org/jira/browse/AMQ-6073
WSServlet for websockets will attempt to detect the subprotocol
requested and respond with the appropriate one.  Currently the protocols
loaded are what stomp.js use for stomp (v11.stomp and v12.stomp).
If a protocol can't be found then a default will be returned, either
"stomp" or "mqtt", which is the same behavior before this patch.

This will make it a bit easier to use stomp over websockets out of the
box as stomp.js will work by default.

(cherry picked from commit 913f64476b66c452fa03cb4fb8c09d831825bca5)
2015-12-07 15:33:36 +00:00
Torsten Mielke
11ebaccd64 https://issues.apache.org/jira/browse/AMQ-6071 - Log info about corrupted journal records at WARN level
(cherry picked from commit 66c348b1b85e341ed508b9c10028c037a226dfb6)
2015-12-04 15:23:57 -05:00
gtully
e1cf0d2678 https://issues.apache.org/jira/browse/AMQ-6070 - set correct originalDestination property value in advisories
(cherry picked from commit 75ff17af414b98dbdd891f66b9425692ca799fcc)
2015-12-03 09:00:27 -05:00
Christopher L. Shannon (cshannon)
819e512138 https://issues.apache.org/jira/browse/AMQ-6062
Updated QueueBrowserSubscription to use a ConcurrentMap to avoid a
potential race condition when multiple queue browsers browse
multiple queues.

(cherry picked from commit d346a765e3064a951c5d55119b80b8432a45bcb6)
2015-12-02 15:53:59 +00:00
Christopher L. Shannon (cshannon)
db87a051ca https://issues.apache.org/jira/browse/AMQ-6069
Fixed contains method in PrioritizedPendinList which was not returning
correctly.  This was causing messages to not be removed from the
dispatchPendingList when purge was called inside a Queue leading to an
eventual OOM error if enough messages were purged. This fix also
improves performance of the contains method.

(cherry picked from commit 8363c99b51a98eb176e6baea82fcafce3225ba2c)
2015-12-02 13:42:42 +00:00
Christopher L. Shannon (cshannon)
95fc593975 Update version for next patch release iteration. 2015-11-30 14:35:26 +00:00