MonetDB: logfix - fixed issue with flushnow not rotating all files.

[Niels Nes via checkin-list]

Changeset: 3ba2d2477269 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3ba2d2477269
Modified Files:
        gdk/gdk_logger.c
Branch: logfix
Log Message:

fixed issue with flushnow not rotating all files.


diffs (25 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2456,10 +2456,10 @@ log_flush(logger *lg, ulng ts)
                        rotation_unlock(lg);
                }
                if (res != LOG_ERR) {
-                       while(olid <= lid) {
+                       while(olid < lid) {
                                /* Try to cleanup, remove old log file, 
continue on failure! */
+                               olid++;
                                (void)log_cleanup(lg, olid);
-                               olid++;
                        }
                }
                if (res == LOG_OK)
@@ -3166,7 +3166,7 @@ log_tstart(logger *lg, bool flushnow, ul
                }
                assert(ATOMIC_GET(&lg->nr_flushers) == 0);
 
-               if (ATOMIC_GET(&lg->current->flushed_ts) < 
ATOMIC_GET(&lg->current->last_ts)) {
+               if (ATOMIC_GET(&lg->current->last_ts)) {
                        lg->id++;
                        if (log_open_output(lg) != GDK_SUCCEED)
                                GDKfatal("Could not create new log file\n"); // 
TODO: does not have to be fatal (yet)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org