Skip to content

[OCS-3013] Add retry limit for socket timeout #5

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

Open
filip-lazovic wants to merge 6 commits into
base: LF-1.5.2
Choose a base branch
from
Open

[OCS-3013] Add retry limit for socket timeout #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f582fe
[OCS-3013] Add retry limit for socket timeout
filip-lazovic Sep 6, 2023
4313076
rename from socket to connect
filip-lazovic Sep 6, 2023
ccd23a3
use max_retries for connect_timeout
filip-lazovic Sep 7, 2023
7746be5
add logs for tests
filip-lazovic Sep 8, 2023
76a4761
Merge remote-tracking branch 'origin/LF-1.5.2' into OCS-3013_connecti…
filip-lazovic Sep 11, 2023
42132f5
remove logs
filip-lazovic Sep 12, 2023
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
5 changes: 4 additions & 1 deletion lib/resty/cassandra/cluster.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,10 @@ local function handle_error(self, err, cql_code, coordinator, request)
elseif err == 'timeout' then
coordinator:close()
if self.retry_on_timeout then
return self:send_retry(request, 'timeout')
local should_retry = self.retry_policy:on_connect_timeout(request)
if should_retry then
return self:send_retry(request, 'timeout')
end
end
else
-- host seems down?
Expand Down
1 change: 1 addition & 0 deletions lib/resty/cassandra/policies/retry/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ function _M.new_policy(name)
on_unavailable = function() error('on_unavailable() not implemented') end,
on_read_timeout = function() error('on_read_timeout() not implemented') end,
on_write_timeout = function() error('on_write_timeout() not implemented') end,
on_connect_timeout = function() error('on_connect_timeout() not implemented') end,
}

retry_mt.__index = retry_mt
Expand Down
4 changes: 4 additions & 0 deletions lib/resty/cassandra/policies/retry/simple.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,8 @@ function _M:on_write_timeout(request)
return request.retries < self.max_retries
end

function _M:on_connect_timeout(request)
return request.retries < self.max_retries
end

return _M