feat: gracy destory datasource #579
Merged
Conversation
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
alvinkwok1
changed the title
Comment on lines
+56
to
+62
| // async destroy datasource | ||
| ds.setGraceDestroy(true); | ||
| ds.addDataSource(dataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(dataSourceProperty)); | ||
| assertThat(ds.getDataSources().keySet()).contains("slave_1"); | ||
| ds.removeDataSource("slave_1"); | ||
| // close directly | ||
| ds.setGraceDestroy(false); |
There was a problem hiding this comment.
-
Just a reminder, you can create a new unit test class or in a new unit test function body to narrow the scope of your unit tests.
-
It seems that the two codes in the unit test you changed are missing assertions.
Comment on lines
+56
to
+62
| // async destroy datasource | ||
| ds.setGraceDestroy(true); | ||
| ds.addDataSource(dataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(dataSourceProperty)); | ||
| assertThat(ds.getDataSources().keySet()).contains("slave_1"); | ||
| ds.removeDataSource("slave_1"); | ||
| // close directly | ||
| ds.setGraceDestroy(false); |
There was a problem hiding this comment.
- The code here is missing assertions. And I recommend making assertions in separate unit tests rather than complicating existing unit tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What kind of change does this PR introduce? (check at least one)
The description of the PR:
Fixes #578
添加运行时优雅关闭数据源的功能，该特性可以通过配置spring.datasource.dynamic.gracy-destory = true 打开。
打开后，在运行时销毁数据源将会开启异步任务延迟销毁数据源。对HikariCP，druid，DHCP2能够支持检测是否含有活跃连接，在没有活跃连接的情况下立即关闭数据源，至多10s，超时后会直接强制关闭；对于不支持的数据源10s后再关闭数据源。
在dynamic-datasource调用destroy的时候强制销毁，不进行异步关闭。
优雅关闭数据源的代码中每次进行异步关闭都会开启一个线程池，从实际情况来看，覆盖数据源配置或者移除数据源配置是一个很低频的操作，并不会产生不良影响。
Other information:
更新了使用文档