* There is now a dedicated thread for doing database checkpoints.

[citadel.git] / citadel / database_sleepycat.c

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index 1ce1e1b2b5cdee8ef917b2e7a9a0577d0921ad91..1e4251bb726dd2dcc9e176dfdcab6e44858a932a 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -253,8 +253,6 @@ static void cdb_cull_logs(void)
                }
                free(list);
        }
-
-       lprintf(CTDL_INFO, "Database log file cull ended.\n");
 }
 
 
@@ -264,8 +262,15 @@ static void cdb_cull_logs(void)
 static void cdb_checkpoint(void)
 {
        int ret;
-       /* static time_t last_cull = 0L; */
+       static time_t last_run = 0L;
+
+       /* Only do a checkpoint once per minute. */
+       if ((time(NULL) - last_run) < 60L) {
+               return;
+       }
+       last_run = time(NULL);
 
+       lprintf(CTDL_DEBUG, "-- db checkpoint --\n");
        ret = dbenv->txn_checkpoint(dbenv,
                                    MAX_CHECKPOINT_KBYTES,
                                    MAX_CHECKPOINT_MINUTES, 0);
@@ -278,13 +283,31 @@ static void cdb_checkpoint(void)
 
        /* After a successful checkpoint, we can cull the unused logs */
        cdb_cull_logs();
+}
+
+
+/*
+ * Main loop for the checkpoint thread.
+ */
+void *checkpoint_thread(void *arg) {
+       struct CitContext checkpointCC;
+
+       lprintf(CTDL_DEBUG, "checkpoint_thread() initializing\n");
+
+       memset(&checkpointCC, 0, sizeof(struct CitContext));
+       checkpointCC.internal_pgm = 1;
+       checkpointCC.cs_pid = 0;
+       pthread_setspecific(MyConKey, (void *)&checkpointCC );
 
-       /* Cull the logs if we haven't done so for 24 hours
-          if ((time(NULL) - last_cull) > 86400L) {
-          last_cull = time(NULL);
-          cdb_cull_logs();
-          } */
+       cdb_allocate_tsd();
+
+       while (!time_to_die) {
+               cdb_checkpoint();
+               sleep(1);
+       }
 
+       lprintf(CTDL_DEBUG, "checkpoint_thread() exiting\n");
+       pthread_exit(NULL);
 }
 
 /*
@@ -406,7 +429,6 @@ void open_databases(void)
        }
 
        cdb_allocate_tsd();
-       CtdlRegisterSessionHook(cdb_checkpoint, EVT_TIMER);
 
        /* Now make sure we own all the files, because in a few milliseconds
         * we're going to drop root privs.
@@ -873,7 +895,7 @@ void cdb_end_transaction(void)
  */
 void cdb_trunc(int cdb)
 {
-       //DB_TXN *tid;
+       /* DB_TXN *tid; */
        int ret;
        u_int32_t count;
 
@@ -886,14 +908,14 @@ void cdb_trunc(int cdb)
                             "attempt to write during r/o cursor");
 
              retry:
-               //txbegin(&tid);
+               /* txbegin(&tid); */
 
                if ((ret = dbp[cdb]->truncate(dbp[cdb], /* db */
                                              NULL,     /* transaction ID */
                                              &count,   /* #rows deleted */
                                              0))) {    /* flags */
                        if (ret == DB_LOCK_DEADLOCK) {
-                               //txabort(tid);
+                               /* txabort(tid); */
                                goto retry;
                        } else {
                                lprintf(CTDL_EMERG,
@@ -902,7 +924,7 @@ void cdb_trunc(int cdb)
                                abort();
                        }
                } else {
-                       //txcommit(tid);
+                       /* txcommit(tid); */
                }
        }
 }