dovecot-1.2: Redesigned auth request queuing to auth worker proc...
dovecot at dovecot.org
dovecot at dovecot.org
Tue Dec 16 07:50:50 EET 2008
details: http://hg.dovecot.org/dovecot-1.2/rev/b0bc4519332f
changeset: 8559:b0bc4519332f
user: Timo Sirainen <tss at iki.fi>
date: Tue Dec 16 07:50:44 2008 +0200
description:
Redesigned auth request queuing to auth worker processes.
Only a single request is now pending for a worker at a time. If a request
was queued for more than 3 seconds, log a warning (but no often than once in
5 minutes).
diffstat:
1 file changed, 182 insertions(+), 192 deletions(-)
src/auth/auth-worker-server.c | 374 +++++++++++++++++++----------------------
diffs (truncated from 525 to 300 lines):
diff -r 94e0fda6802e -r b0bc4519332f src/auth/auth-worker-server.c
--- a/src/auth/auth-worker-server.c Tue Dec 16 06:08:26 2008 +0200
+++ b/src/auth/auth-worker-server.c Tue Dec 16 07:50:44 2008 +0200
@@ -1,8 +1,9 @@
/* Copyright (c) 2005-2008 Dovecot authors, see the included COPYING file */
#include "common.h"
+#include "ioloop.h"
#include "array.h"
-#include "ioloop.h"
+#include "aqueue.h"
#include "network.h"
#include "istream.h"
#include "ostream.h"
@@ -13,12 +14,15 @@
#include <stdlib.h>
#include <unistd.h>
-#define AUTH_WORKER_MAX_OUTBUF_SIZE 10240
#define AUTH_WORKER_LOOKUP_TIMEOUT_SECS 60
#define AUTH_WORKER_MAX_IDLE_SECS (60*30)
+#define AUTH_WORKER_DELAY_WARN_SECS 3
+#define AUTH_WORKER_DELAY_WARN_MIN_INTERVAL_SECS 300
struct auth_worker_request {
unsigned int id;
+ time_t created;
+ const char *data_str;
struct auth_request *auth_request;
auth_worker_callback_t *callback;
};
@@ -32,9 +36,8 @@ struct auth_worker_connection {
struct timeout *to;
unsigned int id_counter;
- ARRAY_DEFINE(requests, struct auth_worker_request);
-
- unsigned int request_count;
+ struct auth_worker_request *request;
+
unsigned int requests_left;
};
@@ -43,20 +46,82 @@ static unsigned int auth_workers_max;
static unsigned int auth_workers_max;
static unsigned int auth_workers_max_request_count;
+static ARRAY_DEFINE(worker_request_array, struct auth_worker_request *);
+static struct aqueue *worker_request_queue;
+static time_t auth_worker_last_warn;
+
static char *worker_socket_path;
static void worker_input(struct auth_worker_connection *conn);
-static void auth_worker_destroy(struct auth_worker_connection *conn,
- const char *reason);
+static void auth_worker_destroy(struct auth_worker_connection **conn,
+ const char *reason, bool restart);
static void auth_worker_idle_timeout(struct auth_worker_connection *conn)
{
- i_assert(conn->request_count == 0);
+ i_assert(conn->request == NULL);
if (idle_count > 1)
- auth_worker_destroy(conn, NULL);
+ auth_worker_destroy(&conn, NULL, FALSE);
else
timeout_reset(conn->to);
+}
+
+static void auth_worker_call_timeout(struct auth_worker_connection *conn)
+{
+ i_assert(conn->request != NULL);
+
+ auth_worker_destroy(&conn, "Lookup timed out", TRUE);
+}
+
+static void auth_worker_request_send(struct auth_worker_connection *conn,
+ struct auth_worker_request *request)
+{
+ struct const_iovec iov[3];
+
+ i_assert(conn->requests_left > 0);
+
+ if (ioloop_time - request->created > AUTH_WORKER_DELAY_WARN_SECS &&
+ ioloop_time - auth_worker_last_warn >
+ AUTH_WORKER_DELAY_WARN_MIN_INTERVAL_SECS) {
+ auth_worker_last_warn = ioloop_time;
+ i_warning("auth workers: Auth request was queued for %d "
+ "seconds, %d left in queue",
+ (int)(ioloop_time - request->created),
+ aqueue_count(worker_request_queue));
+ }
+
+ request->id = ++conn->id_counter;
+
+ iov[0].iov_base = t_strdup_printf("%d\t", request->id);
+ iov[0].iov_len = strlen(iov[0].iov_base);
+ iov[1].iov_base = request->data_str;
+ iov[1].iov_len = strlen(request->data_str);
+ iov[2].iov_base = "\n";
+ iov[2].iov_len = 1;
+
+ o_stream_sendv(conn->output, iov, 3);
+
+ conn->request = request;
+ conn->requests_left--;
+
+ timeout_remove(&conn->to);
+ conn->to = timeout_add(AUTH_WORKER_LOOKUP_TIMEOUT_SECS * 1000,
+ auth_worker_call_timeout, conn);
+ idle_count--;
+}
+
+static void auth_worker_request_send_next(struct auth_worker_connection *conn)
+{
+ struct auth_worker_request *request, *const *requestp;
+
+ if (aqueue_count(worker_request_queue) == 0)
+ return;
+
+ requestp = array_idx(&worker_request_array,
+ aqueue_idx(worker_request_queue, 0));
+ request = *requestp;
+ aqueue_delete_tail(worker_request_queue);
+ auth_worker_request_send(conn, request);
}
static struct auth_worker_connection *auth_worker_create(void)
@@ -81,14 +146,15 @@ static struct auth_worker_connection *au
worker_socket_path);
}
- if (try == 5) {
- i_fatal("net_connect_unix(%s) "
- "failed after %d tries: %m",
- worker_socket_path, try);
- }
-
- /* not created yet? try again */
- sleep(1);
+ if (try == 50) {
+ i_error("net_connect_unix(%s) "
+ "failed after %d secs: %m",
+ worker_socket_path, try/10);
+ return NULL;
+ }
+
+ /* wait and try again */
+ usleep(100000);
}
conn = i_new(struct auth_worker_connection, 1);
@@ -97,7 +163,6 @@ static struct auth_worker_connection *au
FALSE);
conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
conn->io = io_add(fd, IO_READ, worker_input, conn);
- i_array_init(&conn->requests, 16);
conn->requests_left = auth_workers_max_request_count;
conn->to = timeout_add(AUTH_WORKER_MAX_IDLE_SECS * 1000,
auth_worker_idle_timeout, conn);
@@ -108,13 +173,14 @@ static struct auth_worker_connection *au
return conn;
}
-static void auth_worker_destroy(struct auth_worker_connection *conn,
- const char *reason)
-{
+static void auth_worker_destroy(struct auth_worker_connection **_conn,
+ const char *reason, bool restart)
+{
+ struct auth_worker_connection *conn = *_conn;
struct auth_worker_connection **connp;
- struct auth_worker_request *requests;
unsigned int i, count;
- const char *reply;
+
+ *_conn = NULL;
connp = array_get_modifiable(&connections, &count);
for (i = 0; i < count; i++) {
@@ -124,28 +190,19 @@ static void auth_worker_destroy(struct a
}
}
- if (conn->request_count == 0)
+ if (conn->request == NULL)
idle_count--;
- /* abort all pending requests */
- reply = t_strdup_printf("FAIL\t%d", PASSDB_RESULT_INTERNAL_FAILURE);
-
- requests = array_get_modifiable(&conn->requests, &count);
- for (i = 0; i < count; i++) {
- if (requests[i].id != 0) {
- auth_request_log_error(requests[i].auth_request,
- "worker-server",
- "Aborted: %s", reason);
- T_BEGIN {
- requests[i].callback(requests[i].auth_request,
- reply);
- } T_END;
- auth_request_unref(&requests[i].auth_request);
- }
- }
-
-
- array_free(&conn->requests);
+ if (conn->request != NULL) T_BEGIN {
+ struct auth_request *auth_request = conn->request->auth_request;
+
+ auth_request_log_error(auth_request, "worker-server",
+ "Aborted: %s", reason);
+ conn->request->callback(auth_request, t_strdup_printf(
+ "FAIL\t%d", PASSDB_RESULT_INTERNAL_FAILURE));
+ auth_request_unref(&conn->request->auth_request);
+ } T_END;
+
io_remove(&conn->io);
i_stream_destroy(&conn->input);
o_stream_destroy(&conn->output);
@@ -154,78 +211,47 @@ static void auth_worker_destroy(struct a
if (close(conn->fd) < 0)
i_error("close(auth worker) failed: %m");
i_free(conn);
-}
-
-static struct auth_worker_request *
-auth_worker_request_lookup(struct auth_worker_connection *conn,
- unsigned int id)
-{
- struct auth_worker_request *requests;
+
+ if (idle_count == 0 && restart) {
+ conn = auth_worker_create();
+ if (conn != NULL)
+ auth_worker_request_send_next(conn);
+ }
+}
+
+static struct auth_worker_connection *auth_worker_find_free(void)
+{
+ struct auth_worker_connection **conns;
unsigned int i, count;
- requests = array_get_modifiable(&conn->requests, &count);
+ if (idle_count == 0)
+ return NULL;
+
+ conns = array_get_modifiable(&connections, &count);
for (i = 0; i < count; i++) {
- if (requests[i].id == id)
- return &requests[i];
- }
+ if (conns[i]->request == NULL)
+ return conns[i];
+ }
+ i_unreached();
return NULL;
}
-static struct auth_worker_connection *auth_worker_find_free(void)
-{
- struct auth_worker_connection **conn, *best;
- unsigned int i, count;
- size_t outbuf_size, best_size;
-
- conn = array_get_modifiable(&connections, &count);
- if (idle_count > 0) {
- /* there exists at least one idle connection, use it */
- for (i = 0; i < count; i++) {
- if (conn[i]->request_count == 0)
- return conn[i];
- }
- i_unreached();
- }
-
- /* first the connection with least data in output buffer */
- best = NULL;
- best_size = (size_t)-1;
- for (i = 0; i < count; i++) {
- outbuf_size = o_stream_get_buffer_used_size(conn[i]->output);
- if (outbuf_size < best_size && conn[i]->requests_left > 0) {
- best = conn[i];
- best_size = outbuf_size;
- }
- }
-
- return best;
-}
-
-static void auth_worker_handle_request(struct auth_worker_connection *conn,
+static void auth_worker_request_handle(struct auth_worker_connection *conn,
struct auth_worker_request *request,
const char *line)
{
+ conn->request = NULL;
+ timeout_remove(&conn->to);
+ conn->to = timeout_add(AUTH_WORKER_MAX_IDLE_SECS * 1000,
More information about the dovecot-cvs
mailing list