Commit Graph
184 Commits
Author SHA1 Message Date
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
RongtongJin 78dde88cf9 Prepare for next development iteration 2022-03-12 21:13:24 +08:00
RongtongJin a17fa7605c [maven-release-plugin] prepare release rocketmq-all-5.0.0-ALPHA 2022-03-11 10:37:19 +08:00
RongtongJin e33213c752 Upgrade version to 5.0.0-alpha-snapshot 2022-03-04 16:44:03 +08:00
RongtongJin 87d9614d34 Resolve all conflicts and pass all UTs 2022-03-04 16:38:04 +08:00
HuiTong 42d1565fee [ISSUE #3890] add 'brokerAddress' param for ConsumerConnectionSubCommand (#3891)
* fix scheduleAtFixedRate bug

* add consumerConnection Command -b param

* rollback
2022-03-01 12:35:38 +08:00
RongtongJin 0d15e6c2d5 Merge 5.0.0-alpha-merge with develop branch 2022-02-25 17:43:06 +08:00
tigerlee b606d9c638 [maven-release-plugin] prepare for next development iteration 2022-02-22 00:25:55 +08:00
tigerlee c7989f8574 [maven-release-plugin] prepare release rocketmq-all-4.9.3 2022-02-22 00:25:37 +08:00
tigerlee 13933297d1 [maven-release-plugin] prepare for next development iteration 2022-02-21 21:33:20 +08:00
tigerlee 666e96b6dd [maven-release-plugin] prepare release rocketmq-all-4.9.3 2022-02-21 21:33:02 +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
Hongjian Fei e8cf133874 [ISSUE #3708] Both CQ and BCQ need to be supported in DefaultMessageStore. (#3712)
* [RIP-26] Both CQ and BCQ will be supported in DefaultMessageStore.

* [RIP-26] Both CQ and BCQ will be supported in DefaultMessageStore.
2022-02-08 10:38:41 +08:00
Hongjian Fei 18010a4d30 [ISSUE #3679] Support topic attributes (#3698)
* [Feature] Support topic attributes.

* [Feature] Topic attributes unit-test.
2022-02-08 10:38:41 +08:00
zhangyang21 a01433094b [tools] Fix parameter conflicts
Signed-off-by: zhangyang21 <zhangyang21@xiaomi.com>
2022-02-08 10:38:41 +08:00
hill007299 6ba93446b3 [RIP-19] Pop Consuming (tools)
Conflicts:
	tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java
	tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java
	tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
2022-02-08 10:38:41 +08:00
dongeforever b6ff649291 feat(all):new feature for static topic 2022-02-08 10:38:41 +08:00
tiger lee a62b70bc25 Merge pull request #1077 from ssssssnake/issue-resetOffsetByTime
[ISSUE #951]Fixed an incorrect offset problem in the ResetOffsetByTimeCommand
2022-01-18 00:53:46 +08:00
zhaohai 6dff04fcb6 [ISSUE #3642] Display GID and Topic with namespace (#3648) 2022-01-14 13:58:49 +08:00
weibubli d564dcd31a [ISSUE #3709] Resolve export metadata errors while multiple brokers. (#3727)
* Update ExportMetadataCommand.java

* Update ExportMetadataCommand.java
2022-01-07 20:23:15 +08:00
tiger lee e15452940a Merge pull request #2970 from zhangjidi2016/add_skipAccumulatedMessage_command
[ISSUE #2969] Add a skip accumulation message command in mqadmin.
2022-01-06 20:15:58 +08:00
zhangjidi2016 0ceb9e6ceb [ISSUE #3696]Optimize the query consumer connection display (#3697) 2022-01-06 09:34:33 +08:00
huitong 6ebb4e40d4 fix topicRouteMap maintain error relationship 2022-01-04 11:40:44 +08:00
xijiu 8540da4449 [ISSUE #3674] Improve the test cases of the tools module (#3672)
* move the filtering logic to client

* fix error test

* fix all junit test except QueryMsgTraceByIdSubCommand

* fix some junit test exception

* Run through all test cases

* Code optimization

* extract the startNameServer, eliminate duplicate code
2021-12-28 09:02:16 +08:00
ChaosYjhandyuanjunhui 7591227a83 [ISSUE #1486] fix CleanUnusedTopicCommand performs wrong (#1487)
Co-authored-by: yuanjunhui <yuanjunhui1991@qq.com>
2021-12-20 18:45:48 +08:00
1e314f4100 [ISSUE #3593] entrySet() replace keySet() (#3595)
* entrySet() replace keySet()

* update variable name

* Update AllocateMachineRoomNearby.java

* remove set

Co-authored-by: zh378814 <wb-zh378814@alibaba-inc.com>
Co-authored-by: yuz10 <845238369@qq.com>
2021-12-09 15:13:13 +08:00
zhaohaiandzh378814 a779d69862 Unnecessary boxing of primitives (#3596)
Co-authored-by: zh378814 <wb-zh378814@alibaba-inc.com>
2021-12-07 12:35:43 +08:00
lushilinandlushilin 3084713807 [ISSUE #3551] Fix admin cloneoffset
Co-authored-by: lushilin <lushilin.me@bytedance.com>
2021-12-07 11:28:34 +08:00
RongtongJin 4506f34e24 Resolve some conflicts in the merge that prevent compilation from succeeding 2021-11-01 21:01:46 +08:00
RongtongJin f1b0318d1a Merge remote-tracking branch 'apache/develop' into 5.0.0-alpha
# Conflicts:
#	.travis.yml
#	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
#	logappender/pom.xml
#	logging/pom.xml
#	namesrv/pom.xml
#	openmessaging/pom.xml
#	pom.xml
#	remoting/pom.xml
#	srvutil/pom.xml
#	store/pom.xml
#	store/src/main/java/org/apache/rocketmq/store/GetMessageResult.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/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
2021-11-01 12:46:26 +08:00
tigerlee 21faa68b4c [maven-release-plugin] prepare for next development iteration 2021-10-22 13:44:14 +08:00
tigerlee c840b20833 [maven-release-plugin] prepare release rocketmq-all-4.9.2 2021-10-22 13:43:57 +08:00
Git_Yang a2c6d33a2b [ISSUE #3415] Fix the problem of failure during checkstyle execution
Signed-off-by: zhangyang21 <zhangyang21@xiaomi.com>
2021-10-15 14:30:40 +08:00
panzhi cd45023d61 [ISSUE #3148]Support metadata export (#3149) 2021-10-13 19:47:51 +08:00
tiger lee 7755aaa2bf Merge pull request #3039 from Aaron-He/dev20210623
[ISSUE #2962] Implement DefaultMQAdminExt::examineTopicConfig function
2021-10-07 18:30:58 +08:00
孙不服 daf1b9df79 [ISSUE #503] NOT_CONSUME_YET not righht in RocketMQ Console (#3091) 2021-09-27 09:07:59 +08:00
odbozhou 2bf133be29 Merge branch 'develop' into 5.0.0-preview
# Conflicts:
#	.travis.yml
#	acl/pom.xml
#	broker/pom.xml
#	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/SendMessageProcessor.java
#	client/pom.xml
#	client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java
#	client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
#	client/src/test/java/org/apache/rocketmq/client/impl/MQClientAPIImplTest.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
#	distribution/pom.xml
#	example/pom.xml
#	filter/pom.xml
#	logappender/pom.xml
#	logging/pom.xml
#	namesrv/pom.xml
#	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
#	srvutil/pom.xml
#	store/pom.xml
#	store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
#	test/pom.xml
#	tools/pom.xml
#	tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
2021-09-24 15:35:46 +08:00
tiger lee a9837d9c3c Merge pull request #2965 from zhangjidi2016/add_getConsumerConfig_command
[ISSUE #2964] Add a query consumer config command in mqadmin.
2021-09-18 01:04:42 +08:00
yuz10 147d23e3ed [ISSUE #3281 ][acl] fix fail to delete topic perm list and global white address(#3128) (#3280)
* fix fail to remove topic/group permissions and global white address of acl config

* update acl config for all brokers

* refactor rename UtilAll.string2List and list2String

* fix fail to remove whiteRemoteAddress of acl config
2021-09-14 15:33:38 +08:00
tiger lee f9a0f530e6 Merge pull request #1858 from coder-zzzz/github_features/#1848
[ISSUE #1848] Add write perm admin command
2021-09-13 14:11:20 +08:00
odbozhou 48d3c7eeba [maven-release-plugin] prepare for next development iteration 2021-08-27 15:17:29 +08:00
odbozhou d969670ea5 [maven-release-plugin] prepare release rocketmq-all-5.0.0-PREVIEW 2021-08-27 15:17:11 +08:00
odbozhou bb6daf7883 change version to 5.0.0-PREVIEW-SNAPSHOT 2021-08-27 10:59:32 +08:00
odbozhou 86193a844b change version to 5.0.0-PREVIEW 2021-08-27 10:54:47 +08:00
gorden5566 44bdeedad2 [ISSUE 3203] Replace the class 'StringBuffer' by 'StringBuilder' (#3204) 2021-08-04 14:02:47 +08:00
zongtanghu bb34171289 [maven-release-plugin] prepare for next development iteration 2021-08-01 20:01:59 +08:00
zongtanghu e9c4253218 [maven-release-plugin] prepare release rocketmq-all-4.9.1 2021-08-01 20:01:39 +08:00
zhangjidi2016andzhangjidi2016 17b9efe16d [ISSUE #3177]updateAclConfig in all brokers. (#3184)
Co-authored-by: zhangjidi2016 <zhangjidi@cmss.chinamobile.com>
2021-07-30 13:41:52 +08:00
chenzlalvin f399085749 [RIP-21] submodule tools 2021-07-15 20:31:44 +08:00
Heng Du 2a6371765e Merge pull request #2882 from zhurunhua/RocketMQ-zhurunhua
[ISSUE #3112]Fix: update the option's description of delete/update access config command
2021-07-02 19:22:07 +08:00