[389-ds-base] branch 389-ds-base-1.3.9 updated: Ticket 50329 - revert fix
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
tbordaz pushed a commit to branch 389-ds-base-1.3.9
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.3.9 by this push:
new 9a89e77 Ticket 50329 - revert fix
9a89e77 is described below
commit 9a89e779fd68b9a5e7065301e66c3c6c710dd087
Author: Thierry Bordaz <tbordaz(a)redhat.com>
AuthorDate: Tue May 7 17:43:37 2019 +0200
Ticket 50329 - revert fix
Bug Description:
This fix introduces a regression BZ https://bugzilla.redhat.com/show_bug.cgi?id=1705125
https://pagure.io/389-ds-base/issue/50329
---
ldap/servers/slapd/connection.c | 75 ++---------------------------------------
1 file changed, 2 insertions(+), 73 deletions(-)
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index ba2b18f..53d2c51 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -937,10 +937,6 @@ connection_free_private_buffer(Connection *conn)
#define CONN_TURBO_PERCENTILE 50 /* proportion of threads allowed to be in turbo mode */
#define CONN_TURBO_HYSTERESIS 0 /* avoid flip flopping in and out of turbo mode */
-#define CONN_TIMEOUT_READ_SECURE 100 /* on secure connection a read can block if there
- * nothing to read. This timeout (millisecond)
- * is the maximum delay a worker will poll the connection
- */
void
connection_make_new_pb(Slapi_PBlock *pb, Connection *conn)
{
@@ -1092,78 +1088,11 @@ get_next_from_buffer(void *buffer __attribute__((unused)), size_t buffer_size __
return 0;
}
-/* this function is specific to secure socket that are in blocking mode
- * It polls the socket to check if we can read it
- * It returns
- * ret < 0: a poll failed (different from E_WOULD_BLOCK) 'err' is set
- * ret = 0: the socket can not be read for ioblocktimeout
- * ret > 0: the socket can be read
- */
-static int
-connection_poll_read_secure(Connection *conn, int32_t ioblocktimeout_config, PRInt32 *err)
-{
- int32_t ioblocktimeout_waits = ioblocktimeout_config / CONN_TIMEOUT_READ_SECURE;
- int32_t waits_done = 0;
- struct PRPollDesc pr_pd;
- PRInt32 ret;
- PRInt32 syserr = 0;
- PRIntervalTime timeout = PR_MillisecondsToInterval(CONN_TIMEOUT_READ_SECURE);
-
- /* The purpose of the loop is to check we can read the socket within the ioblocktimeout limit */
- do {
- pr_pd.fd = (PRFileDesc *) conn->c_prfd;
- pr_pd.in_flags = PR_POLL_READ;
- pr_pd.out_flags = 0;
- ret = PR_Poll(&pr_pd, 1, timeout);
- if (ret > 1) {
- /* most frequent case. Socket can be read right now so exit from the loop */
- break;
- } else if (ret == 0) {
- /* timeout */
- waits_done++;
- } else if (ret < 0) {
- syserr = PR_GetOSError();
- if (SLAPD_SYSTEM_WOULD_BLOCK_ERROR(syserr)) {
- /* If we would block, let's count it as a timeout and continue the loop */
- waits_done++;
- ret = 0;
- } else {
- /* A failure on a poll, no need to continue */
- *err = PR_GetError();
- break;
- }
- }
-
- if (waits_done > ioblocktimeout_waits) {
- /* We have been polling longer than ioblocktimeout
- * It is time to say it hang for too long
- */
- slapi_log_err(SLAPI_LOG_INFO, "connection_poll_read_secure",
- "Timeout (%d ms) while reading secured conn %" PRIu64 "\n", ioblocktimeout_config, conn->c_connid);
- ret = 0;
- break;
- }
- } while (ret == 0);
-
- /* At this point we have 3 options
- * ret < 0: a poll failed
- * ret = 0: the socket can not be read for ioblocktimeout
- * ret > 0: the socket can be read
- */
- return (int) ret;
-}
/* Either read read data into the connection buffer, or fail with err set */
static int
-connection_read_ldap_data(Connection *conn, int32_t ioblocktimeout_config, PRInt32 *err)
+connection_read_ldap_data(Connection *conn, PRInt32 *err)
{
int ret = 0;
- if (conn->c_flags & CONN_FLAG_SSL) {
- ret = connection_poll_read_secure(conn, ioblocktimeout_config, err);
- if (ret <= 0) {
- /* The socket hang for ioblocktimeout or poll failed */
- return ret;
- }
- }
ret = PR_Recv(conn->c_prfd, conn->c_private->c_buffer, conn->c_private->c_buffer_size, 0, PR_INTERVAL_NO_WAIT);
if (ret < 0) {
*err = PR_GetError();
@@ -1249,7 +1178,7 @@ connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, int *
PR_ASSERT(!new_operation || !conn_buffered_data_avail_nolock(conn, &conn_closed));
/* We make a non-blocking read call */
if (CONNECTION_BUFFER_OFF != conn->c_private->use_buffer) {
- ret = connection_read_ldap_data(conn, ioblocktimeout_config, &err);
+ ret = connection_read_ldap_data(conn, &err);
} else {
ret = get_next_from_buffer(NULL, 0, &len, tag, op->o_ber, conn);
if (ret == -1) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 11 months
- 1
- 0
[389-ds-base] branch 389-ds-base-1.4.0 updated: Ticket 50329 - revert fix
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
tbordaz pushed a commit to branch 389-ds-base-1.4.0
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.0 by this push:
new 4950a3e Ticket 50329 - revert fix
4950a3e is described below
commit 4950a3e37c431067f520dbecd258fcb72cbde2d7
Author: Thierry Bordaz <tbordaz(a)redhat.com>
AuthorDate: Tue May 7 17:43:37 2019 +0200
Ticket 50329 - revert fix
Bug Description:
This fix introduces a regression BZ https://bugzilla.redhat.com/show_bug.cgi?id=1705125
https://pagure.io/389-ds-base/issue/50329
---
ldap/servers/slapd/connection.c | 75 ++---------------------------------------
1 file changed, 2 insertions(+), 73 deletions(-)
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 8db7256..49ee306 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -941,10 +941,6 @@ connection_free_private_buffer(Connection *conn)
#define CONN_TURBO_PERCENTILE 50 /* proportion of threads allowed to be in turbo mode */
#define CONN_TURBO_HYSTERESIS 0 /* avoid flip flopping in and out of turbo mode */
-#define CONN_TIMEOUT_READ_SECURE 100 /* on secure connection a read can block if there
- * nothing to read. This timeout (millisecond)
- * is the maximum delay a worker will poll the connection
- */
void
connection_make_new_pb(Slapi_PBlock *pb, Connection *conn)
{
@@ -1096,78 +1092,11 @@ get_next_from_buffer(void *buffer __attribute__((unused)), size_t buffer_size __
return 0;
}
-/* this function is specific to secure socket that are in blocking mode
- * It polls the socket to check if we can read it
- * It returns
- * ret < 0: a poll failed (different from E_WOULD_BLOCK) 'err' is set
- * ret = 0: the socket can not be read for ioblocktimeout
- * ret > 0: the socket can be read
- */
-static int
-connection_poll_read_secure(Connection *conn, int32_t ioblocktimeout_config, PRInt32 *err)
-{
- int32_t ioblocktimeout_waits = ioblocktimeout_config / CONN_TIMEOUT_READ_SECURE;
- int32_t waits_done = 0;
- struct PRPollDesc pr_pd;
- PRInt32 ret;
- PRInt32 syserr = 0;
- PRIntervalTime timeout = PR_MillisecondsToInterval(CONN_TIMEOUT_READ_SECURE);
-
- /* The purpose of the loop is to check we can read the socket within the ioblocktimeout limit */
- do {
- pr_pd.fd = (PRFileDesc *) conn->c_prfd;
- pr_pd.in_flags = PR_POLL_READ;
- pr_pd.out_flags = 0;
- ret = PR_Poll(&pr_pd, 1, timeout);
- if (ret > 1) {
- /* most frequent case. Socket can be read right now so exit from the loop */
- break;
- } else if (ret == 0) {
- /* timeout */
- waits_done++;
- } else if (ret < 0) {
- syserr = PR_GetOSError();
- if (SLAPD_SYSTEM_WOULD_BLOCK_ERROR(syserr)) {
- /* If we would block, let's count it as a timeout and continue the loop */
- waits_done++;
- ret = 0;
- } else {
- /* A failure on a poll, no need to continue */
- *err = PR_GetError();
- break;
- }
- }
-
- if (waits_done > ioblocktimeout_waits) {
- /* We have been polling longer than ioblocktimeout
- * It is time to say it hang for too long
- */
- slapi_log_err(SLAPI_LOG_INFO, "connection_poll_read_secure",
- "Timeout (%d ms) while reading secured conn %" PRIu64 "\n", ioblocktimeout_config, conn->c_connid);
- ret = 0;
- break;
- }
- } while (ret == 0);
-
- /* At this point we have 3 options
- * ret < 0: a poll failed
- * ret = 0: the socket can not be read for ioblocktimeout
- * ret > 0: the socket can be read
- */
- return (int) ret;
-}
/* Either read read data into the connection buffer, or fail with err set */
static int
-connection_read_ldap_data(Connection *conn, int32_t ioblocktimeout_config, PRInt32 *err)
+connection_read_ldap_data(Connection *conn, PRInt32 *err)
{
int ret = 0;
- if (conn->c_flags & CONN_FLAG_SSL) {
- ret = connection_poll_read_secure(conn, ioblocktimeout_config, err);
- if (ret <= 0) {
- /* The socket hang for ioblocktimeout or poll failed */
- return ret;
- }
- }
ret = PR_Recv(conn->c_prfd, conn->c_private->c_buffer, conn->c_private->c_buffer_size, 0, PR_INTERVAL_NO_WAIT);
if (ret < 0) {
*err = PR_GetError();
@@ -1253,7 +1182,7 @@ connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, int *
PR_ASSERT(!new_operation || !conn_buffered_data_avail_nolock(conn, &conn_closed));
/* We make a non-blocking read call */
if (CONNECTION_BUFFER_OFF != conn->c_private->use_buffer) {
- ret = connection_read_ldap_data(conn, ioblocktimeout_config, &err);
+ ret = connection_read_ldap_data(conn, &err);
} else {
ret = get_next_from_buffer(NULL, 0, &len, tag, op->o_ber, conn);
if (ret == -1) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 11 months
- 1
- 0
[389-ds-base] branch master updated: Ticket 50329 - revert fix
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
tbordaz pushed a commit to branch master
in repository 389-ds-base.
The following commit(s) were added to refs/heads/master by this push:
new f35ad37 Ticket 50329 - revert fix
f35ad37 is described below
commit f35ad37100ab5915445d6d37f8921dd46f83656e
Author: Thierry Bordaz <tbordaz(a)redhat.com>
AuthorDate: Tue May 7 17:20:16 2019 +0200
Ticket 50329 - revert fix
Bug Description:
This fix introduces a regression BZ 1705125
https://pagure.io/389-ds-base/issue/50329
---
ldap/servers/slapd/connection.c | 71 -----------------------------------------
1 file changed, 71 deletions(-)
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index b0d5d41..5fcb1dd 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -941,10 +941,6 @@ connection_free_private_buffer(Connection *conn)
#define CONN_TURBO_PERCENTILE 50 /* proportion of threads allowed to be in turbo mode */
#define CONN_TURBO_HYSTERESIS 0 /* avoid flip flopping in and out of turbo mode */
-#define CONN_TIMEOUT_READ_SECURE 100 /* on secure connection a read can block if there
- * nothing to read. This timeout (millisecond)
- * is the maximum delay a worker will poll the connection
- */
void
connection_make_new_pb(Slapi_PBlock *pb, Connection *conn)
{
@@ -1096,78 +1092,11 @@ get_next_from_buffer(void *buffer __attribute__((unused)), size_t buffer_size __
return 0;
}
-/* this function is specific to secure socket that are in blocking mode
- * It polls the socket to check if we can read it
- * It returns
- * ret < 0: a poll failed (different from E_WOULD_BLOCK) 'err' is set
- * ret = 0: the socket can not be read for ioblocktimeout
- * ret > 0: the socket can be read
- */
-static int
-connection_poll_read_secure(Connection *conn, PRInt32 *err)
-{
- int32_t ioblocktimeout_waits = conn->c_ioblocktimeout / CONN_TIMEOUT_READ_SECURE;
- int32_t waits_done = 0;
- struct PRPollDesc pr_pd;
- PRInt32 ret;
- PRInt32 syserr = 0;
- PRIntervalTime timeout = PR_MillisecondsToInterval(CONN_TIMEOUT_READ_SECURE);
-
- /* The purpose of the loop is to check we can read the socket within the ioblocktimeout limit */
- do {
- pr_pd.fd = (PRFileDesc *) conn->c_prfd;
- pr_pd.in_flags = PR_POLL_READ;
- pr_pd.out_flags = 0;
- ret = PR_Poll(&pr_pd, 1, timeout);
- if (ret > 1) {
- /* most frequent case. Socket can be read right now so exit from the loop */
- break;
- } else if (ret == 0) {
- /* timeout */
- waits_done++;
- } else if (ret < 0) {
- syserr = PR_GetOSError();
- if (SLAPD_SYSTEM_WOULD_BLOCK_ERROR(syserr)) {
- /* If we would block, let's count it as a timeout and continue the loop */
- waits_done++;
- ret = 0;
- } else {
- /* A failure on a poll, no need to continue */
- *err = PR_GetError();
- break;
- }
- }
-
- if (waits_done > ioblocktimeout_waits) {
- /* We have been polling longer than ioblocktimeout
- * It is time to say it hang for too long
- */
- slapi_log_err(SLAPI_LOG_INFO, "connection_poll_read_secure",
- "Timeout (%d ms) while reading secured conn %" PRIu64 "\n", conn->c_ioblocktimeout, conn->c_connid);
- ret = 0;
- break;
- }
- } while (ret == 0);
-
- /* At this point we have 3 options
- * ret < 0: a poll failed
- * ret = 0: the socket can not be read for ioblocktimeout
- * ret > 0: the socket can be read
- */
- return (int) ret;
-}
/* Either read read data into the connection buffer, or fail with err set */
static int
connection_read_ldap_data(Connection *conn, PRInt32 *err)
{
int ret = 0;
- if (conn->c_flags & CONN_FLAG_SSL) {
- ret = connection_poll_read_secure(conn, err);
- if (ret <= 0) {
- /* The socket hang for ioblocktimeout or poll failed */
- return ret;
- }
- }
ret = PR_Recv(conn->c_prfd, conn->c_private->c_buffer, conn->c_private->c_buffer_size, 0, PR_INTERVAL_NO_WAIT);
if (ret < 0) {
*err = PR_GetError();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 11 months
- 1
- 0