You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by hu...@apache.org on 2021/06/16 01:15:20 UTC
[rocketmq] branch master updated (aaa92a2 -> df1d93f)
This is an automated email from the ASF dual-hosted git repository.
huzongtang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from aaa92a2 Revert "docs(architecture_cn): fix incorrect description of the Producer module (#2856)" (#2928)
add f35cafe [maven-release-plugin] prepare for next development iteration
add 87dd390 Update Apache Commons dependency (#2515)
add 0239421 Remove useless netty-tcnative-boringssl-static dependencies
add 98aca7f Add a TravisCI job to build and test on ARM64 (#2539)
add 79ed2b6 [ISSUE #2588] Duplicate invoke of countdown in processReplyMessage
add 6af1259 [ISSUE #2576] update NOTICE and fix typo in license (#2600)
add 8b63761 [ISSUE #2133] Fix RMQ_SYS_TRANS_OP_HALF_TOPIC be deleted when deleting topic/group
add 0d8b282 Update concept.md
add 7fa9bef Update concept.md
add 2acb1f0 Update concept.md
add d8f88c5 Merge pull request #2609 from cui-ying/patch-1
add f8ac225 [ISSUE #2449] resetOffset simultaneously will cause each message consume more than once.
add b2223c9 Merge pull request #2640 from areyouok/fix_resetOffset
add 4cfe00d [ISSUE #2642] Remove unused imports
add ea53d44 [ISSUE #2551] fix runserver.sh error in dash env (#2630)
add e297221 [ISSUE #2622] Change variable name 'lockTreeMap' to 'treeMapLock' (#2624)
add 188541c fix classloader conflict.
add b94ef84 Merge pull request #2648 from horizonzy/fix-2647
add ccc4b6d [ISSUE #2663] Fix isSpaceFull print file path not exist log When deployed on DLedger mode
add 3a09c35 [ISSUE #2650] Make ulimit unlimited when execute ci
add 0d8a184 [ISSUE #2670]Hide Client IP when there's no `-s true` in command ConsumerProgress
add 606de99 [ISSUE #2645] Fix unit case NPE in DefaultMessageStoreShutDownTest#testDispatchBehindWhenShutdown
add 97c7770 [ISSUE #2677] Update varible name
add 40adaf7 [ISSUE #2652] change the method name to incrementAndGet
add 9eae1d6 Fix Error architecture image with error content (#2688)
add e277216 [ISSUE #2710] Delete unused parameters (#2692)
add e9b2d85 [ISSUE #1233] Fix CVE-2011-1473
add 44736c3 fix Multiple instances in the same application share MQClientInstance
add 735ecaa Merge pull request #2731 from panzhi33/develop
add 4645942 [ISSUE #2748] Fix deleteSubscriptionGroup not remove consumer offset
add 7680063 [ISSUE #2745] Changed the support time of the request/reply feature to 4.6.0.
add af8a964 [ISSUE #2729] Replace with Math.min method call
add 0ff882b [ISSUE #2801]Fix NamesrvAddr connot set in Producer
add 0f860e5 Merge pull request #2802 from zhangjidi2016/develop
add 4117d00 [ISSUE 2800] optimize: the spelling of topicSynFlag
add 1fbccd1 [ISSUE #2803] Fix the endpoint cannot get instanceId without http (#2804)
add ee5ecc1 fix messageArrivingListener NPE
add ba74c49 Merge pull request #2815 from BurningCN/fix_messageArrivingListener_npe
add 0b6bd18 [ISSUE #2811] Fix the wrong topic was consumed in the DefaultMessageStoreTest test program
add 8eb0472 Merge pull request #2824 from BurningCN/fix_test_consume_wrong_topic
add 0720f0e [ISSUE #2538]Optimize log output when message trace saving fails
add 7ee2cd3 Merge pull request #2822 from zhangjidi2016/develop
add b4cee1b [ISSUE #2821] Overriding the ServiceThread#shutdown in HAClient class
add bc4ecb3 [ISSUE #2805] remove redundant package imports
add c3d4641 [ISSUE #2833] Support trace for TranscationProducer (#2834)
add f77d7fe [ISSUE #2732] Fix message loss problem when rebalance with LitePullConsumer (#2832)
add 337791a [ISSUE #2846]fix -E might not port to other systems
add 061c51f Merge pull request #2848 from panzhi33/develop
add e14f66e fix some nonconformity after checkstyle
add fb0d019 Merge pull request #2851 from drgnchan/develop
add f2a5a74 Support OpenTracing(#2861)
add 51439cc [ISSUE #2872] remove log files created by integration test when mvn clean
add b6379cd Merge pull request #2874 from ayanamist/clean-test-files
add 5a06651 [ISSUE #2872] move log files created by integration test to target dir
add fe78d18 Merge pull request #2877 from ayanamist/clean-test-files
add 541c35d Change log level to debug: "Half offset {} has been committed/rolled back"
add be6eaf8 Merge pull request #2884 from areyouok/dev_speed_A
add d26f507 [ISSUE #2898] Resolve rocketmq-example project failed during checkstyle execution (#2899)
add 1350c3f Fix unit test stability
add 5d21257 Merge pull request #2903 from ayanamist/fix-test
add f5cf3cc Fix ORIGIN_MESSAGE_ID field not write into commitlog (#2869)
add 6c279f3 docs(fix typo)
add 8a2554d [ISSUE #2826] Remove useless code (#2827)
add 662404e [ISSUE #1057]Filter out docker0 when finding a local address (#1177)
add 18dadeb Add unit tests for org.apache.rocketmq.common.UtilAll (#1249)
add f37dc18 Fix some code style issue and remove redundant code (#1378)
add 305b195 fix(script): windows can not startup when acl enable(#1393)
add f799f17 Revert "Add unit tests for org.apache.rocketmq.common.UtilAll (#1249)"
add 8e9fa51 Merge pull request #2913 from apache/revert-1249-add-diffblue-tests
add 432236e Revert 2912 & 2866 and merge to develop branch(#2915)
add b34e68a Fix ConcurrentModificationException
add 85ab220 Fix concurrent issue of test of tracer of OpenTracing
add 0aaaeb6 DefaultMQPushConsumerTest/DefaultMQConsumerWithOpenTracingTest mock everything before start
add b0a8959 Merge pull request #2917 from ayanamist/fix-test
add 908782f [ISSUE #2921]Fix consume msgtrace loss (#2922)
add 4e73ba0 docs(example): change delay start point (#2586)
add 088dd29 update fastjson version from 1.2.69 to 1.2.76
add 4d1b9cf Merge pull request #2923 from nibiwodong/develop
add 11703c3 [ISSUE #2698] TopicRouteSubCommand enhancement
add 48d36bd [ISSUE #2698] TopicRouteSubCommand enhancement
add 40d4a22 [ISSUE #2698] TopicRouteSubCommand enhancement
add 6323754 [ISSUE #2698] TopicRouteSubCommand enhancement
add d444dd2 [ISSUE #2698] TopicRouteSubCommand enhancement
add a0dbca7 Merge pull request #2712 from lizhimins/update_topicRouteSubCommand
add 32881d4 add the property of benchmark producer that specifies how many messages to send
add 2d18e50 Print InterruptedException message
add 1c75d02 Merge pull request #2617 from xxd763795151/bench_producer_num
add 7006d3a benchmark consumer isSuffixEnable default value set [false] and update help info
add 58cbf59 recover the property key of group suffix enable
add 88add9d Merge pull request #2608 from xxd763795151/bench_consumer
add 9eca70f Add delay message stats to brokerStatsManager
add d510dd7 Add constuctor of default
add a8606d4 Add check to avoid npe
add 19fb42f Add config enableScheduleMessageStats
add 5f9f75a0 Add UT
add 3e1d501 Merge pull request #2684 from maixiaohai/add_delay_message_stats_to_stats_manager
add 5829fbd #2935 check kv config should not be null
add 0430860 Merge pull request #2936 from yuz10/develop3
add 85168cd fix the problem of potential NPE in ACL plain
add 7b7e45b fix the problem of potential NPE in ACL plain
add b219c16 fix the problem of potential NPE in ACL plain
add 4f48fb7 gerge branch 'develop' of https://github.com/shendongsd/rocketmq into develop
add 7804c74 Merge branch 'develop' of https://github.com/shendongsd/rocketmq into develop
add 7af4307 Merge branch 'develop' of https://github.com/shendongsd/rocketmq into develop
add 99b69ab Merge branch 'develop' of https://github.com/shendongsd/rocketmq into develop
add cd183b8 Merge branch 'develop' of https://github.com/shendongsd/rocketmq into develop
add e320775 Merge branch 'develop' of https://github.com/shendongsd/rocketmq into develop
add d21f4d3 Merge pull request #2893 from shendongsd/develop
add 3401ba5 [ACL] Parameter verification
add 7848895 Merge branch 'develop' into enhanced_acl
add 59718fd Merge pull request #2418 from Git-Yang/enhanced_acl
add b78326d [ISSUE #2783] fix_bug_in_ThreadLocalIndex
add 2fb5f7a Merge pull request #2785 from Kingdon1992/fix_bug_in_ThreadLocalIndex
add 952772f fix(dledger): reload the delay offset when master changed (#2518)
add 7a6edb7 [ISSUE #2926] fix fast-try.sh fail to run in ubuntu (#2927)
add 99b42f2 [ISSUE #2735] QueryMsgByUniqueKey tool should return all messages with same unique key
add 672f581 [ISSUE #2735] QueryMsgByUniqueKey tool should return all messages with same unique key
add c34796b [ISSUE #2735] QueryMsgByUniqueKey tool should return all messages with same unique key
add 4daf0ee Merge pull request #2943 from lizhimins/develop
add 6ab6afd [ISSUE #2708] Client may submit wrong offset when network instability
add da589b1 [ISSUE #2708] Client may submit wrong offset when network instability
add 707d1b8 [ISSUE #2708] Client may submit wrong offset when network instability, add more log
add 4f7e831 [ISSUE #2708] Fix unit test
add 96a4e55 [ISSUE #2708] Fix unit test
add da286a4 [ISSUE #2708] Fix unit test
add 436d72b [ISSUE #2708] Fix unit test
add 9f90a23 [ISSUE #2708] Fix unit test
add 715a614 [ISSUE #2708] Fix unit test
add fb34b64 [ISSUE #2708] Reformat
add c3750b3 [ISSUE #2708] Reformat
add cca4d92 Merge pull request #2948 from lizhimins/fix-offset
add fbb35d3 [ISSUE #2898] Resolve rocketmq-example project failed during checkstyle execution
add e47f655 Merge remote-tracking branch 'upstream/develop' into develop
add b81e90f Merge remote-tracking branch 'upstream/develop' into develop
add db05f81 Merge remote-tracking branch 'upstream/develop' into develop
add f244ee3 [ISSUE #2556] LitePullConsumer support message trace.
add 2dc75d3 The messageTrace related configurations is set as a property
add 620d02f Merge pull request #2930 from zhangjidi2016/litePullConsumer_support_msgTrace
add ae394c7 Update operation.md
add 8e05485 Merge pull request #2951 from hehejiejie/develop
add 5515791 [ISSUE #2556] The queryMsgTraceById command supports specifying the customerTraceTopic
add 5e99cdb Merge pull request #2952 from zhangjidi2016/develop
add 60fc4c4 Merge branch 'master' into develop
add 93974b0 chore(release): prepare to release rocketmq 4.9.0
add 5203d52 [maven-release-plugin] prepare release rocketmq-all-4.9.0
add df1d93f [maven-release-plugin] prepare for next development iteration
No new revisions were added by this update.
Summary of changes:
.travis.yml | 32 ++-
LICENSE | 2 +-
NOTICE | 2 +-
acl/pom.xml | 2 +-
.../apache/rocketmq/acl/common/AclConstants.java | 10 +
.../org/apache/rocketmq/acl/common/Permission.java | 29 +-
.../rocketmq/acl/plain/PlainPermissionManager.java | 44 +--
.../acl/plain/RemoteAddressStrategyFactory.java | 2 +-
.../apache/rocketmq/acl/common/PermissionTest.java | 24 ++
.../acl/plain/PlainAccessValidatorTest.java | 20 ++
broker/pom.xml | 2 +-
.../rocketmq/broker/mqtrace/SendMessageHook.java | 6 +-
.../broker/offset/ConsumerOffsetManager.java | 16 ++
.../apache/rocketmq/broker/out/BrokerOuterAPI.java | 2 +-
.../broker/processor/AdminBrokerProcessor.java | 4 +
.../broker/processor/PullMessageProcessor.java | 4 +-
.../broker/processor/SendMessageProcessor.java | 2 +
.../rocketmq/broker/topic/TopicConfigManager.java | 18 +-
.../queue/TransactionalMessageServiceImpl.java | 2 +-
.../apache/rocketmq/broker/BrokerOuterAPITest.java | 2 +-
client/pom.xml | 18 +-
.../org/apache/rocketmq/client/ClientConfig.java | 6 +-
.../rocketmq/client/common/ThreadLocalIndex.java | 7 +-
.../client/consumer/DefaultLitePullConsumer.java | 65 +++++
.../client/hook/EndTransactionContext.java | 86 ++++++
...terMessageHook.java => EndTransactionHook.java} | 4 +-
.../client/impl/ClientRemotingProcessor.java | 2 -
.../apache/rocketmq/client/impl/MQAdminImpl.java | 16 +-
.../rocketmq/client/impl/MQClientAPIImpl.java | 3 +-
.../client/impl/consumer/AssignedMessageQueue.java | 5 +-
.../consumer/ConsumeMessageOrderlyService.java | 4 +-
.../impl/consumer/DefaultLitePullConsumerImpl.java | 83 +++++-
.../impl/consumer/DefaultMQPullConsumerImpl.java | 11 +-
.../impl/consumer/DefaultMQPushConsumerImpl.java | 25 +-
.../client/impl/consumer/ProcessQueue.java | 56 ++--
.../rocketmq/client/impl/consumer/PullRequest.java | 10 +-
.../client/impl/consumer/RebalanceImpl.java | 20 +-
.../impl/consumer/RebalanceLitePullImpl.java | 18 +-
.../client/impl/consumer/RebalancePullImpl.java | 7 +
.../client/impl/consumer/RebalancePushImpl.java | 25 +-
.../client/impl/factory/MQClientInstance.java | 2 +-
.../impl/producer/DefaultMQProducerImpl.java | 43 ++-
.../client/impl/producer/TopicPublishInfo.java | 4 +-
.../client/latency/LatencyFaultToleranceImpl.java | 2 +-
.../rocketmq/client/latency/MQFaultStrategy.java | 4 +-
.../client/producer/DefaultMQProducer.java | 13 +-
.../client/producer/TransactionMQProducer.java | 4 +
.../client/trace/AsyncTraceDispatcher.java | 6 +-
.../apache/rocketmq/client/trace/TraceBean.java | 29 +-
.../rocketmq/client/trace/TraceConstants.java | 16 ++
.../rocketmq/client/trace/TraceDataEncoder.java | 47 +++-
.../apache/rocketmq/client/trace/TraceType.java | 1 +
.../apache/rocketmq/client/trace/TraceView.java | 12 +-
.../hook/ConsumeMessageOpenTracingHookImpl.java | 95 +++++++
.../trace/hook/ConsumeMessageTraceHookImpl.java | 16 +-
.../hook/EndTransactionOpenTracingHookImpl.java | 72 +++++
...kImpl.java => EndTransactionTraceHookImpl.java} | 70 ++---
.../trace/hook/SendMessageOpenTracingHookImpl.java | 88 ++++++
.../trace/hook/SendMessageTraceHookImpl.java | 1 -
.../client/common/ThreadLocalIndexTest.java | 10 +-
.../consumer/DefaultLitePullConsumerTest.java | 58 ++--
.../client/consumer/DefaultMQPushConsumerTest.java | 146 +++++-----
.../ConsumeMessageConcurrentlyServiceTest.java | 42 +--
.../client/impl/factory/MQClientInstanceTest.java | 6 +-
.../client/producer/DefaultMQProducerTest.java | 2 +-
...a => DefaultMQConsumerWithOpenTracingTest.java} | 237 +++++-----------
.../trace/DefaultMQConsumerWithTraceTest.java | 46 ++--
.../DefaultMQLitePullConsumerWithTraceTest.java | 305 +++++++++++++++++++++
...a => DefaultMQProducerWithOpenTracingTest.java} | 98 ++-----
.../trace/DefaultMQProducerWithTraceTest.java | 4 +-
.../client/trace/TraceDataEncoderTest.java | 48 +++-
.../rocketmq/client/trace/TraceViewTest.java | 40 +--
... TransactionMQProducerWithOpenTracingTest.java} | 125 ++++-----
...ava => TransactionMQProducerWithTraceTest.java} | 111 ++++----
client/src/test/resources/log4j2.xml | 29 ++
common/pom.xml | 2 +-
.../java/org/apache/rocketmq/common/MQVersion.java | 2 +-
.../apache/rocketmq/common/constant/PermName.java | 4 +-
.../apache/rocketmq/common/filter/FilterAPI.java | 5 +-
.../rocketmq/common/hook/FilterCheckHook.java | 4 +-
.../rocketmq/common/message/MessageDecoder.java | 16 +-
.../DeleteSubscriptionGroupRequestHeader.java | 10 +
.../rocketmq/common/protocol/route/QueueData.java | 16 +-
.../common/utils/NameServerAddressUtils.java | 12 +-
.../rocketmq/common/filter/FilterAPITest.java | 2 +-
.../common/protocol/route/TopicRouteDataTest.java | 4 +-
.../common/utils/NameServerAddressUtilsTest.java | 59 ++++
distribution/LICENSE-BIN | 2 +-
distribution/NOTICE-BIN | 2 +-
distribution/bin/dledger/fast-try.sh | 24 +-
distribution/bin/runbroker.cmd | 2 +-
distribution/bin/runserver.cmd | 2 +-
distribution/bin/runserver.sh | 4 +-
distribution/pom.xml | 2 +-
docs/cn/RocketMQ_Example.md | 2 +-
docs/cn/concept.md | 2 +-
docs/cn/design.md | 2 +-
docs/cn/image/rocketmq_architecture_1.png | Bin 377784 -> 89290 bytes
docs/cn/image/rocketmq_architecture_3.png | Bin 61421 -> 106758 bytes
docs/cn/operation.md | 2 +-
docs/cn/rpc_request.md | 2 +-
docs/en/image/rocketmq_architecture_1.png | Bin 46292 -> 89290 bytes
docs/en/image/rocketmq_architecture_3.png | Bin 61421 -> 106758 bytes
example/pom.xml | 12 +-
.../rocketmq/example/benchmark/Consumer.java | 4 +-
.../rocketmq/example/benchmark/Producer.java | 70 ++++-
.../rocketmq/example/ordermessage/Producer.java | 8 +-
.../example/tracemessage/OpenTracingProducer.java | 68 +++++
...hConsumer.java => OpenTracingPushConsumer.java} | 33 ++-
.../OpenTracingTransactionProducer.java | 86 ++++++
filter/pom.xml | 2 +-
.../rocketmq/filter/parser/SimpleCharStream.java | 8 +-
logappender/pom.xml | 2 +-
logging/pom.xml | 2 +-
.../org/apache/rocketmq/logging/inner/Level.java | 1 -
.../apache/rocketmq/logging/inner/SysLogger.java | 4 +-
namesrv/pom.xml | 2 +-
.../namesrv/processor/DefaultRequestProcessor.java | 5 +
.../namesrv/routeinfo/RouteInfoManager.java | 10 +-
openmessaging/pom.xml | 2 +-
pom.xml | 25 +-
remoting/pom.xml | 7 +-
.../rocketmq/remoting/common/RemotingUtil.java | 18 ++
.../remoting/netty/NettyRemotingClient.java | 6 +-
.../apache/rocketmq/remoting/netty/TlsHelper.java | 2 +-
.../remoting/netty/NettyRemotingAbstractTest.java | 4 +-
.../remoting/netty/NettyRemotingClientTest.java | 1 -
srvutil/pom.xml | 2 +-
store/pom.xml | 2 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 9 +-
.../rocketmq/store/config/MessageStoreConfig.java | 10 +
.../rocketmq/store/dledger/DLedgerCommitLog.java | 58 ++--
.../org/apache/rocketmq/store/ha/HAService.java | 7 +
.../store/schedule/ScheduleMessageService.java | 7 +
.../store/DefaultMessageStoreShutDownTest.java | 7 +-
.../rocketmq/store/DefaultMessageStoreTest.java | 4 +-
.../store/schedule/ScheduleMessageServiceTest.java | 11 +
test/pom.xml | 2 +-
.../org/apache/rocketmq/test/util/FileUtil.java | 2 +-
.../java/org/apache/rocketmq/test/util/MQWait.java | 2 +-
.../org/apache/rocketmq/test/util/RandomUtil.java | 10 +-
.../org/apache/rocketmq/test/util/RandomUtils.java | 8 +-
.../org/apache/rocketmq/test/util/VerifyUtils.java | 2 +-
.../data/collect/impl/ListDataCollectorImpl.java | 6 +-
.../test/client/consumer/tag/MulTagSubIT.java | 6 +-
.../consumer/tag/TagMessageWithMulConsumerIT.java | 6 +-
test/src/test/resources/log4j.xml | 2 +-
tools/pom.xml | 2 +-
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 19 +-
.../tools/admin/DefaultMQAdminExtImpl.java | 21 +-
.../apache/rocketmq/tools/admin/MQAdminExt.java | 3 +
.../command/cluster/CLusterSendMsgRTCommand.java | 2 +-
.../consumer/ConsumerProgressSubCommand.java | 64 +++--
.../consumer/DeleteSubscriptionGroupCommand.java | 13 +-
.../message/QueryMsgByUniqueKeySubCommand.java | 137 ++++-----
.../message/QueryMsgTraceByIdSubCommand.java | 68 ++---
.../tools/command/topic/TopicRouteSubCommand.java | 52 +++-
.../command/topic/UpdateTopicPermSubCommand.java | 2 +-
158 files changed, 2562 insertions(+), 1078 deletions(-)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/hook/EndTransactionContext.java
copy client/src/main/java/org/apache/rocketmq/client/hook/{FilterMessageHook.java => EndTransactionHook.java} (89%)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageOpenTracingHookImpl.java
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/EndTransactionOpenTracingHookImpl.java
copy client/src/main/java/org/apache/rocketmq/client/trace/hook/{SendMessageTraceHookImpl.java => EndTransactionTraceHookImpl.java} (54%)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/SendMessageOpenTracingHookImpl.java
copy client/src/test/java/org/apache/rocketmq/client/trace/{DefaultMQConsumerWithTraceTest.java => DefaultMQConsumerWithOpenTracingTest.java} (51%)
create mode 100644 client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQLitePullConsumerWithTraceTest.java
copy client/src/test/java/org/apache/rocketmq/client/trace/{DefaultMQProducerWithTraceTest.java => DefaultMQProducerWithOpenTracingTest.java} (64%)
copy client/src/test/java/org/apache/rocketmq/client/trace/{DefaultMQProducerWithTraceTest.java => TransactionMQProducerWithOpenTracingTest.java} (63%)
copy client/src/test/java/org/apache/rocketmq/client/trace/{DefaultMQProducerWithTraceTest.java => TransactionMQProducerWithTraceTest.java} (71%)
create mode 100644 client/src/test/resources/log4j2.xml
create mode 100644 common/src/test/java/org/apache/rocketmq/common/utils/NameServerAddressUtilsTest.java
create mode 100644 example/src/main/java/org/apache/rocketmq/example/tracemessage/OpenTracingProducer.java
copy example/src/main/java/org/apache/rocketmq/example/tracemessage/{TracePushConsumer.java => OpenTracingPushConsumer.java} (66%)
create mode 100644 example/src/main/java/org/apache/rocketmq/example/tracemessage/OpenTracingTransactionProducer.java