This is an automated email from the ASF dual-hosted git repository.
yukon pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from c0b8735 [ROCKETMQ-226]Remove the code that is not useful in the loop
(#121)
add 8458308 Polish merge script, use old title if input is null
add 254d432 [ROCKETMQ-284] ExpressionMessageFilter will pass some message.
add 6a97d28 [ROCKETMQ-281] Add check policy for preventing repeat start mq
add 368e7c8 [ROCKETMQ-265] fix consume queue's data maybe repeat bug
add 27a678d [ROCKETMQ-273] return an expression when a function has no
write operations.
add 5ac45fc [ROCKETMQ-285] file test error when make link
add c7def6f [ROCKETMQ-255] Fix offsetStore being null after consumers
start()
add e8900a8 TLP clean up, merge branch 'master' into develop
add bfa7f1a Update RouteInfoManager.java
add 9422bdb correct spelling mistake
add 7b256eb Fix typo
add d20cdd8 Fixed : code style
add eabe47f Fixed:code style
add dc4f368 Merge pull request #108 from
aCoder2013/feature/correct-spelling-mistake
add 1bbd4cd [ROCKETMQ-291] Fix System.out.printf throws
UnknownFormatConversionException
add a1764ab [ROCKETMQ-28] Encrypt transmission layer closes
apache/rocketmq#118
add 4365373 Fixed typo
add bbd27c1 Merge pull request #179 from fucongchan/fixed_typo
add 0b80f80 [ROCKETMQ-294] Do flow control on the number and size
dimensions when pull message
add 61aaf51 [ROCKETMQ-28] Fix description of SslMode unmatched problem
add 1a88fe0 [ROCKETMQ-28] Disable ssl mdoe by default
add cba3089 [ROCKETMQ-307] Polish the JVM parameters in start scriptes
add 4926187 Compress on rolling
add 5a2e710 [ROCKETMQ-315] Enhance TLS default settings
add 81884c8 [ROCKETMQ-312] Use independent thread pool for
QueryMessageProcessor
add e1a42e4 Fix random int bug in SelectMessageQueueByRandom
add 8c30310 [ROCKETMQ-292] Delete system.exit in MQAdminStartup
add 37cf2a7 [ROCKETMQ-324] Expose an interface for client to specify the
async call back executor
add 09fb8b5 Merge pull request #201 from zhouxinyu/ROCKETMQ-324
add 6c5a950 [ROCKETMQ-323] Release semaphore after callback being
finished for async invoke
add cbe5197 Merge pull request #200 from zhouxinyu/ROCKETMQ-323
add 461ddde Merge remote-tracking branch 'apache/master'
add 6f0c996 Merge remote-tracking branch 'apache/develop'
add 6f5e01e #ROCKETMQ-314# msg send back must sync change process queue
msg size .
add 6b408ec Merge pull request #196 from fuyou001/ROCKETMQ-314-1
add f18dc03 [ROCKETMQ-270] Move flush position forward to first
MappedFile whose start offset is non-zero.
add 3cb4bdb Merge pull request #189 from zhouxinyu/ROCKETMQ-270
add c94fc4f [ROCKETMQ-311] Add a swith for broker fast failure and
support pull request queue
add 56b0983 Merge pull request #191 from zhouxinyu/ROCKETMQ-311
add 390f735 [ROCKETMQ-321] Fix deleting files in the middle (#198)
add 947526b [ROCKETMQ-266] Add a specific Exception message for comparing
consumerThreadMax and consumerThreadMin (#147)
add 96b74a3 [ROCKETMQ-315][ROCKETMQ-327] Enhance TLS feature (#202)
add 5459215 [ROCKETMQ-308] Increasing name server component network
socket buffer size (#199)
add c674137 [ROCKETMQ-320]Message loss when shutdown with dispatch behind
(#197)
add 43730b7 [ROCKETMQ-96]Rename some temp variable and field closes
apache/rocketmq#60
new a79c66a Merge branch 'master' into develop
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/rocketmq/broker/BrokerController.java | 29 +-
.../org/apache/rocketmq/broker/BrokerStartup.java | 11 +-
.../broker/filter/ExpressionMessageFilter.java | 2 +-
.../rocketmq/broker/latency/BrokerFastFailure.java | 27 +-
.../broker/processor/AdminBrokerProcessor.java | 6 +
.../apache/rocketmq/broker/BrokerStartupTest.java | 3 +-
.../broker/filter/MessageStoreWithFilterTest.java | 85 +++---
.../broker/latency/BrokerFastFailureTest.java | 65 +++++
client/pom.xml | 6 +
.../org/apache/rocketmq/client/ClientConfig.java | 15 +-
.../client/consumer/DefaultMQPushConsumer.java | 58 +++-
.../ConsumeMessageConcurrentlyService.java | 2 +-
.../consumer/ConsumeMessageOrderlyService.java | 2 +-
.../impl/consumer/DefaultMQPullConsumerImpl.java | 1 +
.../impl/consumer/DefaultMQPushConsumerImpl.java | 70 ++++-
.../client/impl/consumer/ProcessQueue.java | 44 ++-
.../client/impl/consumer/RebalancePushImpl.java | 20 ++
.../client/impl/factory/MQClientInstance.java | 1 +
.../impl/producer/DefaultMQProducerImpl.java | 10 +-
.../client/producer/DefaultMQProducer.java | 12 +
...andoom.java => SelectMessageQueueByRandom.java} | 9 +-
.../client/consumer/DefaultMQPullConsumerTest.java | 6 +
.../client/consumer/DefaultMQPushConsumerTest.java | 61 +++++
.../consumer/DefaultMQPushConsumerImplTest.java | 36 ++-
.../client/impl/consumer/ProcessQueueTest.java | 107 ++++++++
.../impl/consumer/RebalancePushImplTest.java | 163 +++++++++++
.../client/producer/DefaultMQProducerTest.java | 19 ++
.../org/apache/rocketmq/common/BrokerConfig.java | 37 +++
.../common/protocol/body/ProcessQueueInfo.java | 15 +-
distribution/bin/os.sh | 2 +-
distribution/bin/runbroker.cmd | 2 +-
distribution/bin/runbroker.sh | 4 +-
distribution/bin/runserver.cmd | 4 +-
distribution/bin/runserver.sh | 6 +-
distribution/conf/logback_broker.xml | 72 ++---
distribution/conf/logback_filtersrv.xml | 12 +-
distribution/conf/logback_namesrv.xml | 6 +-
distribution/conf/logback_tools.xml | 9 +-
.../rocketmq/example/broadcast/PushConsumer.java | 2 +-
.../apache/rocketmq/example/filter/Consumer.java | 2 +-
.../rocketmq/example/filter/SqlConsumer.java | 2 +-
.../rocketmq/example/ordermessage/Consumer.java | 2 +-
.../rocketmq/example/quickstart/Consumer.java | 2 +-
.../rocketmq/example/simple/PullConsumer.java | 2 +-
.../rocketmq/example/simple/PushConsumer.java | 2 +-
.../transaction/TransactionCheckListenerImpl.java | 2 +-
.../rocketmq/filtersrv/FiltersrvStartup.java | 5 +-
.../apache/rocketmq/namesrv/NamesrvStartup.java | 12 +-
.../namesrv/routeinfo/RouteInfoManager.java | 4 +-
pom.xml | 2 +-
remoting/pom.xml | 17 ++
.../apache/rocketmq/remoting/RemotingClient.java | 16 +-
.../apache/rocketmq/remoting/common/TlsMode.java | 53 ++++
.../rocketmq/remoting/netty/FileRegionEncoder.java | 78 ++++++
.../rocketmq/remoting/netty/NettyClientConfig.java | 10 +
.../remoting/netty/NettyRemotingAbstract.java | 14 +-
.../remoting/netty/NettyRemotingClient.java | 53 +++-
.../remoting/netty/NettyRemotingServer.java | 102 ++++++-
.../rocketmq/remoting/netty/NettySystemConfig.java | 8 +-
.../apache/rocketmq/remoting/netty/TlsHelper.java | 234 ++++++++++++++++
.../rocketmq/remoting/netty/TlsSystemConfig.java | 125 +++++++++
.../rocketmq/remoting/RemotingServerTest.java | 7 +-
.../java/org/apache/rocketmq/remoting/TlsTest.java | 298 +++++++++++++++++++++
.../remoting/netty/FileRegionEncoderTest.java | 80 ++++++
.../remoting/netty/NettyRemotingAbstractTest.java | 93 +++++++
.../remoting/netty/NettyRemotingClientTest.java | 43 +++
remoting/src/test/resources/certs/badClient.key | 17 ++
remoting/src/test/resources/certs/badClient.pem | 18 ++
remoting/src/test/resources/certs/badServer.key | 16 ++
remoting/src/test/resources/certs/badServer.pem | 18 ++
remoting/src/test/resources/certs/ca.pem | 23 ++
remoting/src/test/resources/certs/client.key | 17 ++
remoting/src/test/resources/certs/client.pem | 18 ++
remoting/src/test/resources/certs/privkey.pem | 30 +++
remoting/src/test/resources/certs/server.key | 16 ++
remoting/src/test/resources/certs/server.pem | 18 ++
.../java/org/apache/rocketmq/store/CommitLog.java | 14 +-
.../org/apache/rocketmq/store/ConsumeQueue.java | 11 +-
.../org/apache/rocketmq/store/ConsumeQueueExt.java | 2 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 45 +++-
.../java/org/apache/rocketmq/store/MappedFile.java | 5 +
.../org/apache/rocketmq/store/MappedFileQueue.java | 7 +-
.../apache/rocketmq/store/PutMessageSpinLock.java | 2 +-
.../store/config/StorePathConfigHelper.java | 4 +
.../apache/rocketmq/store/ConsumeQueueTest.java | 74 ++++-
.../store/DefaultMessageStoreShuwDownTest.java | 76 ++++++
.../rocketmq/store/DefaultMessageStoreTest.java | 28 +-
.../apache/rocketmq/store/MappedFileQueueTest.java | 53 +++-
.../test/client/rmq/RMQNormalConsumer.java | 9 +-
.../test/client/rmq/RMQNormalProducer.java | 26 +-
.../test/clientinterface/AbstractMQConsumer.java | 4 +-
.../rocketmq/test/clientinterface/MQConsumer.java | 2 +
.../rocketmq/test/factory/ConsumerFactory.java | 12 +-
...MQNormalListner.java => RMQNormalListener.java} | 14 +-
.../org/apache/rocketmq/test/base/BaseConf.java | 28 +-
.../balance/NormalMsgDynamicBalanceIT.java | 14 +-
.../consumer/balance/NormalMsgStaticBalanceIT.java | 16 +-
.../normal/BroadCastNormalMsgNotRecvIT.java | 8 +-
.../normal/BroadCastNormalMsgRecvCrashIT.java | 8 +-
.../normal/BroadCastNormalMsgRecvFailIT.java | 8 +-
.../normal/BroadCastNormalMsgRecvStartLaterIT.java | 8 +-
.../BroadCastNormalMsgTwoDiffGroupRecvIT.java | 8 +-
.../normal/NormalMsgTwoSameGroupConsumerIT.java | 8 +-
.../broadcast/order/OrderMsgBroadCastIT.java | 2 +-
.../tag/BroadCastTwoConsumerFilterIT.java | 8 +-
.../tag/BroadCastTwoConsumerSubDiffTagIT.java | 8 +-
.../tag/BroadCastTwoConsumerSubTagIT.java | 8 +-
.../consumer/cluster/DynamicAddAndCrashIT.java | 14 +-
.../consumer/cluster/DynamicAddConsumerIT.java | 14 +-
.../consumer/cluster/DynamicCrashConsumerIT.java | 14 +-
.../test/client/consumer/filter/SqlFilterIT.java | 6 +-
.../test/client/consumer/tag/MulTagSubIT.java | 14 +-
.../consumer/tag/TagMessageWith1ConsumerIT.java | 20 +-
.../consumer/tag/TagMessageWithMulConsumerIT.java | 24 +-
.../tag/TagMessageWithSameGroupConsumerIT.java | 16 +-
.../consumer/topic/MulConsumerMulTopicIT.java | 16 +-
.../consumer/topic/OneConsumerMulTopicIT.java | 10 +-
.../producer/async/AsyncSendExceptionIT.java | 2 +-
.../async/AsyncSendWithMessageQueueIT.java | 6 +-
.../async/AsyncSendWithMessageQueueSelectorIT.java | 6 +-
.../async/AsyncSendWithOnlySendCallBackIT.java | 6 +-
.../test/client/producer/batch/BatchSendIT.java | 2 +-
.../producer/exception/msg/MessageUserPropIT.java | 8 +-
.../ProducerGroupAndInstanceNameValidityIT.java | 2 +-
.../producer/oneway/OneWaySendExceptionIT.java | 2 +-
.../test/client/producer/oneway/OneWaySendIT.java | 6 +-
.../client/producer/oneway/OneWaySendWithMQIT.java | 6 +-
.../producer/oneway/OneWaySendWithSelectorIT.java | 6 +-
.../producer/order/OrderMsgDynamicRebalanceIT.java | 2 +-
.../test/client/producer/order/OrderMsgIT.java | 2 +-
.../client/producer/order/OrderMsgRebalanceIT.java | 2 +-
.../client/producer/order/OrderMsgWithTagIT.java | 2 +-
.../producer/querymsg/QueryMsgByIdExceptionIT.java | 2 +-
.../client/producer/querymsg/QueryMsgByIdIT.java | 6 +-
.../client/producer/querymsg/QueryMsgByKeyIT.java | 2 +-
.../rocketmq/test/delay/NormalMsgDelayIT.java | 2 +-
.../test/smoke/NormalMessageSendAndRecvIT.java | 6 +-
.../java/org/apache/rocketmq/test/tls/TLS_IT.java | 60 +++++
.../org/apache/rocketmq/test/tls/TLS_Mix2_IT.java | 61 +++++
.../org/apache/rocketmq/test/tls/TLS_Mix_IT.java | 62 +++++
.../rocketmq/tools/command/MQAdminStartup.java | 7 +-
.../tools/command/broker/SendMsgStatusCommand.java | 2 +-
.../command/consumer/ConsumerStatusSubCommand.java | 2 +-
.../tools/command/consumer/ConsumerSubCommand.java | 2 +-
.../command/message/DecodeMessageIdCommond.java | 4 +-
.../command/message/PrintMessageSubCommand.java | 6 +-
.../command/message/QueryMsgByIdSubCommand.java | 4 +-
.../tools/command/topic/UpdateTopicSubCommand.java | 3 +-
148 files changed, 2973 insertions(+), 486 deletions(-)
create mode 100644
broker/src/test/java/org/apache/rocketmq/broker/latency/BrokerFastFailureTest.java
rename
client/src/main/java/org/apache/rocketmq/client/producer/selector/{SelectMessageQueueByRandoom.java
=> SelectMessageQueueByRandom.java} (85%)
copy
example/src/main/java/org/apache/rocketmq/example/broadcast/PushConsumer.java
=>
client/src/test/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImplTest.java
(65%)
create mode 100644
client/src/test/java/org/apache/rocketmq/client/impl/consumer/ProcessQueueTest.java
create mode 100644
client/src/test/java/org/apache/rocketmq/client/impl/consumer/RebalancePushImplTest.java
create mode 100644
remoting/src/main/java/org/apache/rocketmq/remoting/common/TlsMode.java
create mode 100644
remoting/src/main/java/org/apache/rocketmq/remoting/netty/FileRegionEncoder.java
create mode 100644
remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java
create mode 100644
remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsSystemConfig.java
create mode 100644
remoting/src/test/java/org/apache/rocketmq/remoting/TlsTest.java
create mode 100644
remoting/src/test/java/org/apache/rocketmq/remoting/netty/FileRegionEncoderTest.java
create mode 100644
remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java
create mode 100644
remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingClientTest.java
create mode 100644 remoting/src/test/resources/certs/badClient.key
create mode 100644 remoting/src/test/resources/certs/badClient.pem
create mode 100644 remoting/src/test/resources/certs/badServer.key
create mode 100644 remoting/src/test/resources/certs/badServer.pem
create mode 100644 remoting/src/test/resources/certs/ca.pem
create mode 100644 remoting/src/test/resources/certs/client.key
create mode 100644 remoting/src/test/resources/certs/client.pem
create mode 100644 remoting/src/test/resources/certs/privkey.pem
create mode 100644 remoting/src/test/resources/certs/server.key
create mode 100644 remoting/src/test/resources/certs/server.pem
create mode 100644
store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShuwDownTest.java
rename
test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/{RMQNormalListner.java
=> RMQNormalListener.java} (85%)
create mode 100644 test/src/test/java/org/apache/rocketmq/test/tls/TLS_IT.java
create mode 100644
test/src/test/java/org/apache/rocketmq/test/tls/TLS_Mix2_IT.java
create mode 100644
test/src/test/java/org/apache/rocketmq/test/tls/TLS_Mix_IT.java
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
