From 067ef4945e6813a5456f74da2091f068c46bfb57 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Fri, 18 Mar 2011 09:12:55 -0400 Subject: Exit periodic loop if a ROLLBACK fails, to avoid infinite looping when the database server is brought down --- src/c/request.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/c/request.c') diff --git a/src/c/request.c b/src/c/request.c index a5f0e2f1..2d0d0dc7 100644 --- a/src/c/request.c +++ b/src/c/request.c @@ -111,7 +111,8 @@ static void *periodic_loop(void *data) { else if (r == FATAL) p->ls->log_error(p->ls->logger_data, "Fatal error: %s\n", uw_error_message(ctx)); if (r == FATAL || r == BOUNDED_RETRY || r == UNLIMITED_RETRY) - try_rollback(ctx, 0, p->ls->logger_data, p->ls->log_error); + if (try_rollback(ctx, 0, p->ls->logger_data, p->ls->log_error)) + return NULL; } while (r == UNLIMITED_RETRY || (r == BOUNDED_RETRY && retries_left > 0)); if (r != FATAL && r != BOUNDED_RETRY) -- cgit v1.2.3