61 Commits

Author SHA1 Message Date
lsq3497 63394315af docs: fix inaccurate examples and typos across developer guides (#10456) 2026-06-10 19:58:04 +08:00
dingshuangxi888 ade18bb076 [ISSUE 9362] [RIP-77] Deprecate and Remove ACL 1.0 (#9363) 2025-04-30 15:02:55 +08:00
lizhimins 6eac107005 [ISSUE #6633] [RIP-65] Improving Tiered Storage Implementation (#6781)
[ISSUE #6633] [RIP-65] Improving Tiered Storage Implementation
2023-06-09 21:07:53 +08:00
TheR1sing3un 450d0d69cc [ISSUE #6154] Support Amazon S3 backend in TieredStorage (#6495)
* support s3 backend in tiered storage

* refactor(tieredstorage): Unify all object storage configuration properties

1. Unify all object storage configuration properties

* refactor(tieredstorage): replace some lambda function with more simple expression

1. replace some lambda function with more simple expression

* style(tieredstorage): perfect comments on ChunkMetadata

1. perfect comments on ChunkMetadata

* refactor(tieredstorage): perfect lambda expression

1. perfect lambda expression

* fix(tieredstorage): fix unmatched config attributes in brokerS3.conf

1. fix unmatched config attributes in brokerS3.conf

* feat(tieredstorage): More context in logging output

1. More context in logging output

* fix(tieredstorage): fix wrong concurrently put

1. fix wrong concurrently put

* test(tieredstorage): add UT to verify TieredFileSegmentInputStream

1. add UT to verify TieredFileSegmentInputStream

* refactor(tieredstorage): better code placement

1. better code placement

* refactor(tieredstorage): refactor TieredFileSegmentInputStream for better understandability

1. refactor TieredFileSegmentInputStream for better understandability

* feat(tieredstorage): support `reset` of TieredFileSegmentInputStream

1. support `reset` of TieredFileSegmentInputStream

* fix(tieredstorage): fix wrong position when failed in `S3FileSegment#commit0`

1. fix wrong position when failed in `S3FileSegment#commit0`

* fix(tieredstorage): fix still have upload buffer when already seal the segment

1. fix still have upload buffer when already seal the segment

* test(tieredstorage): fix wrong assertion

1. fix wrong assertion

* feat(tieredstorage): support switch to enable merge chunks into segment

1. support switch to enable merge chunks into segment

* feat(tieredstorage): add more debug log in TieredMessageStore

1. add more debug log in TieredMessageStore

* style(tieredstorage): use rmq code style

1. use rmq code style

* feat(tieredstorage): add metrics for S3 provider

1. add metrics for S3 provider

* fix(tieredstorage): resolve conflicts after rebasing master

1. resolve conflicts after rebasing master

Closes https://github.com/apache/rocketmq/issues/6624

* style(tieredstorage): change log level

1. change log level

Closes https://github.com/apache/rocketmq/issues/6154

* build(controller): build tieredstorage with bazel

1. build tieredstorage with bazel

* build(controller): build tieredstorage with bazel

1. build tieredstorage with bazel

* style(tieredstorage): change log level

1. change log level

Closes https://github.com/apache/rocketmq/issues/6154

* test(tieredstorage): ignore tests about S3Mock

1. ignore tests about S3Mock

* test(tieredstorage): ignore tests about S3Mock

1. ignore tests about S3Mock
2023-06-07 13:07:51 +08:00
Aaron Ai a68078fef8 [ISSUE #5484] Replace logging module with the shaded logback (#5540)
* Replace logging module with the shaded logback

* Add license header

* Fix bazel compile issue
2022-11-21 16:30:15 +08:00
yukon 506b563f55 Revert "[ISSUE #5484] Replace Logging Module with Shaded Logback (#5524)" (#5537)
This reverts commit 809ff6b3e0.
2022-11-17 20:04:17 +08:00
Aaron Ai 809ff6b3e0 [ISSUE #5484] Replace Logging Module with Shaded Logback (#5524)
* Remove ClientLogger

* WIP

* WIP

* Rename logger to log

* Make it compile

* WIP

* Fix bazel to use shaded slf4j

* Fix DeleteExpiredCommitLogSubCommandTest

* Fix pom.xml duplication

* Fix maven deps

* Add test logback configuration file

* Fix unit test output

* Fix logback configuration file

* All logging are made on top of slf4j

* Fix test log configuration file name

* Fix test log configuration file name for test module

* All logging are shaded slf4j targeted

* DLedger has an explicit dependency on slf4j

* Fix DLedger

* Fix DLeader issue

* Move logback configuration files to each module

Co-authored-by: Li Zhanhui <lizhanhui@gmail.com>
2022-11-17 00:38:28 +08:00
lizhimins b511e09772 [ISSUE #5095] [Remoting-A] Support logging rpc distribution in remoting protocol (#5114)
* [ISSUE #5087] [Remoting-A] Support logging rpc distribution in remoting protocol

* [ISSUE #5087] [Remoting-A] Support logging rpc distribution in remoting protocol

* [ISSUE #5087] [Remoting-A] Support logging rpc distribution in remoting protocol

* [ISSUE #5087] [Remoting-A] Support logging rpc distribution in remoting protocol

* [ISSUE #5087] [Remoting-A] Support logging rpc distribution in remoting protocol

Co-authored-by: 斜阳 <terrance.lzm@alibaba-inc.com>
2022-09-19 17:07:49 +08:00
lk 6f75e3d699 [ISSUE #5069] polish the startup of proxy; can specify parameters on the command line of proxy (#5083)
undefined
2022-09-16 17:31:27 +08:00
echooymxq 21f3a0bb41 Add Controller's log to Namesrv when enableControllerInNamesrv=true. (#4844) 2022-08-19 11:43:01 +08:00
rongtong 0b6563b58f Add getControllerConfig and updateControllerConfig command for admin CLI (#4793) 2022-08-07 15:28:51 +08:00
mxsm 273f274ec8 [ISSUE #4781] Add config file for controller run as Namesrv plugin (#4787)
LGTM
2022-08-05 09:48:33 +08:00
mxsm c6b3a66ecf [ISSUE #4706] fix console printed log format is incorrect (#4716) 2022-08-03 09:19:03 +08:00
mxsm 46dd8835f8 [ISSUE #4746] add controller stand-alone and cluster 3 nodes config file (#4747) 2022-08-01 09:25:31 +08:00
RongtongJin dd09f2b782 Merge remote-tracking branch 'apache/develop' into 5.0.0-beta-dledger-controller
# Conflicts:
#	distribution/bin/mqshutdown
#	pom.xml
2022-07-20 10:53:39 +08:00
zhouxiang 9fbaced20f Merge branch 'develop' into feature/grpc-develop-v2 2022-07-14 14:15:30 +08:00
kaiyi.lk 73618554f2 [ISSUE #3949] for code style 2022-07-13 11:30:50 +08:00
zhouxiang 86284b4e1e [ISSUE #3949] Modify default configuration location 2022-07-13 11:29:28 +08:00
Jixiang.jjx e319024fa2 [ISSUE #3949] Add logger config and rename GrpcService to GrpcForwardService. 2022-07-13 11:29:08 +08:00
RongtongJin a55a621594 Merge branch 'develop-merge-5.0.0' into 5.0.0-beta-dledger-controller
# Conflicts:
#	broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java
#	store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
#	tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
2022-07-08 15:35:41 +08:00
RongtongJin 833e9e0e07 Polish conf/container directory 2022-07-08 15:16:18 +08:00
RongtongJin 3fadc8f30c Merge branch '5.0.0-beta' into develop
# Conflicts:
#	acl/pom.xml
#	broker/pom.xml
#	broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
#	broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java
#	broker/src/main/java/org/apache/rocketmq/broker/plugin/MessageStoreFactory.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/ForwardRequestProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/QueryMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
#	broker/src/main/java/org/apache/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java
#	broker/src/test/java/org/apache/rocketmq/broker/processor/SendMessageProcessorTest.java
#	client/pom.xml
#	client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragely.java
#	client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyByCircle.java
#	client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
#	common/pom.xml
#	common/src/main/java/org/apache/rocketmq/common/MQVersion.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/header/PullMessageRequestHeader.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/route/BrokerData.java
#	common/src/main/java/org/apache/rocketmq/common/protocol/route/TopicRouteData.java
#	common/src/main/java/org/apache/rocketmq/common/sysflag/MessageSysFlag.java
#	common/src/main/java/org/apache/rocketmq/common/utils/ServiceProvider.java
#	common/src/test/java/org/apache/rocketmq/common/message/MessageDecoderTest.java
#	distribution/pom.xml
#	example/pom.xml
#	filter/pom.xml
#	logging/pom.xml
#	logging/src/main/java/org/apache/rocketmq/logging/inner/Level.java
#	namesrv/pom.xml
#	namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
#	namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessor.java
#	namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
#	openmessaging/pom.xml
#	pom.xml
#	remoting/pom.xml
#	remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
#	remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
#	remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingCommand.java
#	remoting/src/main/java/org/apache/rocketmq/remoting/protocol/RemotingSerializable.java
#	srvutil/pom.xml
#	store/pom.xml
#	store/src/main/java/org/apache/rocketmq/store/CommitLog.java
#	store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java
#	store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
#	store/src/main/java/org/apache/rocketmq/store/MultiDispatch.java
#	store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
#	store/src/main/java/org/apache/rocketmq/store/ha/HAConnection.java
#	store/src/main/java/org/apache/rocketmq/store/ha/HAService.java
#	store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java
#	store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
#	store/src/main/java/org/apache/rocketmq/store/stats/BrokerStatsManager.java
#	store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
#	store/src/test/java/org/apache/rocketmq/store/MultiDispatchTest.java
#	store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
#	test/pom.xml
#	tools/pom.xml
#	tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java
#	tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
#	tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java
#	tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
#	tools/src/main/java/org/apache/rocketmq/tools/command/topic/DeleteTopicSubCommand.java
2022-07-08 15:03:54 +08:00
Oliver 8a48445377 [ISSUE #4461] Support to change the logger level dynamically (#4547)
* Support to change the logger level dynamically

* Adjust interval
2022-07-04 11:06:09 +08:00
rongtong a8549e24a1 Add deploy and upgrade guide document for controller mode (#4476)
* Add deployment and upgrade guide document

* Minor fix
2022-06-18 14:24:37 +08:00
hzh0425 55a0e7b884 [Summer of code] Add design and quick_start document for controller mode (#4413)
* add design document

* add quickstart document

* review

* add dledgerController design

* add license
2022-06-06 11:36:03 +08:00
hzh0425 12d9207d41 [Summer of code] Add sh conf for controller 2022-06-03 16:50:04 +08:00
RongtongJin e678ee6f91 Add ASF header for unapproved file 2022-03-14 16:25:49 +08:00
rongtong fb9e3f05bb feature(logging&tools&distribution&docs):[RIP-31][PART-A]Support RocketMQ BrokerContainer (#3977) 2022-03-14 14:50:48 +08:00
RongtongJin 3aa31a6a36 Merge remote-tracking branch 'apache/develop' into 5.0.0-alpha
# Conflicts:
#	acl/pom.xml
#	broker/pom.xml
#	client/pom.xml
#	common/pom.xml
#	common/src/main/java/org/apache/rocketmq/common/MQVersion.java
#	distribution/pom.xml
#	example/pom.xml
#	filter/pom.xml
#	logging/pom.xml
#	namesrv/pom.xml
#	openmessaging/pom.xml
#	pom.xml
#	remoting/pom.xml
#	srvutil/pom.xml
#	store/pom.xml
#	store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
#	test/pom.xml
#	tools/pom.xml
2022-03-12 21:15:45 +08:00
caigy 7a5d937c76 [Issue #3922] Fix bugs in ACL modification (#3927)
* fix NPE when updating account auth if no accounts defined in acl config file

* fix: creating globalWhiteRemoteAddresses failed when default acl config file did not exist

* move plain_acl.yml out of conf/acl/: conf/plain_acl.yml is the default acl config file and config of different accounts can be placed under conf/acl/

* fix merge problem

* fix: 1. errors when processing empty config files;  2.accounts can't be added back after deleting account part in ACL config files

* fix merge problem

* fix test bug

* add test

* add missing test config files
2022-03-07 17:11:09 +08:00
RongtongJin 0d15e6c2d5 Merge 5.0.0-alpha-merge with develop branch 2022-02-25 17:43:06 +08:00
sunxi92 c1bb6aa27b [ISSUE #2986] Support for multiple ACL files in a fixed directory (#3761)
* acl temp

* acl

* fix test case

* fix code style issues

* add considerations on compatibility to the original one ACL config file and scalability of supporting multiple config files in different directories.

* fix test case testWatch

* 1.fix some issues
2.add a detailed design document

* Add warn log when the accesskey is repeated in multiple ACL files.

* 1.Change the folder of acl configuration to conf/acl
2.Add the logic to check if path is a directory in the method of getAllAclFiles(String path)

* Add a parameter in AclFileWatchService constructor.

* Add logic to determine if path exists in the getAllAclFiles(String path) method in PlainPermissionManager.java and AclFileWatchService.java

* Fix the serialization problem of allAclFileVersion field in clusterAclConfigVersion command

* 1.Fix the serialization problem of allAclFileVersion field in clusterAclConfigVersion command
2.Improve the logic of updateAccessConfig method
2022-02-19 09:52:31 +08:00
zhangjidi2016 e0406b2aa4 [ISSUE #3173]Isolate Broker logs when multiple Broker services are deployed on the same machine 2021-07-23 14:42:28 +08:00
chenzlalvin f399085749 [RIP-21] submodule tools 2021-07-15 20:31:44 +08:00
ayanamist ced6b02358 [RIP-19] Pop Consuming (broker) 2021-03-29 10:33:33 +08:00
Hu Zongtang 929c76c62b [ISSUE #1147]Broker will report Exception if open the aclEnable and enableDLegerCommitLog flag at the same time. (#1149)
* [issue#1078]fix User can't use mqadmin command normally if they don't copy the tool.yml file to their related fold and AclEnable flag is closed.

* [issue#1147]Broker will report Exception if open the aclEnable and enableDLegerCommitLog flag at the same time.

* [issue#1147]Broker will report Exception if open the aclEnable and enableDLegerCommitLog flag at the same time.

* [issue#1147]Add the restriction of Acl in the acl's user guide.

* [issue#1147]Adjust some codes for acl issue that users can't open the aclEnable and use Master/Slave or Dledger the same time.

* [issue#1147]Adjust and optimize some codes for acl issue that users can't open the aclEnable and use Master/Slave or Dledger the same time.

* [issue#1147]return back for original codes for acl issue that users can't open the aclEnable and use Master/Slave or Dledger the same time.
2019-04-27 10:29:37 +08:00
dongeforever 0586d575c5 Merge branch 'develop' into store_with_dledger
# Conflicts:
#	.gitignore
2019-01-31 15:05:35 +08:00
dongeforever be83a9a3ba Polish acl names 2018-12-29 12:59:43 +08:00
dongeforever 1a80c5ba57 Trivial pilishment for acl and msg_trace 2018-12-29 12:03:40 +08:00
dongeforever 89c0668c0f Add example conf and bin for dledger 2018-12-27 16:56:57 +08:00
dongeforever 4250af6e56 Merge branch 'feature_acl' into msg_track 2018-12-26 21:23:26 +08:00
wangshaojie4039 459b246d28 [ISSUE#403] fix some bugs and Optimization code for rocketmq's acl feature. (#632)
* [ISSUE#403] fix some bugs and Optimization code for rocketmq's acl feature. 

* [ISSUE#403] fix some bugs and Optimization code for rocketmq's acl feature. 

* Update MQAdminStartup.java

* Update MQAdminStartup.java
2018-12-26 18:51:23 +08:00
huzongtang 7a48d370b4 [ISSUE#403] add the conf/plain_acl.yml file for acl_feature. 2018-12-26 00:21:22 +08:00
laohu c127438371 handle TODO 2018-12-13 09:15:09 +08:00
laohu 23a24c44f0 Seamless cloud 2018-12-10 08:55:29 +08:00
dongeforever 5d253f58d6 Add signature and redesign the permission graph 2018-12-03 22:20:16 +08:00
huzongtang e04db85e66 I have finished developing the new feature for the message track #525 initially. 2018-11-14 00:16:40 +08:00
laohu 94403714ee add acl use example. AclClient.java 2018-11-08 13:03:03 +08:00
ymwneu 37223cac73 [ISSUE #512]Bugfix for option -p can not print config items when using admin tool (#514) 2018-11-02 22:26:29 +08:00
laohu 74f4213b06 arrange 2018-11-01 20:07:27 +08:00