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.

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

Graceful shutdown enhancement in Spring #2901

Merged
merged 1 commit into from
Dec 7, 2018

Conversation

LiZhenNet
Copy link
Contributor

What is the purpose of the change

Graceful shutdown enhancement in Spring.

AbstractConfig has added a DubboShutdownHook in its constructed function,but when we used spring, SpringExtensionFactory also added a ApplicationListener to invoke DubboShutdownHook when spring fired ContextClosedEvent.

This seems to have a problem。 AbstractConfig‘s DubboShutdownHook will invoke when the application shutdown, at the same time spring boot shutDownhook will invoke to close the context。

when the application closing ,dubbo will make sure all the request has return ,if a request used bean in spring , this bean will close by context。 it will throw error,so in spring ,we should make sure dubbo shutdown before spring destory its beans。

我怕我英文没有表达清楚,用中文简单描述一下。正好也在解决这个问题,当我的应用在使用spring boot 时,spring boot 会注册一个shutdownhook 来关闭 applicationcontext ,同时 Dubbo 也会注册 shutdownhook, 但是我们没办法保证两个shutdownhook的执行顺序。因为dubbo 的优雅停机 会把已经进来的请求处理完,当这些请求依赖spring 的某些bean 时,这些bean 可能已经被spring 容器关闭了,产生了报错。我们应该确保dubbo完全停机了再关闭spring容器。
我目前的做法是取消了spring boot 注册的shutdownhook, 自己实现了一个shutdownhook ,运行时,先sleep(DEFAULT_SERVER_SHUTDOWN_TIMEOUT),再确保dubbo 停机后再关闭容器,如果 DEFAULT_SERVER_SHUTDOWN_TIMEOUT 过大的话,可能会拖延停机时间,这也是为什么我提了一个issue :#2877

Brief changelog

when add ShutdownHookListener ,remove AbstractConfig‘s DubboShutdownHook

Verifying this change

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GITHUB_issue field 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.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test 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.
  • Run mvn clean install -DskipTests & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
  • If this contribution is large, please follow the Software Donation Guide.

@codecov-io
Copy link

Codecov Report

Merging #2901 into master will decrease coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2901      +/-   ##
==========================================
- Coverage   63.74%   63.71%   -0.03%     
==========================================
  Files         577      577              
  Lines       25930    25931       +1     
  Branches     4540     4540              
==========================================
- Hits        16529    16522       -7     
- Misses       7233     7235       +2     
- Partials     2168     2174       +6
Impacted Files Coverage Δ
...ava/org/apache/dubbo/config/DubboShutdownHook.java 84% <100%> (ø) ⬆️
...onfig/spring/extension/SpringExtensionFactory.java 84.61% <100%> (+0.4%) ⬆️
...ache/dubbo/remoting/p2p/support/AbstractGroup.java 45.45% <0%> (-11.37%) ⬇️
...in/java/org/apache/dubbo/common/utils/JVMUtil.java 73.58% <0%> (-7.55%) ⬇️
.../apache/dubbo/remoting/transport/AbstractPeer.java 58.69% <0%> (-4.35%) ⬇️
...dubbo/remoting/exchange/support/DefaultFuture.java 66.44% <0%> (-3.36%) ⬇️
...org/apache/dubbo/rpc/protocol/AbstractInvoker.java 62.9% <0%> (-3.23%) ⬇️
...dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java 77.2% <0%> (-2.21%) ⬇️
...a/org/apache/dubbo/monitor/dubbo/DubboMonitor.java 87.85% <0%> (-1.87%) ⬇️
...apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java 65.83% <0%> (-0.84%) ⬇️
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 63bf28d...f6a3213. Read the comment docs.

@beiwei30 beiwei30 merged commit ea71adb into apache:master Dec 7, 2018
khanimteyaz pushed a commit to khanimteyaz/incubator-dubbo that referenced this pull request Dec 17, 2018
beiwei30 pushed a commit that referenced this pull request Dec 17, 2018
* added dubbo-rpc-api filter documentation for issue no #2935

* wrong @see java.io.File was added, removed this version of checkins

* Close all ports after tests finish (#2906)

* fix testCustomExecutor (#2904)

* Graceful shutdown enhancement in Spring (#2901)

* Simplify the code logic of the method AbstractClusterInvoker#reselect. (#2826)

* Simplify the code logic of the method AbstractClusterInvoker#reselect.

* Minor modification for code style.

* create AbstractRouter (#2909)

* create AbstractRouter

* router default method

* router default method

* router default method

* mockinvoker

* Added javadoc for dubbo-filter module dubbo github issue 2884 (#2921)

* Enhance unit test (#2920)

* Change Readme dubbo-sample hyperlink (#2927)

* Simply TagRouter (#2924)

* make telnet config work again (#2925)

* Remove the log to putRandomPort when one protocol use random port (#2931)

* optimize findConfigedPorts method of ServiceConfig to log only one time when userandom port

* move the log to method putRandomPort

* Fix DubboShutdownHook Memory Leak (#2922)

* Improve UT grammar and remove unnecessary braces. (#2930)

* Improve UT grammer, fix compiler warnings.

* Remove unnecessary braces.

* re-enable testCustomExecutor  (#2917)

* fix testCustomExecutor

* fix ci

* Fixing test-order dependency for FstObjectInputTest (#2815)

* re-enable testCustomExecutor (#2913)

* Resetting ExtensionLoader to remove test order dependencies in StickyTest (#2807)

* optimize the RondRobinLoadBalance and MockClusterInvoker (#2932)

delete unused logic and take the logger out.

* [Dubbo-2864] Fix build failed with -Prelease (#2923)

fixes #2864

* Fix telnet can not find method with enum type (#2803)

* [dubbo-2766] fix the bug of isMatch method of InvokeTelnetHandler (#2787)

* enhance org.apache.dubbo.rpc.protocol.dubbo.telnet.InvokeTelnetHandler#isMatch (#2941)

* enhance isMatch

* remove useless imports

* [Dubbo-2766]Fix 2766 and enhance the invoke command (#2801)

* add getter and setter for ServiceConfig's interfaceName property#2353

* add interfaceName to ignoreAttributeNames and change the unit test

* delete the demo source code and update the unit test

* unchange ServiceConfig

* update unit test

* update unit test

* fix #2798 and enhance invoke command

* Delete useless assignments (#2939)

* Replace anonymous class with method reference (#2929)

* Replace anonymous class with method reference

* Revert changes as per @beiwei30 code review

* Optimize retry for FailbackRegistry. (#2763)

* Abstract retry task

* Task for retry.

* Fix sth.

* Finish Optimize. fix ci failed.

* Optimize retry for FailbackRegistry.
The retry operation splits into specific operations, such as subscriptions and registrations. This approach allows for very precise retry control.

* Optimize retry for FailbackRegistry.
The retry operation splits into specific operations, such as subscriptions and registrations. This approach allows for very precise retry control.

* Optimize logger warn's msg.

* Optimize FailedNotifiedTask's run method.
Optimize addXXXTask, directly return if we already have a retry task.

* Optimize notify logic, just notify when the urls is not empty.

* Optimize notify logic, just notify when the urls is not empty.

* Optimize timer that use daemon thread.

* standardize semantics of all mergers,enhance mergeFactory and testcase (#2936)

* Modified to lower camel case (#2945)

* Improve several map iteration (#2938)

* added dubbo-rpc-api filter documentation for issue no #2935

* wrong @see java.io.File was added, removed this version of checkins
@LiZhenNet LiZhenNet deleted the feature-shutdown branch February 25, 2019 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants