Fix: Graceful shutdown bugs(supplement #1254) #1257

justxuewei · 2021-06-13T05:56:28Z

What this PR does:

Fix a bug that RejectRequest is not working
Fix a bug that shutdownConfig always be nil, because init() is called before config.Load(). The changes are listed at below:
- To avoid the import circle that happens when filter_impl package is imported in config package, a new interface, called config.Setter, is introduced.
- gracefulShutdownFilters for both provider and consumer are initialized in init() as usual, they, however, are not to get shutdownConfig immediately, instead, the shutdownConfig is set to filters in config.GracefulShutdownInit() via config.Setter.

Codecov Report

Merging #1257 (f12379a) into 3.0 (968650f) will decrease coverage by 3.65%.
The diff coverage is 50.78%.

@@            Coverage Diff             @@
##              3.0    #1257      +/-   ##
==========================================
- Coverage   59.53%   55.87%   -3.66%     
==========================================
  Files         259      272      +13     
  Lines       12737    12815      +78     
==========================================
- Hits         7583     7161     -422     
- Misses       4199     4760     +561     
+ Partials      955      894      -61

Impacted Files	Coverage Δ
cluster/cluster_impl/available_cluster_invoker.go	`66.66% <ø> (ø)`
cluster/cluster_impl/broadcast_cluster_invoker.go	`76.47% <ø> (ø)`
cluster/cluster_impl/failfast_cluster_invoker.go	`66.66% <ø> (ø)`
cluster/cluster_impl/mock_cluster.go	`0.00% <0.00%> (ø)`
cluster/loadbalance/random.go	`100.00% <ø> (ø)`
...router/v3router/judger/list_string_match_judger.go	`0.00% <0.00%> (ø)`
...ster/router/v3router/judger/method_match_judger.go	`0.00% <0.00%> (ø)`
...er/router/v3router/judger/url_label_match_judge.go	`0.00% <0.00%> (ø)`
common/extension/auth.go	`0.00% <ø> (ø)`
common/extension/cluster.go	`0.00% <ø> (ø)`
... and 284 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 99bcbee...f12379a. Read the comment docs.

config/config_loader_test.go

filter/filter_impl/graceful_shutdown_filter.go

config/graceful_shutdown_config.go

filter/filter_impl/graceful_shutdown_filter.go

justxuewei · 2021-06-16T02:29:02Z

Currently, it may have performance issue. So, this pr is converted to draft temporarily.

WilliamLeaves · 2021-06-24T03:02:35Z

config/config_setter.go

+	GracefulShutdownFilterShutdownConfig = "GracefulShutdownFilterShutdownConfig"
+)
+
+type Setter interface {


maybe it is bertter to add some comment for Setting

Yes, some comments will be added lately.

* supplementary fix apache#1254 remove unused comments fix import cycle append apache license header fix gracefulShutdownFilter unittest bug go fmt fix gracefulShutdownConfig unittest bug fix gracefulShutdownConfig unittest bug go fmt * improve formatting based on code style * go fmt * set RequestsFinished explicitly * use mutex to protect variables of ShutdownConfig * ftr: add config (apache#1258) * recover gracefulShutdownFilter logic * remove unused mutex Co-authored-by: Laurence <45508533+LaurenceLiZhixin@users.noreply.github.com>

…1300) * build(deps): bump actions/cache from v2.1.4 to v2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](actions/cache@v2.1.4...1a9e213) Signed-off-by: dependabot[bot] <support@github.com> * improve etcd version and change create to put (#1203) * make the package v3router/judger test coverage rate reach 80% (#1260) * make the package v3router/judger test coverage rate reach 80% * add router_chain unit test * refactor imports and some code * remove blank lines Co-authored-by: dongjianhui <dongjianhui@yuanfudao.com> * Fix: Graceful shutdown bugs(supplement #1254) (#1257) * supplementary fix #1254 remove unused comments fix import cycle append apache license header fix gracefulShutdownFilter unittest bug go fmt fix gracefulShutdownConfig unittest bug fix gracefulShutdownConfig unittest bug go fmt * improve formatting based on code style * go fmt * set RequestsFinished explicitly * use mutex to protect variables of ShutdownConfig * ftr: add config (#1258) * recover gracefulShutdownFilter logic * remove unused mutex Co-authored-by: Laurence <45508533+LaurenceLiZhixin@users.noreply.github.com> * refine grpc test code (#1266) * refine grpc test code * fix test * remove useless code * config test grpc server * registry 默认值问题 (#1275) Co-authored-by: wangxiaowei14227 <wangxiaowei14227@autohome.com.cn> * config center for more parameters (#1277) * nacos config center optimize * up remote config * add protocol chick * up:代码优化 * go fmt * fix: add arch picture in readme and delete unused router field. (#1279) * fix * fix: delete notify * performance optimization: change time.After => time.NewTimer Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xin.Zh <dragoncharlie@foxmail.com> Co-authored-by: AlexStocks <alexstocks@foxmail.com> Co-authored-by: randy <ztelur@gmail.com> Co-authored-by: LaurenceLiZhixin <382673304@qq.com> Co-authored-by: Mulavar <978007503@qq.com> Co-authored-by: dongjianhui <dongjianhui@yuanfudao.com> Co-authored-by: XavierNiu <a@nxw.name> Co-authored-by: Laurence <45508533+LaurenceLiZhixin@users.noreply.github.com> Co-authored-by: gaoxinge <xg.gao@tianrang-inc.com> Co-authored-by: wangxw666 <2484713618@qq.com> Co-authored-by: wangxiaowei14227 <wangxiaowei14227@autohome.com.cn> Co-authored-by: 赵云兴 <2385585770@qq.com>

justxuewei changed the title ~~Fix: Graceful Shutdown bugs(supplement #1254)~~ Fix: Graceful shutdown bugs(supplement #1254) Jun 13, 2021

justxuewei mentioned this pull request Jun 13, 2021

Supplementary Mergence #1246

Closed

supplementary fix apache#1254

69be77e

remove unused comments fix import cycle append apache license header fix gracefulShutdownFilter unittest bug go fmt fix gracefulShutdownConfig unittest bug fix gracefulShutdownConfig unittest bug go fmt

justxuewei force-pushed the fix/graceful-shutdown-bug-2 branch from 6b2299f to 69be77e Compare June 13, 2021 08:02

AlexStocks reviewed Jun 14, 2021

View reviewed changes

config/config_loader_test.go Outdated Show resolved Hide resolved

AlexStocks reviewed Jun 14, 2021

View reviewed changes

filter/filter_impl/graceful_shutdown_filter.go Outdated Show resolved Hide resolved

improve formatting based on code style

93809ea

justxuewei requested a review from AlexStocks June 14, 2021 11:54

justxuewei force-pushed the fix/graceful-shutdown-bug-2 branch 2 times, most recently from ef69b41 to 93809ea Compare June 14, 2021 12:15

justxuewei added 2 commits June 14, 2021 20:47

Merge branch 'refs/heads/3.0' into fix/graceful-shutdown-bug-2

10ce71d

go fmt

c282b74

AlexStocks approved these changes Jun 15, 2021

View reviewed changes

win5do reviewed Jun 15, 2021

View reviewed changes

config/graceful_shutdown_config.go Outdated Show resolved Hide resolved

filter/filter_impl/graceful_shutdown_filter.go Show resolved Hide resolved

filter/filter_impl/graceful_shutdown_filter.go Outdated Show resolved Hide resolved

justxuewei added 2 commits June 15, 2021 13:16

set RequestsFinished explicitly

e3bced8

use mutex to protect variables of ShutdownConfig

465e8ea

justxuewei requested a review from AlexStocks June 15, 2021 05:35

LaurenceLiZhixin and others added 2 commits June 15, 2021 21:39

ftr: add config (apache#1258)

b795f34

Merge branch 'refs/heads/3.0' into fix/graceful-shutdown-bug-2

a0937d7

LaurenceLiZhixin added this to the v3.0.0-rc2 milestone Jun 16, 2021

justxuewei marked this pull request as draft June 16, 2021 02:27

LaurenceLiZhixin removed this from the v3.0.0-rc2 milestone Jun 16, 2021

recover gracefulShutdownFilter logic

cc877e8

justxuewei marked this pull request as ready for review June 19, 2021 14:58

remove unused mutex

f12379a

LaurenceLiZhixin added this to the v3.0.0 milestone Jun 20, 2021

AlexStocks approved these changes Jun 23, 2021

View reviewed changes

LaurenceLiZhixin approved these changes Jun 23, 2021

View reviewed changes

gaoxinge approved these changes Jun 24, 2021

View reviewed changes

AlexStocks merged commit 0f0e1f6 into apache:3.0 Jun 24, 2021

WilliamLeaves approved these changes Jun 24, 2021

View reviewed changes

justxuewei deleted the fix/graceful-shutdown-bug-2 branch January 27, 2022 04:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Graceful shutdown bugs(supplement #1254) #1257

Fix: Graceful shutdown bugs(supplement #1254) #1257

justxuewei commented Jun 13, 2021 •

edited

Loading

codecov-commenter commented Jun 13, 2021 •

edited

Loading

justxuewei commented Jun 16, 2021 •

edited

Loading

WilliamLeaves Jun 24, 2021

justxuewei Jun 24, 2021

Fix: Graceful shutdown bugs(supplement #1254) #1257

Fix: Graceful shutdown bugs(supplement #1254) #1257

Conversation

justxuewei commented Jun 13, 2021 • edited Loading

codecov-commenter commented Jun 13, 2021 • edited Loading

Codecov Report

justxuewei commented Jun 16, 2021 • edited Loading

WilliamLeaves Jun 24, 2021

Choose a reason for hiding this comment

justxuewei Jun 24, 2021

Choose a reason for hiding this comment

justxuewei commented Jun 13, 2021 •

edited

Loading

codecov-commenter commented Jun 13, 2021 •

edited

Loading

justxuewei commented Jun 16, 2021 •

edited

Loading