You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by GitBox <gi...@apache.org> on 2022/06/15 14:26:20 UTC
[GitHub] [rocketmq] RongtongJin opened a new pull request, #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
RongtongJin opened a new pull request, #4467:
URL: https://github.com/apache/rocketmq/pull/4467
## What is the purpose of the change
Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
## Brief changelog
Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
## Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily. Notice, `it would be helpful if you could finish the following 5 checklist(the last one is not necessary)before request the community to review your PR`.
- [x] Make sure there is a [Github issue](https://github.com/apache/rocketmq/issues) filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
- [x] Format the pull request title like `[ISSUE #123] Fix UnknownException when host config not exist`. Each commit in the pull request should have a meaningful subject line and body.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit-test(over 80% coverage) to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in [test module](https://github.com/apache/rocketmq/tree/master/test).
- [x] Run `mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyle` to make sure basic checks pass. Run `mvn clean install -DskipITs` to make sure unit-test pass. Run `mvn clean test-compile failsafe:integration-test` to make sure integration-test pass.
- [ ] If this contribution is large, please file an [Apache Individual Contributor License Agreement](http://www.apache.org/licenses/#clas).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] ShannonDing merged pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
ShannonDing merged PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] tsunghanjacktsai commented on a diff in pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
tsunghanjacktsai commented on code in PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#discussion_r898661755
##########
common/src/main/java/org/apache/rocketmq/common/MixAll.java:
##########
@@ -77,6 +77,7 @@ public class MixAll {
public static final long FIRST_SLAVE_ID = 1L;
public static final long CURRENT_JVM_PID = getPID();
public final static int UNIT_PRE_SIZE_FOR_MSG = 28;
+ public final static int ALL_ACK_IN_SYNC_STATE_SET_NUM = -1;
Review Comment:
Would better just name it in ALL_ACK_IN_SYNC_STATE_SET without NUM since it's only a constant status. Adding NUM seems a bit weird.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] codecov-commenter commented on pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#issuecomment-1157148006
# [Codecov](https://codecov.io/gh/apache/rocketmq/pull/4467?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#4467](https://codecov.io/gh/apache/rocketmq/pull/4467?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (53fbebf) into [5.0.0-beta-dledger-controller](https://codecov.io/gh/apache/rocketmq/commit/fd804d9a95346b005e8c62c6f275e4bb710e1a53?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (fd804d9) will **decrease** coverage by `0.03%`.
> The diff coverage is `92.85%`.
```diff
@@ Coverage Diff @@
## 5.0.0-beta-dledger-controller #4467 +/- ##
===================================================================
- Coverage 43.20% 43.17% -0.04%
+ Complexity 6365 6354 -11
===================================================================
Files 841 841
Lines 59862 59859 -3
Branches 8160 8161 +1
===================================================================
- Hits 25864 25844 -20
- Misses 30650 30663 +13
- Partials 3348 3352 +4
```
| [Impacted Files](https://codecov.io/gh/apache/rocketmq/pull/4467?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...main/java/org/apache/rocketmq/store/CommitLog.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c3RvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3JvY2tldG1xL3N0b3JlL0NvbW1pdExvZy5qYXZh) | `68.24% <90.00%> (-0.09%)` | :arrow_down: |
| [...apache/rocketmq/store/ha/GroupTransferService.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c3RvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3JvY2tldG1xL3N0b3JlL2hhL0dyb3VwVHJhbnNmZXJTZXJ2aWNlLmphdmE=) | `92.30% <100.00%> (ø)` | |
| [.../org/apache/rocketmq/store/PutMessageSpinLock.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c3RvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3JvY2tldG1xL3N0b3JlL1B1dE1lc3NhZ2VTcGluTG9jay5qYXZh) | `85.71% <0.00%> (-14.29%)` | :arrow_down: |
| [.../broker/subscription/SubscriptionGroupManager.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YnJva2VyL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9yb2NrZXRtcS9icm9rZXIvc3Vic2NyaXB0aW9uL1N1YnNjcmlwdGlvbkdyb3VwTWFuYWdlci5qYXZh) | `68.79% <0.00%> (-14.19%)` | :arrow_down: |
| [...etmq/namesrv/routeinfo/BatchUnRegisterService.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-bmFtZXNydi9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvcm9ja2V0bXEvbmFtZXNydi9yb3V0ZWluZm8vQmF0Y2hVblJlZ2lzdGVyU2VydmljZS5qYXZh) | `94.73% <0.00%> (-5.27%)` | :arrow_down: |
| [...ache/rocketmq/broker/topic/TopicConfigManager.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YnJva2VyL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9yb2NrZXRtcS9icm9rZXIvdG9waWMvVG9waWNDb25maWdNYW5hZ2VyLmphdmE=) | `59.28% <0.00%> (-3.06%)` | :arrow_down: |
| [...mq/store/ha/autoswitch/AutoSwitchHAConnection.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c3RvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3JvY2tldG1xL3N0b3JlL2hhL2F1dG9zd2l0Y2gvQXV0b1N3aXRjaEhBQ29ubmVjdGlvbi5qYXZh) | `73.51% <0.00%> (-1.90%)` | :arrow_down: |
| [...che/rocketmq/namesrv/kvconfig/KVConfigManager.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-bmFtZXNydi9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvcm9ja2V0bXEvbmFtZXNydi9rdmNvbmZpZy9LVkNvbmZpZ01hbmFnZXIuamF2YQ==) | `59.18% <0.00%> (-1.03%)` | :arrow_down: |
| [.../apache/rocketmq/logging/inner/LoggingBuilder.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-bG9nZ2luZy9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvcm9ja2V0bXEvbG9nZ2luZy9pbm5lci9Mb2dnaW5nQnVpbGRlci5qYXZh) | `63.44% <0.00%> (-0.95%)` | :arrow_down: |
| [.../org/apache/rocketmq/store/ha/DefaultHAClient.java](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c3RvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3JvY2tldG1xL3N0b3JlL2hhL0RlZmF1bHRIQUNsaWVudC5qYXZh) | `57.94% <0.00%> (-0.52%)` | :arrow_down: |
| ... and [7 more](https://codecov.io/gh/apache/rocketmq/pull/4467/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/rocketmq/pull/4467?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/rocketmq/pull/4467?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [fd804d9...53fbebf](https://codecov.io/gh/apache/rocketmq/pull/4467?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] coveralls commented on pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
coveralls commented on PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#issuecomment-1157148101
[](https://coveralls.io/builds/50075603)
Coverage increased (+0.06%) to 47.452% when pulling **53fbebf70f9e1249c390c243d66acd091f2555d5 on RongtongJin:5.0.0-beta-dledger-controller-6** into **fd804d9a95346b005e8c62c6f275e4bb710e1a53 on apache:5.0.0-beta-dledger-controller**.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] RongtongJin commented on pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
RongtongJin commented on PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#issuecomment-1157123649
Hi @Kvicii Have you reviewed this PR carefully?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] tsunghanjacktsai commented on a diff in pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
tsunghanjacktsai commented on code in PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#discussion_r898661755
##########
common/src/main/java/org/apache/rocketmq/common/MixAll.java:
##########
@@ -77,6 +77,7 @@ public class MixAll {
public static final long FIRST_SLAVE_ID = 1L;
public static final long CURRENT_JVM_PID = getPID();
public final static int UNIT_PRE_SIZE_FOR_MSG = 28;
+ public final static int ALL_ACK_IN_SYNC_STATE_SET_NUM = -1;
Review Comment:
Would better just name it in ALL_ACK_IN_SYNC_STATE_SET without NUM since it's only a constant status. Adding NUM seems a bit weird IMO.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] RongtongJin commented on a diff in pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
RongtongJin commented on code in PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#discussion_r898640740
##########
store/src/main/java/org/apache/rocketmq/store/CommitLog.java:
##########
@@ -803,13 +802,18 @@ public CompletableFuture<PutMessageResult> asyncPutMessage(final MessageExtBroke
boolean needHandleHA = needHandleHA(msg);
int needAckNums = 1;
- if (needHandleHA && !this.defaultMessageStore.getMessageStoreConfig().isAllAckInSyncStateSet()) {
- int inSyncReplicas = Math.min(this.defaultMessageStore.getAliveReplicaNumInGroup(),
- this.defaultMessageStore.getHaService().inSyncSlaveNums(currOffset) + 1);
- needAckNums = calcNeedAckNums(inSyncReplicas);
- if (needAckNums > inSyncReplicas) {
- // Tell the producer, don't have enough slaves to handle the send request
- return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.IN_SYNC_REPLICAS_NOT_ENOUGH, null));
+ if (needHandleHA) {
+ if (this.defaultMessageStore.getBrokerConfig().isEnableControllerMode() && this.defaultMessageStore.getMessageStoreConfig().isAllAckInSyncStateSet()) {
+ // -1 means all ack in SyncStateSet
+ needAckNums = -1;
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] caigy commented on a diff in pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
caigy commented on code in PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#discussion_r898620751
##########
store/src/main/java/org/apache/rocketmq/store/CommitLog.java:
##########
@@ -803,13 +802,18 @@ public CompletableFuture<PutMessageResult> asyncPutMessage(final MessageExtBroke
boolean needHandleHA = needHandleHA(msg);
int needAckNums = 1;
- if (needHandleHA && !this.defaultMessageStore.getMessageStoreConfig().isAllAckInSyncStateSet()) {
- int inSyncReplicas = Math.min(this.defaultMessageStore.getAliveReplicaNumInGroup(),
- this.defaultMessageStore.getHaService().inSyncSlaveNums(currOffset) + 1);
- needAckNums = calcNeedAckNums(inSyncReplicas);
- if (needAckNums > inSyncReplicas) {
- // Tell the producer, don't have enough slaves to handle the send request
- return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.IN_SYNC_REPLICAS_NOT_ENOUGH, null));
+ if (needHandleHA) {
+ if (this.defaultMessageStore.getBrokerConfig().isEnableControllerMode() && this.defaultMessageStore.getMessageStoreConfig().isAllAckInSyncStateSet()) {
+ // -1 means all ack in SyncStateSet
+ needAckNums = -1;
Review Comment:
It may be better to define `-1` as a meaningful constant.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] hzh0425 commented on a diff in pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
hzh0425 commented on code in PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#discussion_r898615369
##########
store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java:
##########
@@ -193,10 +193,10 @@ public void putRequest_SingleAck() throws IOException, ExecutionException, Inter
@Test
public void putRequest_MultipleAckAndRequests() throws IOException, ExecutionException, InterruptedException {
- CommitLog.GroupCommitRequest oneAck = new CommitLog.GroupCommitRequest(124, 4000,1);
+ CommitLog.GroupCommitRequest oneAck = new CommitLog.GroupCommitRequest(124, 4000,2);
this.haService.putRequest(oneAck);
Review Comment:
It's better format to (124, 4000, 2)
##########
store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java:
##########
@@ -213,7 +213,7 @@ public void putRequest_MultipleAckAndRequests() throws IOException, ExecutionExc
doReturn(128L).when(messageStore).getMasterFlushedOffset();
setUpOneHAClient(messageStore);
- twoAck = new CommitLog.GroupCommitRequest(124, 4000,2);
+ twoAck = new CommitLog.GroupCommitRequest(124, 4000,3);
this.haService.putRequest(twoAck);
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] hzh0425 commented on a diff in pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
hzh0425 commented on code in PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#discussion_r898615544
##########
store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java:
##########
@@ -213,7 +213,7 @@ public void putRequest_MultipleAckAndRequests() throws IOException, ExecutionExc
doReturn(128L).when(messageStore).getMasterFlushedOffset();
setUpOneHAClient(messageStore);
- twoAck = new CommitLog.GroupCommitRequest(124, 4000,2);
+ twoAck = new CommitLog.GroupCommitRequest(124, 4000,3);
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [rocketmq] tsunghanjacktsai commented on a diff in pull request #4467: Remove allAckInSyncStateSet in GroupCommitRequest and use ackNums = -1 instead
Posted by GitBox <gi...@apache.org>.
tsunghanjacktsai commented on code in PR #4467:
URL: https://github.com/apache/rocketmq/pull/4467#discussion_r898661450
##########
common/src/main/java/org/apache/rocketmq/common/MixAll.java:
##########
@@ -77,6 +77,7 @@ public class MixAll {
public static final long FIRST_SLAVE_ID = 1L;
public static final long CURRENT_JVM_PID = getPID();
public final static int UNIT_PRE_SIZE_FOR_MSG = 28;
+ public final static int ALL_ACK_IN_SYNC_STATE_SET_NUM = -1;
Review Comment:
Would better just name it in ALL_ACK_IN_SYNC_STATE_SET without NUM since it's only a constant status. Adding NUM got a bit weird.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org