Skip to content

Fixes for ClickHouse #18

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

Merged
alexey-milovidov merged 6 commits into from
Jul 1, 2024
Merged

Fixes for ClickHouse #18

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
53f4f57
Fix calling wait_io_or_timeout() (pass is_read properly for writes)
azat Jul 1, 2024
32233e9
Partial fix for MDEV-27405:
9EOR9 Jul 8, 2022
fa83a85
Fix usage of wait_io_or_timeout from TLS layers
azat Jul 1, 2024
607ff32
Merge remote-tracking branch 'me/ch/wait_io_or_timeout-fixes' into 3.1
azat Jul 1, 2024
84b61a6
Merge remote-tracking branch 'me/ch/SSL_read' into 3.1
azat Jul 1, 2024
7310dec
Merge remote-tracking branch 'me/ch/wait_io_or_timeout-write-fix' int…
azat Jul 1, 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
4 changes: 2 additions & 2 deletions libmariadb/secure/gnutls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
{
if (rc != GNUTLS_E_AGAIN && rc != GNUTLS_E_INTERRUPTED)
return rc;
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, pvio->mysql->options.read_timeout) < 1)
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, pvio->timeout[PVIO_READ_TIMEOUT]) < 1)
return rc;
}
return rc;
Expand All @@ -1297,7 +1297,7 @@ ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
{
if (rc != GNUTLS_E_AGAIN && rc != GNUTLS_E_INTERRUPTED)
return rc;
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, pvio->mysql->options.write_timeout) < 1)
if (pvio->methods->wait_io_or_timeout(pvio, FALSE, pvio->timeout[PVIO_WRITE_TIMEOUT]) < 1)
return rc;
}
return rc;
Expand Down
10 changes: 5 additions & 5 deletions libmariadb/secure/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,11 +628,11 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
{
switch(SSL_get_error(ssl, rc)) {
case SSL_ERROR_WANT_READ:
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, mysql->options.connect_timeout) < 1)
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, pvio->timeout[PVIO_CONNECT_TIMEOUT]) < 1)
try_connect= 0;
break;
case SSL_ERROR_WANT_WRITE:
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, mysql->options.connect_timeout) < 1)
if (pvio->methods->wait_io_or_timeout(pvio, FALSE, pvio->timeout[PVIO_CONNECT_TIMEOUT]) < 1)
try_connect= 0;
break;
default:
Expand Down Expand Up @@ -726,12 +726,12 @@ ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
int rc;
MARIADB_PVIO *pvio= ctls->pvio;

while ((rc= SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length)) < 0)
while ((rc= SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length)) <= 0)
{
int error= SSL_get_error((SSL *)ctls->ssl, rc);
if (error != SSL_ERROR_WANT_READ)
return rc;
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, pvio->mysql->options.read_timeout) < 1)
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, pvio->timeout[PVIO_READ_TIMEOUT]) < 1)
return rc;
}
return rc;
Expand All @@ -747,7 +747,7 @@ ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
int error= SSL_get_error((SSL *)ctls->ssl, rc);
if (error != SSL_ERROR_WANT_WRITE)
return rc;
if (pvio->methods->wait_io_or_timeout(pvio, TRUE, pvio->mysql->options.write_timeout) < 1)
if (pvio->methods->wait_io_or_timeout(pvio, FALSE, pvio->timeout[PVIO_WRITE_TIMEOUT]) < 1)
return rc;
}
return rc;
Expand Down