optimize: @GlobalTransactional and @GlobalLock can now customize lock retry config #2962

selfishlover · 2020-08-03T03:08:05Z

Ⅰ. Describe what this PR did

allow @GlobalTransactional and @GlobalLock to customize lock retry interval and times, which would override the global config.

Ⅱ. Does this pull request fix one issue?

fixes #2943

… retry config (apache#2943)

# Conflicts: # core/src/main/java/io/seata/core/context/GlobalLockConfigHolder.java # core/src/main/java/io/seata/core/model/GlobalLockConfig.java

codecov-commenter · 2020-08-03T03:17:21Z

Codecov Report

Merging #2962 into develop will increase coverage by 0.09%.
The diff coverage is 77.38%.

@@              Coverage Diff              @@
##             develop    #2962      +/-   ##
=============================================
+ Coverage      50.45%   50.54%   +0.09%     
- Complexity      3108     3122      +14     
=============================================
  Files            593      595       +2     
  Lines          19571    19637      +66     
  Branches        2427     2434       +7     
=============================================
+ Hits            9874     9925      +51     
- Misses          8702     8717      +15     
  Partials         995      995

Impacted Files	Coverage Δ	Complexity Δ
...ain/java/io/seata/core/model/GlobalLockConfig.java	`14.28% <14.28%> (ø)`	`1.00 <1.00> (?)`
...ing/annotation/GlobalTransactionalInterceptor.java	`29.45% <33.33%> (+0.97%)`	`9.00 <0.00> (ø)`
...a/io/seata/tm/api/transaction/TransactionInfo.java	`68.75% <33.33%> (-19.72%)`	`14.00 <2.00> (ø)`
.../io/seata/core/context/GlobalLockConfigHolder.java	`87.50% <87.50%> (ø)`	`4.00 <4.00> (?)`
.../seata/rm/datasource/exec/LockRetryController.java	`92.85% <94.11%> (+0.54%)`	`8.00 <5.00> (+4.00)`
.../src/main/java/io/seata/rm/GlobalLockTemplate.java	`100.00% <100.00%> (+25.00%)`	`5.00 <5.00> (+3.00)`
...in/java/io/seata/tm/api/TransactionalTemplate.java	`67.20% <100.00%> (+2.85%)`	`28.00 <3.00> (+3.00)`
...java/io/seata/tm/api/transaction/RollbackRule.java	`89.28% <0.00%> (-3.58%)`	`13.00% <0.00%> (-1.00%)`
... and 1 more

funky-eyes · 2020-08-03T05:35:29Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

+            int configInternal = config.getLockRetryInternal();
+            if (configInternal > 0) {
+                retryInternal = configInternal;
+            }


我觉得加上else retryInternal=ConfigurationFactory.getInstance().getInt(ConfigurationKeys.CLIENT_LOCK_RETRY_INTERVAL, DEFAULT_CLIENT_LOCK_RETRY_INTERVAL);
可以在有本地的锁重试时，无序再去加载配置中心中的配置

有道理，我优化一下

funky-eyes · 2020-08-03T05:36:06Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

+            int configTimes = config.getLockRetryTimes();
+            if (configTimes >= 0) {
+                retryTimes = configTimes;
+            }


同上，改动后LOCK_RETRY_TIMES和LOCK_RETRY_TIMES 似乎就可以删除

…stomized config is available

funky-eyes

LGTM

wangliang181230 · 2020-09-15T02:42:42Z

Please add the test.

l81893521 · 2020-09-15T03:44:34Z

spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java

+        final GlobalLock globalLockAnno) throws Throwable {
+        return globalLockTemplate.execute(new GlobalLockExecutor() {
+            @Override
+            public Object execute() throws Throwable {


Why remove the try catch?

Because the old try-catch in fact do nothing, just to wrap a throwable as a RuntimeException, so that it can match the outer method signature(throws Exception~). Here i simplify the method signature(throws Throwable), thus it can save the catch and wrap process. Just like its "brother" method(handleGlobalTransaction).

wangliang181230 · 2020-09-15T07:10:28Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

-    private static int LOCK_RETRY_INTERNAL =
-        ConfigurationFactory.getInstance().getInt(ConfigurationKeys.CLIENT_LOCK_RETRY_INTERVAL, DEFAULT_CLIENT_LOCK_RETRY_INTERVAL);
-    private static int LOCK_RETRY_TIMES =
-        ConfigurationFactory.getInstance().getInt(ConfigurationKeys.CLIENT_LOCK_RETRY_TIMES, DEFAULT_CLIENT_LOCK_RETRY_TIMES);


Keep this constants. Returns it in the get methods, if there is no customized config.

wangliang181230 · 2020-09-15T07:13:09Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

+        }
+        // if there is no customized config, use global config instead
+        Configuration configuration = ConfigurationFactory.getInstance();
+        return configuration.getInt(ConfigurationKeys.CLIENT_LOCK_RETRY_INTERVAL, DEFAULT_CLIENT_LOCK_RETRY_INTERVAL);


Recovery LOCK_RETRY_INTERNAL, and returns LOCK_RETRY_INTERNAL.

wangliang181230 · 2020-09-15T07:13:23Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

+        }
+        // if there is no customized config, use global config instead
+        Configuration configuration = ConfigurationFactory.getInstance();
+        return configuration.getInt(ConfigurationKeys.CLIENT_LOCK_RETRY_TIMES, DEFAULT_CLIENT_LOCK_RETRY_TIMES);


Recovery LOCK_RETRY_TIMES, and returns LOCK_RETRY_TIMES.

…onfig(using ConfigurationChangeListener)

wangliang181230 · 2020-09-16T03:41:10Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

+
+        private int globalLockRetryInternal;
+
+        private int globalLockRetryTimes;


wangliang181230 · 2020-09-16T03:41:52Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

+            }
+        }
+
+        private int parseInt(String value, int fallback) {


use the static method NumberUtils.toInt

ok, i see it.

…peating it" myself

wangliang181230 · 2020-09-16T04:38:07Z

rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java

@@ -28,7 +32,7 @@
 */
 public class LockRetryController {

-    private static final GlobalConfig globalConfig = new GlobalConfig();
+    private static GlobalConfig globalConfig = new GlobalConfig();


常量的变量名用大写就好，不要把final拿掉。

问题不大，反正别的地方也改不了它

# Conflicts: # spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java # tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java

codecov-io · 2020-10-12T07:16:47Z

Codecov Report

Merging #2962 into develop will increase coverage by 0.09%.
The diff coverage is 78.16%.

@@              Coverage Diff              @@
##             develop    #2962      +/-   ##
=============================================
+ Coverage      50.40%   50.50%   +0.09%     
- Complexity      3123     3139      +16     
=============================================
  Files            594      596       +2     
  Lines          19698    19764      +66     
  Branches        2459     2466       +7     
=============================================
+ Hits            9929     9982      +53     
- Misses          8765     8780      +15     
+ Partials        1004     1002       -2

Impacted Files	Coverage Δ	Complexity Δ
...ain/java/io/seata/core/model/GlobalLockConfig.java	`14.28% <14.28%> (ø)`	`1.00 <1.00> (?)`
...ing/annotation/GlobalTransactionalInterceptor.java	`29.45% <33.33%> (+0.97%)`	`9.00 <0.00> (ø)`
...a/io/seata/tm/api/transaction/TransactionInfo.java	`68.75% <33.33%> (-19.72%)`	`14.00 <2.00> (ø)`
.../io/seata/core/context/GlobalLockConfigHolder.java	`87.50% <87.50%> (ø)`	`4.00 <4.00> (?)`
.../seata/rm/datasource/exec/LockRetryController.java	`92.85% <94.11%> (+0.54%)`	`8.00 <5.00> (+4.00)`
.../src/main/java/io/seata/rm/GlobalLockTemplate.java	`100.00% <100.00%> (+25.00%)`	`5.00 <5.00> (+3.00)`
...ta/rm/datasource/exec/SelectForUpdateExecutor.java	`82.00% <100.00%> (ø)`	`10.00 <0.00> (ø)`
...in/java/io/seata/tm/api/TransactionalTemplate.java	`63.84% <100.00%> (+3.01%)`	`28.00 <3.00> (+3.00)`
...java/io/seata/tm/api/transaction/RollbackRule.java	`89.28% <0.00%> (-3.58%)`	`13.00% <0.00%> (-1.00%)`
... and 4 more

wangliang181230

LGTM

jsbxyyx

LGTM for @wangliang181230

… retry config (apache#2962)

ls9527

随便问问，啥也不影响

ls9527 · 2020-11-08T07:56:14Z

spring/src/main/java/io/seata/spring/annotation/GlobalTransactional.java

+     * note: 0 or negative number will take no effect(which mean fall back to global config)
+     * @return
+     */
+    int lockRetryInternal() default 0;


lockRetryInternal 是不是应该叫做 lockRetryInterval 。是拼错了，还是本来就是这个意思?

… retry config (apache#2962)

selfishlover and others added 8 commits July 31, 2020 17:51

optimize: @GlobalTransactional and @GlobalLock can now customize lock…

123ed6a

… retry config (apache#2943)

optimize: @GlobalTransactional and @GlobalLock can now customize lock…

72c6841

… retry config (apache#2943)

Merge remote-tracking branch 'origin/develop' into develop

48fba47

# Conflicts: # core/src/main/java/io/seata/core/context/GlobalLockConfigHolder.java # core/src/main/java/io/seata/core/model/GlobalLockConfig.java

fix: adjust TransactionInfoTest

be3b221

fix: adjust TransactionInfoTest

297f978

Merge remote-tracking branch 'origin/develop' into develop

12a43a4

fix: style check

46387e5

Merge branch 'develop' into develop

0a7fe15

funky-eyes added first-time contributor first-time contributor RM Relate to seata rm labels Aug 3, 2020

funky-eyes reviewed Aug 3, 2020

View reviewed changes

funky-eyes added this to the 1.4.0 milestone Aug 3, 2020

selfishlover and others added 2 commits August 3, 2020 15:05

optimize: LockRetryController no need to access config center when cu…

7f9aa27

…stomized config is available

Merge branch 'develop' into develop

ebfc6de

funky-eyes added module/rm rm module and removed RM Relate to seata rm labels Aug 4, 2020

funky-eyes added 2 commits August 6, 2020 13:44

Merge branch 'develop' into develop

2c7fdba

Merge branch 'develop' into develop

ab7368d

funky-eyes approved these changes Aug 11, 2020

View reviewed changes

funky-eyes added 7 commits August 14, 2020 11:51

Merge branch 'develop' into develop

ce93575

Merge branch 'develop' into develop

93f7bce

Merge branch 'develop' into develop

fbf6660

Merge branch 'develop' into develop

a90881f

Merge branch 'develop' into develop

44ef995

Merge branch 'develop' into develop

27e8f58

Merge branch 'develop' into develop

383b7c9

l81893521 reviewed Sep 15, 2020

View reviewed changes

selfishlover and others added 2 commits September 15, 2020 13:34

Merge branch 'develop' into develop

09a5c51

optimize: add junit test for GlobalLockConfigHolder

289b6d7

wangliang181230 reviewed Sep 15, 2020

View reviewed changes

optimize: faster implement for LockRetryController to access global c…

01470ac

…onfig(using ConfigurationChangeListener)

wangliang181230 reviewed Sep 16, 2020

View reviewed changes

selfishlover added 2 commits September 16, 2020 12:14

optimize: fix style

4ea0701

optimize: add volatile flag and use NumberUtils method instead of "re…

064c273

…peating it" myself

wangliang181230 reviewed Sep 16, 2020

View reviewed changes

funky-eyes and others added 3 commits September 28, 2020 17:58

Merge branch 'develop' into develop

fa10f27

Merge remote-tracking branch 'upstream/develop' into develop

ba8b789

# Conflicts: # spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java # tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java

optimize: fix merge conflict

3ca7af7

optimize: adjust LockRetryController instantiate time

4791b22

wangliang181230 approved these changes Oct 12, 2020

View reviewed changes

selfishlover added 3 commits October 12, 2020 17:08

optimize: add final

8bb3078

optimize: FIX style

851ea24

optimize: FIX style

f5cbe05

jsbxyyx approved these changes Oct 12, 2020

View reviewed changes

optimize: FIX git account

07f39df

funky-eyes changed the title ~~optimize: @GlobalTransactional and @GlobalLock can now customize lock retry config (#2943)~~ optimize: @GlobalTransactional and @GlobalLock can now customize lock retry config Oct 12, 2020

funky-eyes merged commit 6c0c759 into apache:develop Oct 12, 2020

l81893521 pushed a commit to l81893521/seata that referenced this pull request Oct 22, 2020

optimize: @GlobalTransactional and @GlobalLock can now customize lock…

3a451fc

… retry config (apache#2962)

ls9527 reviewed Nov 8, 2020

View reviewed changes

hicf pushed a commit to hicf/seata that referenced this pull request Nov 15, 2020

optimize: @GlobalTransactional and @GlobalLock can now customize lock…

6bb9671

… retry config (apache#2962)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

optimize: @GlobalTransactional and @GlobalLock can now customize lock retry config #2962

optimize: @GlobalTransactional and @GlobalLock can now customize lock retry config #2962

selfishlover commented Aug 3, 2020

codecov-commenter commented Aug 3, 2020 •

edited

funky-eyes Aug 3, 2020

selfishlover Aug 3, 2020

funky-eyes Aug 3, 2020

funky-eyes left a comment

wangliang181230 commented Sep 15, 2020

l81893521 Sep 15, 2020

selfishlover Sep 15, 2020

l81893521 Sep 15, 2020

wangliang181230 Sep 15, 2020

wangliang181230 Sep 15, 2020 •

edited

wangliang181230 Sep 15, 2020 •

edited

wangliang181230 Sep 16, 2020

wangliang181230 Sep 16, 2020

selfishlover Sep 16, 2020

wangliang181230 Sep 16, 2020

selfishlover Sep 16, 2020

codecov-io commented Oct 12, 2020 •

edited

wangliang181230 left a comment

jsbxyyx left a comment

ls9527 left a comment

ls9527 Nov 8, 2020


		private int globalLockRetryInternal;

		private int globalLockRetryTimes;

optimize: @GlobalTransactional and @GlobalLock can now customize lock retry config #2962

optimize: @GlobalTransactional and @GlobalLock can now customize lock retry config #2962

Conversation

selfishlover commented Aug 3, 2020

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

codecov-commenter commented Aug 3, 2020 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

funky-eyes left a comment

Choose a reason for hiding this comment

wangliang181230 commented Sep 15, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangliang181230 Sep 15, 2020 • edited

Choose a reason for hiding this comment

wangliang181230 Sep 15, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Oct 12, 2020 • edited

Codecov Report

wangliang181230 left a comment

Choose a reason for hiding this comment

jsbxyyx left a comment

Choose a reason for hiding this comment

ls9527 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-commenter commented Aug 3, 2020 •

edited

wangliang181230 Sep 15, 2020 •

edited

wangliang181230 Sep 15, 2020 •

edited

codecov-io commented Oct 12, 2020 •

edited