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.

Sign up for GitHub

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

fix: corrupt data in routes() response due to healthchecker data #11844

Merged
merged 16 commits into from
Dec 27, 2024
Merged

fix: corrupt data in routes() response due to healthchecker data #11844

Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fe52f2a
fix: corrupt data in routes() due to user requeset
Revolyssup Dec 19, 2024
e7a1c32
fix tests
Revolyssup Dec 20, 2024
24826aa
remove unnnecessary fields
Revolyssup Dec 22, 2024
e24b9e6
revert init.lua
Revolyssup Dec 22, 2024
1420a86
Merge branch 'master' of github.com:apache/apisix into revolyssup/cor…
Revolyssup Dec 22, 2024
172292b
fix tests
Revolyssup Dec 22, 2024
27a6fa6
Merge branch 'revolyssup/corrupt-data-in-route' of github.com:Revolys…
Revolyssup Dec 22, 2024
21387f2
fix tests
Revolyssup Dec 22, 2024
8900fa1
fix test
Revolyssup Dec 22, 2024
0ca4ee3
move logic to deepcopy
Revolyssup Dec 23, 2024
0086c69
remove unnecessary line
Revolyssup Dec 23, 2024
1620a48
apply suggestions
Revolyssup Dec 25, 2024
0c1e544
add test
Revolyssup Dec 26, 2024
305c216
Update control-healthcheck-bug-fix.t
Revolyssup Dec 26, 2024
40b70aa
Update control-healthcheck-bug-fix.t
Revolyssup Dec 26, 2024
6217e11
lint fix
Revolyssup Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apisix/control/v1.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,13 @@ local function iter_add_get_routes_info(values, route_id)
if new_route.value.upstream and new_route.value.upstream.parent then
new_route.value.upstream.parent = nil
end
-- remove healthcheck info
nic-6443 marked this conversation as resolved.
Show resolved Hide resolved
new_route.checker = nil
membphis marked this conversation as resolved.
Show resolved Hide resolved
new_route.checker_idx = nil
new_route.checker_upstream = nil
if new_route.clean_handlers then
new_route.clean_handlers = {}
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just also set to nil

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some existing test cases grep logs and expect this to {}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then you can fix the test case as well.
Checking the logs has no meaning for the control api.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

core.table.insert(infos, new_route)
-- check the route id
if route_id and route.value.id == route_id then
Expand Down
Loading