From 1df419158f9b5e5865d971eb3ae3e99714e12c1b Mon Sep 17 00:00:00 2001 From: kanoi Date: Wed, 6 Aug 2014 13:00:46 +1000 Subject: [PATCH] ckdb - dont abort when reload completes --- src/ckdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ckdb.c b/src/ckdb.c index fbaa5123..a95173ea 100644 --- a/src/ckdb.c +++ b/src/ckdb.c @@ -7370,7 +7370,7 @@ static bool reload_from(tv_t *start) char *missing, *missing2; int missing_count; int processing; - bool ok = true; + bool ok = true, finished = false; char *filename; char data[MAX_READ]; uint64_t count, total; @@ -7394,7 +7394,7 @@ static bool reload_from(tv_t *start) total = 0; processing = 0; - while (ok) { + while (ok && !finished) { LOGWARNING("%s(): processing %s", __func__, filename); processing++; count = 0; @@ -7431,7 +7431,7 @@ static bool reload_from(tv_t *start) while (42) { start->tv_sec += ROLL_S; if (!tv_newer(start, &now)) { - ok = false; + finished = true; break; } filename = rotating_filename(restorefrom, start->tv_sec);