You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ti...@apache.org on 2021/10/26 05:39:52 UTC

[rocketmq] branch master updated (fb8bc64 -> 21faa68)

This is an automated email from the ASF dual-hosted git repository.

tigerlee pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.


    from fb8bc64  Merge branch 'develop'
     add 2820e47  [ISSUE #3215] polish litePullConsumer seek logic #3216
     add e9c4253  [maven-release-plugin] prepare release rocketmq-all-4.9.1
     add bb34171  [maven-release-plugin] prepare for next development iteration
     add 9d4e8de  Looking at the Chinese document, I found that the subtraction operation of countdown timer is missing in asynchronous message push, so I downloaded the code. I found that someone added subtraction operation to the demo code in 18 years, but the document was not repaired, so I did this repair
     add 0fdc73d  Merge pull request #3033 from zyh-future/zyh_asuncproducer_doc_fix
     add 3a2b172  [ISSUE #3006]Replace ScheduledExecutorService instead of Timer to avoid affecting other tasks during exception (#3001)
     add 44bdeed  [ISSUE 3203] Replace the class 'StringBuffer' by 'StringBuilder' (#3204)
     add 9e66da4  Merge branch 'develop_include_prs_after_4.9.1_version', remote-tracking branch 'origin' into develop
     add 7c7e9ac  [ISSUE #3284]Optimizing benchmark code (#3285)
     add 2cac866  [ISSUE #3136] TraceDataEncoder add SubAfter trace bean timestamp (#3137)
     add 857d28d  [ISSUE #3284]Optimizing benchmark code (#3317)
     add d7a830c  [ISSUE 3194] [PART A] Use LongAdder instead of AtomicLong in BrokerStatsService to improve performance. (#3195)
     add fea769d  [ISSUE #3284]Optimize the buildMessage method (#3324)
     add 7519a53  [ISSUE 3333] Remove commons-codes dependency (#3334)
     add ef7685d  [ISSUE #3341](doc)fix typo in update operation.md
     add b2aa85d  [ISSUS #3340] (doc)add hyperlink for client repos in the introduction. (#3338)
     add 4b7a90a  [#3326] fix send trace fail if useTLS=true (#3325)
     add 8434658  [ISSUE #2724] Resend message to DLQ directly when max reconsume times reach (#3318)
     add 564ee29  [ISSUE] Add get stats and single queue stats for schedule topic
     add 3604100  [ISSUE #3314] Make mqClientApi request timeout settable
     add 53c55f7  [ISSUE #3245] Use df algorithm to calculate the disk used ratio
     add 83b04d0  [ISSUE #3346]Avoid double parse remoteAddr in rpcHook call
     add bf343a3  [ISSUE #3225]change Random to ThreadLocalRandom in broker
     add 8d964f4  close #1848
     add 1f2b84b  fix #1883 fix wipeWritePerm doc desc
     add f9a0f53  Merge pull request #1858 from coder-zzzz/github_features/#1848
     add 147d23e  [ISSUE #3281 ][acl] fix fail to delete topic perm list and global white address(#3128) (#3280)
     add 311d76f  [ISSUE 3194] [PART C] Replace AtomicLong with LongAdder in StatsItem.java to improve performance (#3351)
     add 0a16ff6  DLQ topic default perm change
     add b822db0  Fix DLQ can't be query sometimes
     add 502ca60  fix ci
     add a9ae546  Merge pull request #2437 from maixiaohai/DLQ_perm
     add 0de4038  [ISSUE #3361]DefaultMQProducer's constructor can call the overloaded constructor. (#3362)
     add 0363be1  add response code for retrying
     add d6da221  fix import issue
     add 67ccb7f  Merge pull request #2729 from wz2cool/master
     add 46bd4be  [ISSUE #2964] Add a query consumer config command in mqadmin.
     add a9837d9  Merge pull request #2965 from zhangjidi2016/add_getConsumerConfig_command
     add ced5843  Update rocketmq client maven version
     add ee55441  Merge pull request #3335 from zhouwentong1993/patch-1
     add 2baae14  Improve performance of expandIP, and readable
     add 7a6c374  Revert "Improve performance of expandIP, and readable"
     add 6358b3c  Revert "Improve performance of expandIP, and readable"
     add 97da4ac  Improve performance of expandIP, and readable
     add 7314183  netadress toUpperCase beforehand
     add 0748aa0  Merge pull request #3322 from 844392610/develop_xm
     add 67f4357  add checkstyle to travis ci
     add 401dc8e  production level pull api demo
     add 1e8e728  Merge pull request #3295 from lwclover/develop
     add 9013cc5  fix document mistake (#3303)
     add fa935e8  fix document mistake (#3304)
     add 538b6b7  [ISSUE #1869] Delay message can't be consumed when delay offset in delayOffset.json is wrong (#3358)
     add a9a7dfa  RIP-7 Multiple Directories Storage Suppor
     add 8e19069  fix test error
     add 9b0e31e  1. fix initial value of physicRatio in org.apache.rocketmq.broker.processor.SendMessageProcessor#diskUtil 2. use minPhysicsUsedRatio instead of max in org.apache.rocketmq.store.DefaultMessageStore#getRuntimeInfo
     add 466bb98  fix error in org.apache.rocketmq.store.DefaultMessageStore.CleanCommitLogService#isSpaceFull
     add 255a202  add path empty check to avoid error log in org.apache.rocketmq.store.DefaultMessageStore#getRuntimeInfo
     add f32406d  change default value of org.apache.rocketmq.store.config.MessageStoreConfig#MULTI_PATH_SPLITTER to ',' and can be changed by System.getProperty("rocketmq.broker.multiPathSplitter")
     add 474c4eb  Fix bug for multi path file loading. Opt code checking for multi-path commitlog path in storePathCommitLog.
     add 7d4e5cd  fix compile error
     add 14d50f9  fix a typo
     add 4dbdbf0  Merge pull request #3357 from Jason918/RIP-7
     add a83cdc5  [format] Fix formatting errors (#3380)
     add 6d78d79  fix apache rat failure because of test result files
     add d429aa2  [ISSUE #3375] Lazy init GetMessageResult only when find message
     add b30bd87  [ISSUE #2667] Repair 'file doesn't exist on this path'
     add daf1b9d  [ISSUE #503] NOT_CONSUME_YET not righht in RocketMQ Console (#3091)
     add c6a4b82  [ISSUE #3384] Add SendBack message to SCHEDULE_TOPIC_XXXX stats #3385
     add 94a527c  [ISSUE #3288] Fix producer always timeouts while sending first message (#3383)
     add e6768ba  [ISSUE #2962] Implement DefaultMQAdminExt::examineTopicConfig function
     add 7755aaa  Merge pull request #3039 from Aaron-He/dev20210623
     add 23506fd  fix wrong comment (#3400)
     add cd45023  [ISSUE #3148]Support metadata export (#3149)
     add a2c6d33  [ISSUE #3415] Fix the problem of failure during checkstyle execution
     add 143ac31  prepare to release rocketmq 4.9.2 version
     add c840b20  [maven-release-plugin] prepare release rocketmq-all-4.9.2
     add 21faa68  [maven-release-plugin] prepare for next development iteration

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |   1 +
 README.md                                          |   2 +-
 acl/pom.xml                                        |   2 +-
 .../org/apache/rocketmq/acl/common/AclUtils.java   |  68 ++---
 .../rocketmq/acl/plain/PlainPermissionManager.java |  23 +-
 .../acl/plain/RemoteAddressStrategyFactory.java    |   2 +-
 .../apache/rocketmq/acl/common/AclUtilsTest.java   |   1 +
 .../acl/plain/PlainAccessValidatorTest.java        |  43 +++-
 broker/pom.xml                                     |   2 +-
 .../processor/AbstractSendMessageProcessor.java    |   6 +-
 .../broker/processor/AdminBrokerProcessor.java     |   6 +-
 .../broker/processor/ReplyMessageProcessor.java    |   4 +-
 .../broker/processor/SendMessageProcessor.java     |  41 ++-
 .../AbstractTransactionalMessageCheckListener.java |   2 -
 .../DefaultTransactionalMessageCheckListener.java  |   4 +-
 client/pom.xml                                     |   6 +-
 .../org/apache/rocketmq/client/ClientConfig.java   |  11 +-
 .../client/consumer/DefaultLitePullConsumer.java   |   4 +-
 .../client/consumer/DefaultMQPushConsumer.java     |  10 +-
 .../rocketmq/client/consumer/MessageSelector.java  |   2 +-
 .../rocketmq/client/impl/MQClientAPIImpl.java      |  28 +-
 .../impl/consumer/DefaultLitePullConsumerImpl.java |  28 +-
 .../client/impl/factory/MQClientInstance.java      |  12 +-
 .../impl/producer/DefaultMQProducerImpl.java       |  21 +-
 .../client/producer/DefaultMQProducer.java         |  54 ++--
 .../rocketmq/client/trace/TraceDataEncoder.java    |   5 +-
 .../apache/rocketmq/client/trace/TraceView.java    |   4 +-
 .../rocketmq/client/impl/MQClientAPIImplTest.java  |  28 +-
 .../ConsumeMessageConcurrentlyServiceTest.java     |   2 +-
 .../trace/DefaultMQConsumerWithTraceTest.java      |   9 +
 .../DefaultMQLitePullConsumerWithTraceTest.java    |  12 +-
 .../trace/DefaultMQProducerWithTraceTest.java      |  10 +
 .../client/trace/TraceDataEncoderTest.java         |   4 +-
 .../rocketmq/client/trace/TraceViewTest.java       |   4 +-
 common/pom.xml                                     |   2 +-
 .../java/org/apache/rocketmq/common/MQVersion.java |   2 +-
 .../java/org/apache/rocketmq/common/MixAll.java    |   1 +
 .../java/org/apache/rocketmq/common/UtilAll.java   |  44 ++--
 .../apache/rocketmq/common/message/Message.java    |  11 +-
 .../rocketmq/common/protocol/NamespaceUtil.java    |   2 +-
 .../rocketmq/common/protocol/RequestCode.java      |   2 +
 ...java => AddWritePermOfBrokerRequestHeader.java} |   2 +-
 ...ava => AddWritePermOfBrokerResponseHeader.java} |  13 +-
 .../apache/rocketmq/common/stats/StatsItem.java    |  23 +-
 .../apache/rocketmq/common/stats/StatsItemSet.java |   8 +-
 .../apache/rocketmq/common/RemotingUtilTest.java   |  12 +
 .../org/apache/rocketmq/common/UtilAllTest.java    |  13 +
 .../rocketmq/common/stats/StatsItemSetTest.java    |   4 +-
 .../rocketmq/common/utils/IOTinyUtilsTest.java     |   4 +-
 distribution/bin/export.sh                         |  89 +++++++
 distribution/pom.xml                               |   2 +-
 docs/cn/RocketMQ_Example.md                        |  10 +-
 docs/cn/operation.md                               |  10 +-
 docs/en/CLITools.md                                |   8 +
 docs/en/Example_Batch.md                           |   4 +-
 docs/en/operation.md                               |   2 +-
 example/pom.xml                                    |   2 +-
 .../rocketmq/example/benchmark/BatchProducer.java  | 106 ++++----
 .../rocketmq/example/benchmark/Consumer.java       |  63 ++---
 .../rocketmq/example/benchmark/Producer.java       | 140 +++++-----
 .../example/benchmark/TransactionProducer.java     | 103 ++++----
 .../rocketmq/example/simple/PullConsumer.java      | 150 ++++++++---
 filter/pom.xml                                     |   2 +-
 .../filter/expression/UnaryExpression.java         |  16 +-
 .../rocketmq/filter/parser/ParseException.java     |   7 +-
 .../rocketmq/filter/parser/TokenMgrError.java      |   3 +-
 .../org/apache/rocketmq/filter/ParserTest.java     |   2 +-
 logappender/pom.xml                                |   2 +-
 logging/pom.xml                                    |   2 +-
 namesrv/pom.xml                                    |   2 +-
 .../namesrv/processor/DefaultRequestProcessor.java |  22 ++
 .../namesrv/routeinfo/RouteInfoManager.java        |  39 ++-
 .../namesrv/routeinfo/RouteInfoManagerTest.java    |  52 +++-
 openmessaging/pom.xml                              |   2 +-
 pom.xml                                            |   2 +-
 remoting/pom.xml                                   |   2 +-
 .../rocketmq/remoting/common/RemotingHelper.java   |   2 +-
 .../rocketmq/remoting/common/RemotingUtil.java     |   4 +
 .../remoting/netty/NettyRemotingAbstract.java      |   5 +-
 srvutil/pom.xml                                    |   2 +-
 store/pom.xml                                      |   2 +-
 .../java/org/apache/rocketmq/store/CommitLog.java  |  34 ++-
 .../apache/rocketmq/store/DefaultMessageStore.java | 115 +++++++--
 .../apache/rocketmq/store/GetMessageResult.java    |  13 +-
 .../org/apache/rocketmq/store/MappedFileQueue.java | 108 ++++----
 .../rocketmq/store/MultiPathMappedFileQueue.java   | 127 ++++++++++
 .../apache/rocketmq/store/StoreStatsService.java   | 106 ++++----
 .../rocketmq/store/config/MessageStoreConfig.java  |  13 +
 .../rocketmq/store/dledger/DLedgerCommitLog.java   |   8 +-
 .../store/schedule/ScheduleMessageService.java     |  69 ++++-
 .../apache/rocketmq/store/stats/BrokerStats.java   |   4 +-
 .../rocketmq/store/stats/BrokerStatsManager.java   |  50 +++-
 .../store/DefaultMessageStoreCleanFilesTest.java   |  42 +++
 .../rocketmq/store/DefaultMessageStoreTest.java    |  16 ++
 .../store/MultiPathMappedFileQueueTest.java        | 154 +++++++++++
 .../rocketmq/store/ScheduleMessageServiceTest.java |  84 ++++++
 .../rocketmq/store/StoreStatsServiceTest.java      |  18 +-
 .../store/schedule/ScheduleMessageServiceTest.java |   6 +-
 .../test/java/stats/BrokerStatsManagerTest.java    |  47 ++++
 test/pom.xml                                       |   2 +-
 tools/pom.xml                                      |   2 +-
 .../rocketmq/tools/admin/DefaultMQAdminExt.java    |  28 +-
 .../tools/admin/DefaultMQAdminExtImpl.java         |  76 +++++-
 .../apache/rocketmq/tools/admin/MQAdminExt.java    |  17 +-
 .../apache/rocketmq/tools/command/CommandUtil.java |   1 -
 .../rocketmq/tools/command/MQAdminStartup.java     |  11 +
 .../command/acl/DeleteAccessConfigSubCommand.java  |   6 +-
 .../acl/UpdateGlobalWhiteAddrSubCommand.java       |   6 +-
 .../consumer/GetConsumerConfigSubCommand.java      | 146 +++++++++++
 .../tools/command/export/ExportConfigsCommand.java | 128 ++++++++++
 .../command/export/ExportMetadataCommand.java      | 184 ++++++++++++++
 .../tools/command/export/ExportMetricsCommand.java | 282 +++++++++++++++++++++
 .../message/QueryMsgByUniqueKeySubCommand.java     |   5 +-
 ...SubCommand.java => AddWritePermSubCommand.java} |  29 +--
 .../command/namesrv/WipeWritePermSubCommand.java   |   2 +-
 .../tools/admin/DefaultMQAdminExtTest.java         |  23 ++
 .../GetConsumerConfigSubCommandTest.java}          |  11 +-
 .../AddWritePermSubCommandTest.java}               |  19 +-
 118 files changed, 2738 insertions(+), 717 deletions(-)
 copy common/src/main/java/org/apache/rocketmq/common/protocol/header/namesrv/{WipeWritePermOfBrokerRequestHeader.java => AddWritePermOfBrokerRequestHeader.java} (94%)
 copy common/src/main/java/org/apache/rocketmq/common/protocol/header/namesrv/{WipeWritePermOfBrokerRequestHeader.java => AddWritePermOfBrokerResponseHeader.java} (81%)
 create mode 100644 distribution/bin/export.sh
 create mode 100644 store/src/main/java/org/apache/rocketmq/store/MultiPathMappedFileQueue.java
 create mode 100644 store/src/test/java/org/apache/rocketmq/store/MultiPathMappedFileQueueTest.java
 create mode 100644 store/src/test/java/org/apache/rocketmq/store/ScheduleMessageServiceTest.java
 create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/consumer/GetConsumerConfigSubCommand.java
 create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/export/ExportConfigsCommand.java
 create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/export/ExportMetadataCommand.java
 create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/export/ExportMetricsCommand.java
 copy tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/{WipeWritePermSubCommand.java => AddWritePermSubCommand.java} (77%)
 copy tools/src/test/java/org/apache/rocketmq/tools/command/{broker/UpdateBrokerConfigSubCommandTest.java => consumer/GetConsumerConfigSubCommandTest.java} (92%)
 copy tools/src/test/java/org/apache/rocketmq/tools/command/{acl/GetAccessConfigSubCommandTest.java => namesrv/AddWritePermSubCommandTest.java} (68%)