fix: the issue that plugins in global rule may be cached to route #4867
+121
−3
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
tokers
approved these changes
Aug 23, 2021
spacewander
reviewed
Aug 23, 2021
apisix/init.lua
Outdated
| @@ -694,7 +694,7 @@ function _M.http_log_phase() | |||
| end | |||
|
|
|||
| core.ctx.release_vars(api_ctx) | |||
| if api_ctx.plugins and api_ctx.plugins ~= core.empty_tab then | |||
| if api_ctx.plugins and core.table.nkeys(api_ctx.plugins) > 0 then | |||
There was a problem hiding this comment.
Empty plugins also need to be released.
apisix/plugin.lua
Outdated
| @@ -307,7 +307,7 @@ function _M.filter(conf, plugins, route_conf) | |||
| trace_plugins_info_for_debug(nil) | |||
| -- when 'plugins' is given, always return 'plugins' itself instead | |||
| -- of another one | |||
| return plugins or core.empty_tab | |||
| return plugins or {} | |||
There was a problem hiding this comment.
Suggested change
| return plugins or {} | |
| return plugins or core.tablepool.fetch("plugins", 0, 0) |
membphis
reviewed
Aug 23, 2021
t/node/global-rule.t
Outdated
|
|
||
|
|
||
|
|
||
| === TEST 17: delete global rules, ensure no stale data remain |
There was a problem hiding this comment.
bad title, need to more detail
spacewander
approved these changes
Aug 23, 2021
membphis
approved these changes
Aug 23, 2021
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 this PR does / why we need it:
fix the issue that plugins in global rule may be cached to route
Pre-submission checklist: