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/08/23 04:38:05 UTC

[rocketmq] branch master updated (a20f31b -> fb8bc64)

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 a20f31b  Limit event trigger
     add a027f8d  [maven-release-plugin] prepare release rocketmq-all-4.9.0
     add a1babab  [maven-release-plugin] prepare for next development iteration
     add f42db53  Changing the comma input method
     add 317fd7e  Changing the comma input method
     add 52348b8  Merge pull request #2977 from ferris-cx/master
     add 2fe6dc3  #2990 Add message tracing switch in sendMessage command of mqadmin
     add 57c166b  Merge pull request #2991 from yuz10/develop4
     add b9c108b  Merge remote-tracking branch 'origin/develop_include_3_commits' into develop
     add 93dd086  AsyncTraceDispatcher unique groupName
     add 0c36d14  remove SubAfter field
     add a92996a  Merge pull request #3005 from lfz757077613/develop
     add 5fe0041  Change default value of some parameters: sendMessageThreadPoolNums/useReentrantLockWhenPutMessage/flushCommitLogTimed/endTransactionThreadPoolNums
     add e5a3f7d  Merge pull request #2888 from areyouok/dev_speed_D
     add e126310  [ISSUE #2997] Add a Chinese version of Configuration_System.md
     add 2b236c3  [ISSUE 3019] Fixed bug with batch-sent message statistics
     add 160c577  test(benchmark): support delay message test (#3010)
     add a0a2192  [ISSUE #2873] add benchmark for batch message
     add 6b519ef  [ISSUE #3068] remove jaeger tracing dependency in release package
     add a2f8810  [ISSUE #2988] fix fail to send trace of last message before shutting down producer
     add fcc20de  [ISSUE #3059] typo transactional message wiki
     add 95a6275  typo
     add df35edf  Merge pull request #3088 from sunbufu/fix-a-typo
     add 9a5ec90  [ISSUE  #3109]Return a no-support value when not match any request code
     add 56c3ad8  update the option's description of deleteAccessConfig command
     add 22647de  update the option's description of updateAccessConfig command
     add b186bcd  update the option's description of consumer.sh
     add 4f33895  Merge branch 'develop' into RocketMQ-zhurunhua
     add 2a63717  Merge pull request #2882 from zhurunhua/RocketMQ-zhurunhua
     add 6591589  [ISSUE #3118] Fix type conversion exception
     add 7c36468  [ISSUE #3089] fix Print log format is incorrect in NettyRemotingAbstract class (#3126)
     add 6cee569  duplicate doAfterRpcHooks
     add 7029545  Merge branch 'apache:develop' into develop
     add b74c48b  add trace data format test case
     add cba3e05  Merge pull request #3124 from lizhiboo/add_trace_test_case
     add d65778f  [ISSUE #2883] [Part B] Improve produce performance in M/S mode.  (#2885)
     add 3183122  Eliminate array copy (#2886)
     add 7f1cb79  remove useless code
     add 2fc1148  Merge pull request #3111 from codersfarm/develop
     add 589e87c  [ISSUE #3099] Fix the incorrect judegment  'writePos - lastCommittedPosition > commitLeastPages' in the method 'commit0' of class 'MappedFile' (#3125)
     add f4b3d4f  fix namesrv endpoint
     add 3efcd85  Merge pull request #3122 from panzhi33/master
     add 94e0899  [ISSUE #3097] docs remove obsolete/error configuration
     add 2bd0676  Merge pull request #3116 from trdmm/develop
     add d8dec65  add different send examples
     add d0d2f15  add chinese version of FAQ.md
     add e1f94aa  Merge pull request #3034 from PatrickkZ/develop
     add 278d328  add Chinese version
     add 0cc5ad2  add Chinese version of Example_Batch
     add 69e8185  Merge pull request #3036 from Cu-Cu/master
     add 622bbbf  add some doc of the API_Reference_DefaultMQProducer of English.
     add 5908ca7  Merge pull request #3056 from zplovekq/doc_add
     add 23f3893  Add a Chinese version of Deployment.md
     add 30058cf  Merge pull request #3038 from IntroDrop/develop
     add 92f2d03  log exception stack
     add 83efcce  Merge remote-tracking branch 'upstream/develop' into fix-issue-603
     add bc73c32  use String.format() in warn log.
     add 89d9ed7  Merge pull request #3100 from sunbufu/fix-issue-603
     add a99cf37  Add Chinses Version Doc of Example_Simple.md
     add e4daba5  Merge pull request #3042 from haoran-pku/master
     add 17a8e93  fix spell error
     add cf0819e  Merge pull request #3144 from A-Zee029/master
     add 44e2669  [ISSUE #3128] fix the delete global white addresses
     add 4c1998a  retrigger ci
     add a315833  Merge pull request #3132 from zhangjidi2016/fix_update_globalWhiteAddresses
     add 04c7354  delete the unuse code
     add 36333ce  Merge pull request #3157 from yglovewms/yeyi
     add 61cd395  code style(client):polish lite pull consumer code style
     add 893e8fd  code style(client):polish lite pull consumer code style
     add 6aabf77  Merge pull request #3047 from qingjiyuji/develop
     add 18e2a26  [ISSUE #3164]Fix the checkstyle error
     add bb9a70c  Merge pull request #3165 from zhangjidi2016/fix_checkstyle_error
     add d7c2d25  [ISSUE #2708] fix offset rollback when fetch offset from broker exception
     add 5b945a9  Merge pull request #3158 from Zanglei06/fix_rmq_client_offset_dev
     add 5808772  fix checkstyle fail
     add df88bce  add msgTraceEnable config in transaction producer benchmark
     add 011035f  Merge pull request #3163 from yuz10/develop6
     add ece364a  Improve the comment of maxReconsumeTimes
     add 35a15b6  Merge pull request #3022 from heihaozi/maxReconsumeTimes
     add 25f6711  [statistics] Fix the inconsistency of putMessageDistributeTime statistics
     add 765cac3  Merge pull request #3025 from Git-Yang/statistics_bug
     add bc3eeed  fix: fix issue 2055
     add 74aa3e0  Update SendMessageProcessor.java
     add c63ec20  Merge pull request #2058 from RealBar/fix/issue2055
     add 40e1435  #2990 Add document
     add 1e982af  Merge pull request #2995 from yuz10/develop4
     add 361eb8d  Upgrade netty-all dependency version to 4.1.65.Final
     add 9a9039e  Merge pull request #3032 from messense/upgrade-netty-all
     add b954d35  feat: issue2715, make netty parameter configure by system property
     add 33a533b  feat: add some test case
     add 03adb63  feat: add some test case
     add 98237b1  feat: add some test case
     add 67ceb64  fix: add license
     add 59cbbc4  feat: add some test case
     add d60643a  Merge pull request #2720 from EZLippi/feature/issue2715
     add 36422c5  [ISSUE #3066]producing a ghost consumer
     add d93dc4d  Merge branch 'apache:develop' into develop
     add 4e5a60c  [ISSUE #2442] when happening system busy, retry
     add 062e6f3  revert [ISSUE #2442] when happening system busy, retry
     add c75ef50  Merge branch 'apache:develop' into develop
     add 8eb275f  Merge branch 'apache:develop' into develop
     add 36e6687  Merge pull request #3120 from lwclover/develop
     add 360b616  [ISSUE #3185]remove the arm machine test in travis ci
     add 0325772  [ISSUE #2883] [Part E] Improve produce performance in M/S mode.  (#2889)
     add b68724b  [ISSUE #3030]Remove the -Xmn JVM parameter when using G1 (#3170)
     add 800421e  registerProducer & unregisterProducer add synchronization too, how about add for producer
     add 72128f7  Merge branch 'develop' of https://github.com/lwclover/rocketmq-2.git into develop
     add 6f7b0d6  Merge pull request #3182 from lwclover/develop
     add 17b9efe  [ISSUE #3177]updateAclConfig in all brokers. (#3184)
     add 1b757b4  [ISSUE #3196] Check if "requestHeader" is null before "requestHeader.getTopic()"
     add 1eaa38f  [ISSUE #3200] Fix code style in 'NettySystemConfig.java'
     add d067bfc  [ISSUE #3192] Make free disk value more accurate
     add 20b6cdd  [ISSUE 2883] Remove an duplicate MessageDecoder.string2messageProperties for each message, and prevent store "WAIT=true" property (in most case) to save 9 bytes for each message.
     add a23df96  [ISSUE 2883] Improve performance of string2messageProperties/messageProperties2String, and save 1 byte for each message.
     add 2509b0e  Merge pull request #2961 from areyouok/dev_speed_F
     add b13a4c8  [ISSUE 2883] [Part G] Optimise parse performance for SendMessageRequestHeaderV2
     add a137e48  [ISSUE 2883] [Part G] Optimise parse performance for SendMessageRequestHeaderV2, unit test
     add 3e01424  Merge pull request #3134 from areyouok/dev_speed_G
     add 94abced  [ISSUE #3199] Two timed task for RequestFutureTable (#3202)
     add 66eeaed  #3175 check acl config before update. otherwise broker may fail to start
     add 3aa4943  fix checkstyle
     add d21266d  Merge branch 'develop' into develop3
     add 9e8fea9  Merge pull request #3176 from yuz10/develop3
     add 5e58893  prepare to release rocketmq 4.9.1 version
     add 73db297  [#Issue3205]Fix the issue of code style in client and broker modules.
     add ec985ee  Merge pull request #3206 from zongtanghu/develop_fix_4.9.1_codestyle
     add a1bfe1a  [maven-release-plugin] prepare release rocketmq-all-4.9.1
     add a7e71cb  [maven-release-plugin] prepare for next development iteration
     new fb8bc64  Merge branch '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:
 .travis.yml                                        |   4 +-
 acl/pom.xml                                        |   2 +-
 .../rocketmq/acl/plain/PlainPermissionManager.java |  30 +-
 .../acl/plain/PlainAccessValidatorTest.java        |  10 +
 broker/pom.xml                                     |   2 +-
 .../broker/pagecache/ManyMessageTransfer.java      |  27 +
 .../broker/pagecache/OneMessageTransfer.java       |  27 +
 .../broker/pagecache/QueryMessageTransfer.java     |  27 +
 .../broker/plugin/AbstractPluginMessageStore.java  |   4 +-
 .../processor/AbstractSendMessageProcessor.java    |  80 +-
 .../broker/processor/AdminBrokerProcessor.java     |  14 +-
 .../broker/processor/SendMessageProcessor.java     |  22 +-
 .../AbstractSendMessageProcessorTest.java          |  82 ++
 client/pom.xml                                     |   2 +-
 .../org/apache/rocketmq/client/ClientConfig.java   |   2 +-
 .../client/consumer/DefaultMQPushConsumer.java     |   8 +-
 .../ConsumeMessageConcurrentlyService.java         |  28 +-
 .../consumer/ConsumeMessageOrderlyService.java     |   4 +-
 .../impl/consumer/DefaultLitePullConsumerImpl.java |  38 +-
 .../impl/consumer/DefaultMQPushConsumerImpl.java   |   2 +-
 .../client/impl/consumer/RebalanceImpl.java        |   2 +-
 .../impl/consumer/RebalanceLitePullImpl.java       |   3 +-
 .../client/impl/factory/MQClientInstance.java      |  30 +-
 .../impl/producer/DefaultMQProducerImpl.java       |  40 +-
 .../client/producer/RequestFutureTable.java        |   7 +
 .../client/trace/AsyncTraceDispatcher.java         |  74 +-
 .../rocketmq/client/trace/TraceDataEncoder.java    |   4 +-
 .../client/trace/TraceDataEncoderTest.java         | 104 ++-
 common/pom.xml                                     |   2 +-
 .../org/apache/rocketmq/common/BrokerConfig.java   |   8 +-
 .../java/org/apache/rocketmq/common/MQVersion.java |   2 +-
 .../rocketmq/common/message/MessageDecoder.java    |  41 +-
 .../common/utils/NameServerAddressUtils.java       |   1 +
 .../common/message/MessageDecoderTest.java         | 108 +++
 .../benchmark/{consumer.sh => batchproducer.sh}    |   2 +-
 distribution/bin/runbroker.cmd                     |   2 +-
 distribution/bin/runbroker.sh                      |   2 +-
 distribution/bin/runserver.cmd                     |   2 +-
 distribution/bin/runserver.sh                      |   6 +-
 distribution/pom.xml                               |   2 +-
 distribution/release.xml                           |   4 +
 docs/cn/Configuration_System.md                    |  70 ++
 docs/cn/Deployment.md                              | 159 ++++
 docs/{en => cn}/Example_Batch.md                   |  15 +-
 docs/{en => cn}/Example_Delay.md                   |  16 +-
 .../Example_Simple.md => cn/Example_Simple_cn.md}  |  24 +-
 docs/cn/FAQ.md                                     | 110 +++
 docs/cn/best_practice.md                           |   2 +-
 docs/cn/design.md                                  |   4 +-
 docs/cn/image/rocketmq_architecture_1.png          | Bin 89290 -> 62810 bytes
 docs/cn/image/rocketmq_architecture_3.png          | Bin 106758 -> 74884 bytes
 docs/cn/msg_trace/user_guide.md                    |  19 +-
 docs/en/Example_Transaction.md                     |   2 +-
 docs/en/best_practice.md                           |   2 +-
 .../client/java/API_Reference_DefaultMQProducer.md |  71 ++
 docs/en/image/rocketmq_architecture_1.png          | Bin 89290 -> 62810 bytes
 docs/en/image/rocketmq_architecture_3.png          | Bin 106758 -> 74884 bytes
 docs/en/msg_trace/user_guide.md                    |  16 +
 example/pom.xml                                    |   2 +-
 .../rocketmq/example/benchmark/BatchProducer.java  | 411 ++++++++++
 .../rocketmq/example/benchmark/Consumer.java       |   3 +-
 .../rocketmq/example/benchmark/Producer.java       |  17 +-
 .../example/benchmark/TransactionProducer.java     |  14 +-
 .../rocketmq/example/quickstart/Producer.java      |  33 +
 filter/pom.xml                                     |   2 +-
 logappender/pom.xml                                |   2 +-
 logging/pom.xml                                    |   2 +-
 namesrv/pom.xml                                    |   2 +-
 openmessaging/pom.xml                              |   2 +-
 pom.xml                                            |   4 +-
 remoting/pom.xml                                   |   2 +-
 .../rocketmq/remoting/netty/NettyClientConfig.java |   8 +-
 .../rocketmq/remoting/netty/NettyLogger.java       |  46 ++
 .../remoting/netty/NettyRemotingAbstract.java      |   2 +-
 .../rocketmq/remoting/netty/NettySystemConfig.java |  16 +
 .../remoting/netty/NettyClientConfigTest.java      |  64 ++
 srvutil/pom.xml                                    |   2 +-
 store/pom.xml                                      |   2 +-
 .../rocketmq/store/AppendMessageCallback.java      |   5 +-
 .../apache/rocketmq/store/AppendMessageResult.java |  17 +
 .../java/org/apache/rocketmq/store/CommitLog.java  | 827 ++++++++-------------
 .../apache/rocketmq/store/DefaultMessageStore.java |  59 +-
 .../java/org/apache/rocketmq/store/MappedFile.java |  26 +-
 .../rocketmq/store/MessageExtBrokerInner.java      |  12 +
 .../org/apache/rocketmq/store/MessageStore.java    |   4 +-
 .../rocketmq/store/SelectMappedBufferResult.java   |   7 -
 .../apache/rocketmq/store/StoreStatsService.java   |   7 +-
 .../rocketmq/store/config/MessageStoreConfig.java  |   7 +-
 .../rocketmq/store/dledger/DLedgerCommitLog.java   | 242 +-----
 .../org/apache/rocketmq/store/ha/HAService.java    |  63 +-
 .../apache/rocketmq/store/ha/WaitNotifyObject.java |  64 +-
 .../apache/rocketmq/store/AppendCallbackTest.java  |  28 +-
 .../apache/rocketmq/store/BatchPutMessageTest.java |  18 +-
 test/pom.xml                                       |   2 +-
 tools/pom.xml                                      |   2 +-
 .../command/acl/DeleteAccessConfigSubCommand.java  |   8 +-
 .../command/acl/UpdateAccessConfigSubCommand.java  |   8 +-
 .../tools/command/message/SendMessageCommand.java  |  17 +-
 98 files changed, 2282 insertions(+), 1148 deletions(-)
 create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessorTest.java
 copy distribution/benchmark/{consumer.sh => batchproducer.sh} (91%)
 create mode 100644 docs/cn/Configuration_System.md
 create mode 100644 docs/cn/Deployment.md
 copy docs/{en => cn}/Example_Batch.md (79%)
 copy docs/{en => cn}/Example_Delay.md (76%)
 copy docs/{en/Example_Simple.md => cn/Example_Simple_cn.md} (82%)
 create mode 100644 docs/cn/FAQ.md
 create mode 100644 docs/en/client/java/API_Reference_DefaultMQProducer.md
 create mode 100644 example/src/main/java/org/apache/rocketmq/example/benchmark/BatchProducer.java
 create mode 100644 remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyClientConfigTest.java

[rocketmq] 01/01: Merge branch 'develop'

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit fb8bc64e2a2551e76da24cb6af0fb3e5f986f8b3
Merge: a20f31b a7e71cb
Author: zongtanghu <zo...@gmail.com>
AuthorDate: Mon Aug 23 12:35:55 2021 +0800

    Merge branch 'develop'

 .travis.yml                                        |   4 +-
 acl/pom.xml                                        |   2 +-
 .../rocketmq/acl/plain/PlainPermissionManager.java |  30 +-
 .../acl/plain/PlainAccessValidatorTest.java        |  10 +
 broker/pom.xml                                     |   2 +-
 .../broker/pagecache/ManyMessageTransfer.java      |  27 +
 .../broker/pagecache/OneMessageTransfer.java       |  27 +
 .../broker/pagecache/QueryMessageTransfer.java     |  27 +
 .../broker/plugin/AbstractPluginMessageStore.java  |   4 +-
 .../processor/AbstractSendMessageProcessor.java    |  80 +-
 .../broker/processor/AdminBrokerProcessor.java     |  14 +-
 .../broker/processor/SendMessageProcessor.java     |  22 +-
 .../AbstractSendMessageProcessorTest.java          |  82 ++
 client/pom.xml                                     |   2 +-
 .../org/apache/rocketmq/client/ClientConfig.java   |   2 +-
 .../client/consumer/DefaultMQPushConsumer.java     |   8 +-
 .../ConsumeMessageConcurrentlyService.java         |  28 +-
 .../consumer/ConsumeMessageOrderlyService.java     |   4 +-
 .../impl/consumer/DefaultLitePullConsumerImpl.java |  38 +-
 .../impl/consumer/DefaultMQPushConsumerImpl.java   |   2 +-
 .../client/impl/consumer/RebalanceImpl.java        |   2 +-
 .../impl/consumer/RebalanceLitePullImpl.java       |   3 +-
 .../client/impl/factory/MQClientInstance.java      |  30 +-
 .../impl/producer/DefaultMQProducerImpl.java       |  40 +-
 .../client/producer/RequestFutureTable.java        |   7 +
 .../client/trace/AsyncTraceDispatcher.java         |  74 +-
 .../rocketmq/client/trace/TraceDataEncoder.java    |   4 +-
 .../client/trace/TraceDataEncoderTest.java         | 104 ++-
 common/pom.xml                                     |   2 +-
 .../org/apache/rocketmq/common/BrokerConfig.java   |   8 +-
 .../java/org/apache/rocketmq/common/MQVersion.java |   2 +-
 .../rocketmq/common/message/MessageDecoder.java    |  41 +-
 .../common/utils/NameServerAddressUtils.java       |   1 +
 .../common/message/MessageDecoderTest.java         | 108 +++
 distribution/benchmark/batchproducer.sh            |  18 +
 distribution/bin/runbroker.cmd                     |   2 +-
 distribution/bin/runbroker.sh                      |   2 +-
 distribution/bin/runserver.cmd                     |   2 +-
 distribution/bin/runserver.sh                      |   6 +-
 distribution/pom.xml                               |   2 +-
 distribution/release.xml                           |   4 +
 docs/cn/Configuration_System.md                    |  70 ++
 docs/cn/Deployment.md                              | 159 ++++
 docs/cn/Example_Batch.md                           |  82 ++
 docs/cn/Example_Delay.md                           |  85 +++
 docs/cn/Example_Simple_cn.md                       | 136 ++++
 docs/cn/FAQ.md                                     | 110 +++
 docs/cn/best_practice.md                           |   2 +-
 docs/cn/design.md                                  |   4 +-
 docs/cn/image/rocketmq_architecture_1.png          | Bin 89290 -> 62810 bytes
 docs/cn/image/rocketmq_architecture_3.png          | Bin 106758 -> 74884 bytes
 docs/cn/msg_trace/user_guide.md                    |  19 +-
 docs/en/Example_Transaction.md                     |   2 +-
 docs/en/best_practice.md                           |   2 +-
 .../client/java/API_Reference_DefaultMQProducer.md |  71 ++
 docs/en/image/rocketmq_architecture_1.png          | Bin 89290 -> 62810 bytes
 docs/en/image/rocketmq_architecture_3.png          | Bin 106758 -> 74884 bytes
 docs/en/msg_trace/user_guide.md                    |  16 +
 example/pom.xml                                    |   2 +-
 .../rocketmq/example/benchmark/BatchProducer.java  | 411 ++++++++++
 .../rocketmq/example/benchmark/Consumer.java       |   3 +-
 .../rocketmq/example/benchmark/Producer.java       |  17 +-
 .../example/benchmark/TransactionProducer.java     |  14 +-
 .../rocketmq/example/quickstart/Producer.java      |  33 +
 filter/pom.xml                                     |   2 +-
 logappender/pom.xml                                |   2 +-
 logging/pom.xml                                    |   2 +-
 namesrv/pom.xml                                    |   2 +-
 openmessaging/pom.xml                              |   2 +-
 pom.xml                                            |   4 +-
 remoting/pom.xml                                   |   2 +-
 .../rocketmq/remoting/netty/NettyClientConfig.java |   8 +-
 .../rocketmq/remoting/netty/NettyLogger.java       |  46 ++
 .../remoting/netty/NettyRemotingAbstract.java      |   2 +-
 .../rocketmq/remoting/netty/NettySystemConfig.java |  16 +
 .../remoting/netty/NettyClientConfigTest.java      |  64 ++
 srvutil/pom.xml                                    |   2 +-
 store/pom.xml                                      |   2 +-
 .../rocketmq/store/AppendMessageCallback.java      |   5 +-
 .../apache/rocketmq/store/AppendMessageResult.java |  17 +
 .../java/org/apache/rocketmq/store/CommitLog.java  | 827 ++++++++-------------
 .../apache/rocketmq/store/DefaultMessageStore.java |  59 +-
 .../java/org/apache/rocketmq/store/MappedFile.java |  26 +-
 .../rocketmq/store/MessageExtBrokerInner.java      |  12 +
 .../org/apache/rocketmq/store/MessageStore.java    |   4 +-
 .../rocketmq/store/SelectMappedBufferResult.java   |   7 -
 .../apache/rocketmq/store/StoreStatsService.java   |   7 +-
 .../rocketmq/store/config/MessageStoreConfig.java  |   7 +-
 .../rocketmq/store/dledger/DLedgerCommitLog.java   | 242 +-----
 .../org/apache/rocketmq/store/ha/HAService.java    |  63 +-
 .../apache/rocketmq/store/ha/WaitNotifyObject.java |  64 +-
 .../apache/rocketmq/store/AppendCallbackTest.java  |  28 +-
 .../apache/rocketmq/store/BatchPutMessageTest.java |  18 +-
 test/pom.xml                                       |   2 +-
 tools/pom.xml                                      |   2 +-
 .../command/acl/DeleteAccessConfigSubCommand.java  |   8 +-
 .../command/acl/UpdateAccessConfigSubCommand.java  |   8 +-
 .../tools/command/message/SendMessageCommand.java  |  17 +-
 98 files changed, 2574 insertions(+), 1120 deletions(-)