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

Add cancel\rollback timeout

This commit is contained in:
Andrey 2020-02-06 18:48:04 +05:00 committed by kirill reshke
parent c39e8961c7
commit 29efc7812e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources/backend.c
View File

@ -512,7 +512,7 @@ od_backend_ready_wait(od_server_t *server, char *context, int count,
}
int
od_backend_query(od_server_t *server, char *context, char *query, int len)
od_backend_query(od_server_t *server, char *context, char *query, int len, uint32_t timeout)
{
od_instance_t *instance = server->global->instance;
@ -532,6 +532,6 @@ od_backend_query(od_server_t *server, char *context, char *query, int len)
/* update server sync state */
od_server_sync_request(server, 1);
rc = od_backend_ready_wait(server, context, 1, UINT32_MAX);
rc = od_backend_ready_wait(server, context, 1, timeout);
return rc;
}

2
sources/backend.h
View File

@ -15,6 +15,6 @@ void od_backend_error(od_server_t*, char*, char*, uint32_t);
int od_backend_update_parameter(od_server_t*, char*, char*, uint32_t, int);
int od_backend_ready(od_server_t*, char*, uint32_t);
int od_backend_ready_wait(od_server_t*, char*, int, uint32_t);
int od_backend_query(od_server_t*, char*, char*, int);
int od_backend_query(od_server_t*, char*, char*, int, uint32_t);
#endif /* ODYSSEY_BACKEND_H */

4
sources/reset.c
View File

@ -118,7 +118,7 @@ od_reset(od_server_t *server)
if (server->is_transaction) {
char query_rlb[] = "ROLLBACK";
rc = od_backend_query(server, "reset-rollback", query_rlb,
sizeof(query_rlb));
sizeof(query_rlb), wait_timeout);
if (rc == -1)
goto error;
assert(! server->is_transaction);
@ -129,7 +129,7 @@ od_reset(od_server_t *server)
if (route->rule->pool_discard) {
char query_discard[] = "DISCARD ALL";
rc = od_backend_query(server, "reset-discard", query_discard,
sizeof(query_discard));
sizeof(query_discard), wait_timeout);
if (rc == -1)
goto error;
}