New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
optimize: check relation of before status and after status when updating global session #4629
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
eee8543
changing status relation
Bughue 09bb5b7
changing status relation
Bughue 74b423c
changing status validation
Bughue 2c94544
log status name
Bughue 84c4ec4
log status name
Bughue f636772
log status name
Bughue cb80631
validator test
Bughue 0aeaf92
string space
Bughue ee6869b
string space
Bughue 8e266d7
copyright
Bughue 355d943
copyright
Bughue fb6662b
change class name
Bughue 503a918
test
Bughue e3be4b9
changes
Bughue e2a7217
Merge branch 'develop' into dev_redis_threadsafe
funky-eyes 6f1998f
fix comment
Bughue b63cd19
fix comment
Bughue c233fb6
fix comment
Bughue 52dc1b3
Merge branch 'develop' of github.com:seata/seata into dev_redis_threa…
Bughue 67e2dbf
fix comment
Bughue d2de332
fix comment
Bughue File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
server/src/main/java/io/seata/server/session/SessionStatusValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Copyright 1999-2019 Seata.io Group. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.seata.server.session; | ||
|
|
||
| import io.seata.core.model.GlobalStatus; | ||
|
|
||
| /** | ||
| * The type change status validator. | ||
| * | ||
| * @author Bughue | ||
| */ | ||
| public class SessionStatusValidator { | ||
|
|
||
| /** | ||
| * is timeout global status | ||
| * | ||
| * @param status the global session | ||
| */ | ||
| public static boolean isTimeoutGlobalStatus(GlobalStatus status) { | ||
| return status == GlobalStatus.TimeoutRollbacked | ||
| || status == GlobalStatus.TimeoutRollbackFailed | ||
| || status == GlobalStatus.TimeoutRollbacking | ||
| || status == GlobalStatus.TimeoutRollbackRetrying; | ||
| } | ||
|
|
||
| /** | ||
| * is rollback global status | ||
| * | ||
| * @param status the global session | ||
| */ | ||
| public static boolean isRollbackGlobalStatus(GlobalStatus status) { | ||
| return status == GlobalStatus.Rollbacking | ||
| || status == GlobalStatus.RollbackRetrying | ||
| || status == GlobalStatus.Rollbacked | ||
| || status == GlobalStatus.RollbackFailed | ||
| || status == GlobalStatus.RollbackRetryTimeout; | ||
| } | ||
|
|
||
| /** | ||
| * is commit global status | ||
| * | ||
| * @param status the global session | ||
| */ | ||
| public static boolean isCommitGlobalStatus(GlobalStatus status) { | ||
| return status == GlobalStatus.Committing | ||
| || status == GlobalStatus.AsyncCommitting | ||
| || status == GlobalStatus.CommitRetrying | ||
| || status == GlobalStatus.Committed | ||
| || status == GlobalStatus.CommitFailed | ||
| || status == GlobalStatus.CommitRetryTimeout; | ||
| } | ||
|
|
||
| /** | ||
| * check the relation of before status and after status | ||
| * | ||
| * @param before the global session | ||
| * @param after the global session | ||
| */ | ||
| public static boolean validateUpdateStatus(GlobalStatus before, GlobalStatus after) { | ||
| if (isTimeoutGlobalStatus(before) && isCommitGlobalStatus(after)) { | ||
| return false; | ||
| } | ||
| if (isCommitGlobalStatus(before) && isTimeoutGlobalStatus(after)) { | ||
| return false; | ||
| } | ||
| if (isRollbackGlobalStatus(before) && isCommitGlobalStatus(after)) { | ||
| return false; | ||
| } | ||
| if (isCommitGlobalStatus(before) && isRollbackGlobalStatus(after)) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
server/src/test/java/io/seata/server/session/SessionStatusValidatorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright 1999-2019 Seata.io Group. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.seata.server.session; | ||
funky-eyes marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| import io.seata.core.model.GlobalStatus; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
|
|
||
| /** | ||
| * the type change status validator test | ||
| * | ||
| * @author Bughue | ||
| */ | ||
| @SpringBootTest | ||
| public class SessionStatusValidatorTest { | ||
|
|
||
| @Test | ||
| public void testValidateUpdateStatus(){ | ||
| Assertions.assertEquals(true, SessionStatusValidator.validateUpdateStatus(GlobalStatus.Begin, GlobalStatus.Committing)); | ||
| Assertions.assertEquals(true, SessionStatusValidator.validateUpdateStatus(GlobalStatus.Committing, GlobalStatus.Committed)); | ||
|
|
||
| Assertions.assertEquals(false, SessionStatusValidator.validateUpdateStatus(GlobalStatus.Committing, GlobalStatus.TimeoutRollbacking)); | ||
| Assertions.assertEquals(false, SessionStatusValidator.validateUpdateStatus(GlobalStatus.TimeoutRollbacking, GlobalStatus.Committing)); | ||
| Assertions.assertEquals(false, SessionStatusValidator.validateUpdateStatus(GlobalStatus.Committing, GlobalStatus.Rollbacking)); | ||
| Assertions.assertEquals(false, SessionStatusValidator.validateUpdateStatus(GlobalStatus.Rollbacking, GlobalStatus.Committing)); | ||
|
|
||
| Assertions.assertEquals(false, SessionStatusValidator.validateUpdateStatus(GlobalStatus.Committed, GlobalStatus.Rollbacked)); | ||
| Assertions.assertEquals(false, SessionStatusValidator.validateUpdateStatus(GlobalStatus.Committed, GlobalStatus.TimeoutRollbacking)); | ||
|
|
||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A state flow control can be designed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to prevent too many state updates at the same time?