Commit Graph

7194 Commits

Author SHA1 Message Date
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
Qingshan Lin e6b4e15ebf Merge pull request #4225 from drpmma/feature/grpc-develop-v2
[ISSUE #3949] Support gRPC protocol
2022-07-20 10:36:21 +08:00
zhouxiang a483f2c145 Fix unit test conflict 2022-07-20 10:34:46 +08:00
djlnet 89cb8cce87 [ISSUE #4630] Fix RequestTask's stopRun field concurrency issues(#4631) (#4631)
Co-authored-by: djl <djl.du@huolala.cn>
2022-07-20 10:20:57 +08:00
RongtongJin 91d36fd540 Remove unnecessary ignore test 2022-07-20 10:18:30 +08:00
Oliver cdb4bd94ff [ISSUE #4167] Add unit test (ConsumerManagerTest) (#4633) 2022-07-20 10:08:27 +08:00
zhouxiang f51f9f657f Merge branch 'develop' into feature/grpc-develop-v2 2022-07-19 21:35:20 +08:00
zhouxiang 973359f2e6 [ISSUE #3949] Update rocketmq-proto to 2.0.0 2022-07-19 20:50:41 +08:00
zhouxiang 094a78d011 [ISSUE #3949] fix unit test 2022-07-19 20:50:29 +08:00
zhouxiang 852e9545d3 [ISSUE #3949] Add updateSubscription for registerConsumer 2022-07-19 20:35:36 +08:00
kaiyi.lk 77df4ce108 [ISSUE #3949] doc 2022-07-19 19:07:04 +08:00
zhouxiang 6bcda57b36 [ISSUE #3949] Remove unused variables 2022-07-19 17:58:19 +08:00
zhouxiang f88df48baf [ISSUE #3949] Set topic for LocalMessageService 2022-07-19 17:58:19 +08:00
Jixiang.jjx 9a0481c0b5 Merge branch 'feature/grpc-develop-v2' of github.com:drpmma/rocketmq into feature/grpc-develop-v2
* 'feature/grpc-develop-v2' of github.com:drpmma/rocketmq:
  [ISSUE #3949] set delay level for message; use byte to calculate property size
2022-07-19 16:39:17 +08:00
Jixiang.jjx 9f9f9ed22d [ISSUE #3949] ignore exception for parsing grpc client version. 2022-07-19 16:38:56 +08:00
kaiyi.lk 657d5edfb9 [ISSUE #3949] set delay level for message; use byte to calculate property size 2022-07-19 16:38:49 +08:00
zhouxiang 94153b0311 [ISSUE #3949] Check handleGroup 2022-07-19 15:01:06 +08:00
lizhimins eb4e684642 [ISSUE #4626] Add CRC32 verification when saving checkpoint file (#4627)
* Add CRC32 verification when saving checkpoint file

* Add license to header
2022-07-18 20:28:07 +08:00
Heng Du f751fc313c Merge pull request #4629 from fujian-zfj/develop-1
[ISSUE #4628] Fix bug in LMQ when checking multiple Dispatch Queue
2022-07-18 20:02:30 +08:00
kaiyi.lk ef718d2229 [ISSUE #3949] parameter validate 2022-07-18 19:19:32 +08:00
fujian.zfj edf2ee00a6 map null exception 2022-07-18 17:36:35 +08:00
lizhiboo d930cb96ad [ISSUE #4624] Add plain_acl_bak.xml for reset at test case start. (#4625)
* add plain_acl_bak.xml to reset at test case start.

* add license

* reset file at test case start
2022-07-18 17:28:23 +08:00
zhouxiang ac6ccc5445 [ISSUE #3905] Support bname in protocol 2022-07-18 14:21:32 +08:00
rongtong 3ee603a49b Try to make CI test more stable (#4616) 2022-07-18 09:19:43 +08:00
panzhi 0ba53e50bd Merge pull request #4619 from Oliverwqcwrw/develop-fix-typo-27
[ISSUE #4167] Fix typo
2022-07-17 20:29:24 +08:00
panzhi d9cec7f6b1 Merge pull request #4618 from Oliverwqcwrw/develop-same-addr-27
[ISSUE #4617] Correct log info
2022-07-17 20:27:31 +08:00
Oliver c1b14b0dde Fix typo 2022-07-16 22:23:23 +08:00
Oliver 870e8e462e Fix issue 4617 2022-07-16 20:54:14 +08:00
cserwen 00da3e7249 [ISSUE #4606] Build trace msgs for DefaultLitePullConsumer when poll is called
Co-authored-by: dengzhiwen1 <dengzhiwen1@xiaomi.com>
2022-07-15 17:33:54 +08:00
rongtong 225bc42f95 Fix the wrong format output of clusterlist command (#4608) 2022-07-15 10:21:11 +08:00
Heng Du 29713cb229 Merge pull request #4586 from Oliverwqcwrw/develop-add-ut-20
[ISSUE #4579] Add unit test
2022-07-15 08:52:26 +08:00
Oliver 74e1a60b37 [ISSUE #4597] Fix inaccurate judgement 2022-07-14 17:16:05 +08:00
zhouxiang 1a542d9450 add rmq-proxy.json to license ignore 2022-07-14 14:32:35 +08:00
zhouxiang 67517545b2 fix pom.xml 2022-07-14 14:19:41 +08:00
zhouxiang 9fbaced20f Merge branch 'develop' into feature/grpc-develop-v2 2022-07-14 14:15:30 +08:00
RongtongJin cc4c19642c Change the loading order of HAService 2022-07-14 11:56:15 +08:00
dependabot[bot] b136f9bb67 Bump commons-io from 2.6 to 2.7 (#4600)
Bumps commons-io from 2.6 to 2.7.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-14 09:08:45 +08:00
RongtongJin 67a526211e Use ${dledger.version} instead of fixed version in pom file 2022-07-13 20:57:16 +08:00
zhouxiang fc39bd6dcf [ISSUE #3949] Refine README 2022-07-13 19:18:03 +08:00
RongtongJin ed8922cdd3 1. Add back main0 function in NamesrvStartup for compatibility
2. Make changeToMaster and changeToSlave have default implementation
2022-07-13 15:13:30 +08:00
RongtongJin 8dfa8813c4 Merge remote-tracking branch 'apache/develop' into 5.0.0-beta-dledger-controller 2022-07-13 15:10:01 +08:00
Heng Du 10326b479a Merge pull request #4578 from apache/develop-merge-5.0.0
The code of 5.0.0-beta merge into develop branch
2022-07-13 14:54:23 +08:00
zhouxiang 5d10401ab0 Remove annotation 2022-07-13 11:33:01 +08:00
yuncun.sl 72343c9f08 pass compile 2022-07-13 11:33:01 +08:00
yuncun.sl baa36b4ec9 pass compile 2022-07-13 11:33:01 +08:00
kaiyi.lk 6634a6a03a [ISSUE #3949] fix test cases 2022-07-13 11:33:01 +08:00
kaiyi.lk b6a70e2984 [ISSUE #3949] add parameter validator 2022-07-13 11:33:01 +08:00
凌楚 be02f46b57 Adapt with the latest protocol 2022-07-13 11:33:01 +08:00
凌楚 c6918ea20f Add GrpcClientSettingsManager#mergeMetric 2022-07-13 11:33:01 +08:00
kaiyi.lk 5fb094a2c4 [ISSUE #3949] config transactionDataExpireMillis and transactionDataMaxNum 2022-07-13 11:33:01 +08:00