bugfix: fix DefaultCoordinatorTest failed in Windows OS #2237

booogu · 2020-02-10T10:36:21Z

Ⅰ. Describe what this PR did

fix DefaultCoordinatorTest failed in windows OS

Ⅱ. Does this pull request fix one issue?

fix #2235

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

…upFactory

…rGroupFactory

…o develop

…upFactory

…rGroupFactory

…o develop

codecov-io · 2020-02-10T10:45:08Z

Codecov Report

Merging #2237 into develop will decrease coverage by 0.58%.
The diff coverage is 29.77%.

@@              Coverage Diff              @@
##             develop    #2237      +/-   ##
=============================================
- Coverage      54.36%   53.77%   -0.59%     
- Complexity      2469     2620     +151     
=============================================
  Files            447      491      +44     
  Lines          14742    15389     +647     
  Branches        1734     1763      +29     
=============================================
+ Hits            8015     8276     +261     
- Misses          5966     6325     +359     
- Partials         761      788      +27

Impacted Files	Coverage Δ	Complexity Δ
...main/java/io/seata/core/store/db/LogStoreSqls.java	`18.86% <ø> (ø)`	`10 <0> (ø)`	⬇️
...tasource/undo/oracle/OracleUndoExecutorHolder.java	`0% <ø> (-40%)`	`0 <0> (-2)`
...urce/undo/oracle/keyword/OracleKeywordChecker.java	`100% <ø> (ø)`	`7 <0> (-1)`	⬇️
.../seata/rm/datasource/undo/UndoExecutorFactory.java	`75% <ø> (+2.77%)`	`3 <0> (-1)`	⬇️
...datasource/undo/mysql/MySQLUndoExecutorHolder.java	`100% <ø> (ø)`	`4 <0> (-1)`	⬇️
...o/seata/saga/statelang/domain/DomainConstants.java	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
...ommon/src/main/java/io/seata/common/Constants.java	`50% <ø> (ø)`	`1 <0> (ø)`	⬇️
...asource/sql/struct/cache/OracleTableMetaCache.java	`77.77% <ø> (-0.39%)`	`10 <0> (-2)`
...main/java/io/seata/core/rpc/netty/RmRpcClient.java	`30.76% <ø> (-1.1%)`	`9 <0> (-1)`
...er/druid/oracle/OracleOperateRecognizerHolder.java	`0% <ø> (-25%)`	`0 <0> (-2)`
... and 143 more

server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java

slievrly

LGTM

l81893521 · 2020-02-11T00:55:10Z

Test fail on WinOS.

io.seata.common.exception.ShouldNeverHappenException: SessionManager is NOT init!

	at io.seata.server.session.SessionHolder.getRootSessionManager(SessionHolder.java:211)
	at io.seata.server.coordinator.DefaultCoordinatorTest.afterClass(DefaultCoordinatorTest.java:217)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:628)
	at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:117)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.lambda$invokeAfterAllMethods$10(ClassTestDescriptor.java:390)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.lambda$invokeAfterAllMethods$11(ClassTestDescriptor.java:389)
	at java.util.ArrayList.forEach(ArrayList.java:1257)
	at java.util.Collections$UnmodifiableCollection.forEach(Collections.java:1080)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.invokeAfterAllMethods(ClassTestDescriptor.java:389)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.after(ClassTestDescriptor.java:217)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.after(ClassTestDescriptor.java:77)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:145)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:145)
	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80)
	at java.util.ArrayList.forEach(ArrayList.java:1257)
	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:38)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:139)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:125)
	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80)
	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:32)
	at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57)
	at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:51)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:229)
	at org.junit.platform.launcher.core.DefaultLauncher.lambda$execute$6(DefaultLauncher.java:197)
	at org.junit.platform.launcher.core.DefaultLauncher.withInterceptedStreams(DefaultLauncher.java:211)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:191)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:128)
	at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:74)
	at com.intellij.rt.execution.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:47)
	at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:242)
	at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:70)

booogu · 2020-02-11T01:41:37Z

Test fail on WinOS.

io.seata.common.exception.ShouldNeverHappenException: SessionManager is NOT init!

	at io.seata.server.session.SessionHolder.getRootSessionManager(SessionHolder.java:211)
	at io.seata.server.coordinator.DefaultCoordinatorTest.afterClass(DefaultCoordinatorTest.java:217)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:628)
	at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:117)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.lambda$invokeAfterAllMethods$10(ClassTestDescriptor.java:390)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.lambda$invokeAfterAllMethods$11(ClassTestDescriptor.java:389)
	at java.util.ArrayList.forEach(ArrayList.java:1257)
	at java.util.Collections$UnmodifiableCollection.forEach(Collections.java:1080)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.invokeAfterAllMethods(ClassTestDescriptor.java:389)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.after(ClassTestDescriptor.java:217)
	at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.after(ClassTestDescriptor.java:77)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$6(NodeTestTask.java:145)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:145)
	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80)
	at java.util.ArrayList.forEach(ArrayList.java:1257)
	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:38)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:139)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:125)
	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123)
	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122)
	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80)
	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:32)
	at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57)
	at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:51)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:229)
	at org.junit.platform.launcher.core.DefaultLauncher.lambda$execute$6(DefaultLauncher.java:197)
	at org.junit.platform.launcher.core.DefaultLauncher.withInterceptedStreams(DefaultLauncher.java:211)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:191)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:128)
	at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:74)
	at com.intellij.rt.execution.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:47)
	at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:242)
	at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:70)

forgot to do npe check before destroySessionHolder, now added.

slievrly · 2020-02-11T02:14:20Z

server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java

        deleteDataFile();
        SessionHolder.init(StoreMode.FILE.name());
    }

+    private static void destroySessionHolder() {
+        try {
+            SessionHolder.getRootSessionManager();


This should be SessionHolder.destroy to determine whether or not null, SessionHolder as a static method class, there is no guarantee that the internal initialization.

yeah,now add null check in SessionHolder.destroy()

l81893521

LGTM

Hao Zhibei and others added 30 commits November 9, 2019 11:11

restructure

8454613

Restructure SQLRecognizer and UndoExecutor

387b7cb

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

472cb65

optimize concurrency of UndoExecutorGruopFactory and SQLRecognizerGro…

96de7fd

…upFactory

remove @Version tags

d4f090f

add javaDoc;optimize UndoExecutorGroupFactory and SQLOperateRecognize…

550f6e1

…rGroupFactory

Merge branch 'develop' into develop

b0e250e

rename **Group to **Holder

d06df2e

Merge branch 'develop' of https://github.com/CharmingRabbit/seata int…

3d46a46

…o develop

Merge branch 'develop' into develop

28322ac

remove @DaTa

57fb2d0

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

c3ae74a

Merge branch 'develop' of https://github.com/CharmingRabbit/seata int…

e9a163e

…o develop

Merge branch 'develop' into develop

78f456f

Merge branch 'develop' into develop

8c0f5d2

fix NPE in UndoExecutorFactory

3e9a6bd

restructure

19ef256

Restructure SQLRecognizer and UndoExecutor

43bc2c3

optimize concurrency of UndoExecutorGruopFactory and SQLRecognizerGro…

45a275c

…upFactory

remove @Version tags

a96fe5e

add javaDoc;optimize UndoExecutorGroupFactory and SQLOperateRecognize…

5febb22

…rGroupFactory

rename **Group to **Holder

b9a3696

remove @DaTa

ca88134

optimize: xid header lowercase (apache#1789)

05adb69

clean: reformat saga module (apache#1890)

b1b05a9

fix NPE in UndoExecutorFactory

2c5fe29

Merge branch 'develop' of https://github.com/CharmingRabbit/seata int…

92bba97

…o develop

merge latest code

c116c9b

bugfix:fix NPE in UndoExecutorFactory

59fe1cf

local commit

378e89c

booogu and others added 15 commits November 22, 2019 16:51

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

c0867c6

code

9fc4f5e

Merge branch 'develop' into develop

dbf102f

Merge branch 'develop' into develop

ea397a7

Merge branch 'develop' into develop

3f4dd2b

Merge branch 'develop' into develop

028a80d

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

e1968bb

Merge branch 'develop' of https://github.com/CharmingRabbit/seata int…

fd36c51

…o develop

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

f01d15f

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

c9aa49b

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

f195d86

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

c3399ff

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

ac3a43e

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

7c5fbdf

bugfix:fix DefaultCoordinatorTest failed

71950a2

format code style

fd6e09c

slievrly reviewed Feb 10, 2020

View reviewed changes

server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java Show resolved Hide resolved

add destory() in beforeEach

0834589

slievrly approved these changes Feb 10, 2020

View reviewed changes

fix npe while destroySessionHolder

3d7edff

slievrly reviewed Feb 11, 2020

View reviewed changes

fix npe in SessionHolder.destroy()

b88b901

slievrly requested a review from l81893521 February 11, 2020 02:48

l81893521 approved these changes Feb 11, 2020

View reviewed changes

slievrly added this to the 1.1.0 milestone Feb 11, 2020

slievrly merged commit b95b850 into apache:develop Feb 11, 2020

booogu deleted the f_bugfix branch February 12, 2020 07:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix: fix DefaultCoordinatorTest failed in Windows OS #2237

bugfix: fix DefaultCoordinatorTest failed in Windows OS #2237

booogu commented Feb 10, 2020

codecov-io commented Feb 10, 2020 •

edited

slievrly left a comment

l81893521 commented Feb 11, 2020

booogu commented Feb 11, 2020

slievrly Feb 11, 2020

booogu Feb 11, 2020

l81893521 left a comment

bugfix: fix DefaultCoordinatorTest failed in Windows OS #2237

bugfix: fix DefaultCoordinatorTest failed in Windows OS #2237

Conversation

booogu commented Feb 10, 2020

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov-io commented Feb 10, 2020 • edited

Codecov Report

slievrly left a comment

Choose a reason for hiding this comment

l81893521 commented Feb 11, 2020

booogu commented Feb 11, 2020

slievrly Feb 11, 2020

Choose a reason for hiding this comment

booogu Feb 11, 2020

Choose a reason for hiding this comment

l81893521 left a comment

Choose a reason for hiding this comment

codecov-io commented Feb 10, 2020 •

edited