Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Multiple environmental isolation #1075

Merged
merged 35 commits into from
May 28, 2019
Merged

Multiple environmental isolation #1075

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1994de6
Merge pull request #1 from seata/develop
XCXCXCXCX Apr 11, 2019
e9ae2c5
Merge branch 'develop' of https://github.com/seata/seata into develop
XCXCXCXCX Apr 11, 2019
68afd1c
Merge pull request #2 from seata/develop
XCXCXCXCX Apr 17, 2019
5941272
Merge branch 'develop' of https://github.com/XCXCXCXCX/seata into dev…
XCXCXCXCX Apr 17, 2019
6219aa7
add: add time limit when transaction retry on the server
XCXCXCXCX Apr 18, 2019
942b1df
fix: change int to long
XCXCXCXCX Apr 18, 2019
93d0a56
Merge branch 'develop' into develop
xingfudeshi Apr 18, 2019
8a8aa4f
add: Configuration api add getDuration()
XCXCXCXCX Apr 18, 2019
d43cdc0
Merge remote-tracking branch 'origin/develop' into develop
XCXCXCXCX Apr 18, 2019
a2d9275
add: copyright
XCXCXCXCX Apr 18, 2019
4717fd7
fix: use test case instead main
XCXCXCXCX Apr 19, 2019
a0306c9
Merge branch 'develop' into develop
lovepoem Apr 19, 2019
655cce7
add new config items to the nacos-config.txt
XCXCXCXCX Apr 23, 2019
92f2000
Merge remote-tracking branch 'origin/develop' into develop
XCXCXCXCX Apr 23, 2019
99f6f59
Merge branch 'develop' of https://github.com/seata/seata into develop
XCXCXCXCX May 8, 2019
cdab89c
Multiple environmental isolation
XCXCXCXCX May 8, 2019
b5304c5
fix
XCXCXCXCX May 10, 2019
5b5d23e
fix conflict
XCXCXCXCX May 10, 2019
744a8e6
Merge branch 'develop' into muti-env
XCXCXCXCX May 10, 2019
dde13dc
fix
XCXCXCXCX May 20, 2019
70c166a
Merge branch 'develop' into muti-env
XCXCXCXCX May 20, 2019
2657113
fix
XCXCXCXCX May 20, 2019
1e715e1
Merge branch 'develop' into muti-env
xingfudeshi May 20, 2019
deacfd3
Merge branch 'develop' into muti-env
xingfudeshi May 20, 2019
b4433db
Merge branch 'develop' into muti-env
xingfudeshi May 21, 2019
6e44356
Merge branch 'develop' into muti-env
xingfudeshi May 22, 2019
d2576c3
merge conflicts and add SEATA_CONFIG_ENV
XCXCXCXCX May 27, 2019
7eb4317
add SEATA_CONFIG_ENV
XCXCXCXCX May 27, 2019
46adf8d
Merge remote-tracking branch 'origin/muti-env' into muti-env
XCXCXCXCX May 27, 2019
3532ced
Merge branch 'develop' of https://github.com/seata/seata into muti-env
XCXCXCXCX May 27, 2019
10e4c9d
fix
XCXCXCXCX May 27, 2019
c38f2a5
fix
XCXCXCXCX May 27, 2019
e07995d
Merge branch 'develop' into muti-env
xingfudeshi May 27, 2019
b3ef5f5
Merge branch 'develop' into muti-env
xingfudeshi May 28, 2019
c93d1cf
Merge branch 'develop' into muti-env
xingfudeshi May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: change int to long
  • Loading branch information
@XCXCXCXCX
XCXCXCXCX committed Apr 18, 2019
commit 942b1dfb8ae1ebe44cb08bb1321b1f808fc66838
6 changes: 3 additions & 3 deletions server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ public class DefaultCoordinator extends AbstractTCInboundHandler

private static final int ALWAYS_RETRY_BOUNDARY = 0;

private static final int MAX_COMMIT_RETRY_TIMEOUT = ConfigurationFactory.getInstance().getInt(ConfigurationKeys.SERVICE_PREFIX + "max.commit.retry.timeout", ALWAYS_RETRY_BOUNDARY - 1);
private static final long MAX_COMMIT_RETRY_TIMEOUT = ConfigurationFactory.getInstance().getLong(ConfigurationKeys.SERVICE_PREFIX + "max.commit.retry.timeout", ALWAYS_RETRY_BOUNDARY - 1);

private static final int MAX_ROLLBACK_RETRY_TIMEOUT = ConfigurationFactory.getInstance().getInt(ConfigurationKeys.SERVICE_PREFIX + "max.rollback.retry.timeout", ALWAYS_RETRY_BOUNDARY - 1);
private static final long MAX_ROLLBACK_RETRY_TIMEOUT = ConfigurationFactory.getInstance().getLong(ConfigurationKeys.SERVICE_PREFIX + "max.rollback.retry.timeout", ALWAYS_RETRY_BOUNDARY - 1);

/**
* Instantiates a new Default coordinator.
Expand Down Expand Up @@ -276,7 +276,7 @@ private boolean isRetryTimeout(long now, long timeout, long beginTime){
/**
* Start timing when the session begin
*/
if(timeout < ALWAYS_RETRY_BOUNDARY &&
if(timeout > ALWAYS_RETRY_BOUNDARY &&
now - beginTime > timeout){
return true;
}
Expand Down