Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement router retry timeout

This commit is contained in:
Andrey Borodin 2019-06-27 17:24:44 +05:00
parent d9b829c901
commit 6a3c1f78f7
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sources/frontend.c
View File

@ -185,20 +185,11 @@ od_frontend_attach(od_client_t *client, char *context, kiwi_params_t *route_para
rc = od_backend_connect(server, context, route_params);
if (rc == -1) {
/* if pool timeout is enabled we can retry */
uint32_t timeout = route->rule->pool_timeout;
bool can_retry = timeout > 0 &&
bool can_retry = route->rule->pool_timeout > 0 &&
od_frontend_error_is_too_many_connections(client);
if (can_retry){
od_route_lock(route);
/* we should prepare reconnection and continue */
od_router_close(router, client);
/* enqueue client (pending -> queue) */
od_client_pool_set(&route->client_pool, client, OD_CLIENT_QUEUE);
od_route_unlock(route);
if (timeout == 0)
timeout = UINT32_MAX;
/* Wait until someone will pu connection back to pool */
rc = od_route_wait(route, timeout);
/* Wait until someone will put connection back to pool */
rc = od_router_wait_retry(route, client);
if (rc == -1) {
od_error(&instance->logger, "router", client, NULL,
"server pool wait timed out after receiving 'too many connections', closing");

28
sources/router.c
View File

@ -317,6 +317,34 @@ od_router_unroute(od_router_t *router, od_client_t *client)
od_route_unlock(route);
}
od_router_status_t
od_router_wait_retry(od_router_t *router, od_client_t *client)
{
od_route_t *route = client->route;
od_server_t *server = client->server;
od_backend_close_connection(server);
od_route_lock(route);
uint32_t timeout = route->rule->pool_timeout;
/* we should prepare reconnection and continue */
od_server_pool_set(&route->server_pool, server, OD_SERVER_UNDEF);
client->server = NULL;
server->client = NULL;
server->route = NULL;
/* enqueue client (pending -> queue) */
od_client_pool_set(&route->client_pool, client, OD_CLIENT_QUEUE);
od_route_unlock(route);
assert(server->io.io == NULL);
od_server_free(server);
/* Wait until someone will pu connection back to pool */
return od_route_wait(route, timeout);
}
od_router_status_t
od_router_attach(od_router_t *router, od_config_t *config, od_client_t *client)
{

3
sources/router.h
View File

@ -53,6 +53,9 @@ od_router_route(od_router_t*, od_config_t*, od_client_t*);
void
od_router_unroute(od_router_t*, od_client_t*);
od_router_status_t
od_router_wait_retry(od_router_t *router, od_client_t *client);
od_router_status_t
od_router_attach(od_router_t*, od_config_t*, od_client_t*);