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: let etcd v3 read_watch handle the case where a chunk contains partial event or multiple events #154

Merged
merged 14 commits into from
Mar 3, 2022
+204 −26
Merged

fix: let etcd v3 read_watch handle the case where a chunk contains partial event or multiple events #154

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eb21766
fix: let etcd v3 `read_watch` handle the case where a chunk contains …
nic-6443 Feb 18, 2022
de344ce
add test case
nic-6443 Feb 26, 2022
64ca04b
fix code format
nic-6443 Feb 26, 2022
77e8ef7
undo useless change
nic-6443 Feb 27, 2022
7b456db
drop support for etcd vesion < v3.4.0
nic-6443 Feb 27, 2022
0faf78c
resolve comments
nic-6443 Feb 27, 2022
a85dab8
Update lib/resty/etcd/v3.lua
nic-6443 Feb 28, 2022
d60dea1
revert useless changes
nic-6443 Mar 1, 2022
331449a
Merge branch 'fix-read-watch' of github.com:api7/lua-resty-etcd into …
nic-6443 Mar 1, 2022
3a58c08
fix
nic-6443 Mar 2, 2022
46b56dd
add more comments
nic-6443 Mar 2, 2022
f428a26
reformat
nic-6443 Mar 2, 2022
aca8a02
fix body initial value
nic-6443 Mar 2, 2022
bb20595
rename variable
nic-6443 Mar 2, 2022
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
Prev Previous commit
Next Next commit
reformat
  • Loading branch information
@nic-6443
nic-6443 committed Mar 2, 2022
commit f428a265cb9c199377d77585e0c686a85b79df3f
6 changes: 3 additions & 3 deletions lib/resty/etcd/v3.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,9 +703,9 @@ local function request_chunk(self, method, path, opts, timeout)
if not body then
Copy link
Contributor

Choose a reason for hiding this comment

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

Look like this branch is not executed, as body has default value ""?

Copy link
Contributor Author

@nic-6443 nic-6443 Mar 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

yeah, my fault, body should initial with nil.

body = chunk
else
-- this branch will only be executed in rare cases,
-- for example, a single event json is larger than the proxy_buffer_size of nginx which proxies etcd,
-- so It would be ok to use a string concat directly without worry about the performance.
-- this branch will only be executed in rare cases, for example, a single event json
-- is larger than the proxy_buffer_size of nginx which proxies etcd, so it would be
-- ok to use a string concat directly without worry about the performance.
body = body .. chunk
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we use table.concat to avoid creating too much temp str?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK

end

Expand Down