/*
* This is a data store backend for the Citadel server which uses Berkeley DB.
*
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 3.
/*****************************************************************************/
#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <dirent.h>
-#include <syslog.h>
#include <zlib.h>
#ifdef HAVE_DB_H
#include <db.h>
#elif defined(HAVE_DB4_DB_H)
-#include <db4/db.h>
+#include <db5/db.h>
#else
-#error Neither <db.h> nor <db4/db.h> was found by configure. Install db4-devel.
+#error Neither <db.h> nor <db5/db.h> was found by configure. Install db5-devel.
#endif
-
-#if DB_VERSION_MAJOR < 4 || DB_VERSION_MINOR < 1
-#error Citadel requires Berkeley DB v4.1 or newer. Please upgrade.
+#if DB_VERSION_MAJOR < 5
+#error Citadel requires Berkeley DB v5.0 or newer. Please upgrade.
#endif
-
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "citserver.h"
-#include "database.h"
-#include "msgbase.h"
-#include "sysdep_decls.h"
-#include "threads.h"
-#include "config.h"
-#include "control.h"
#include "ctdl_module.h"
-
+#include "control.h"
+#include "citserver.h"
+#include "config.h"
static DB *dbp[MAXCDB]; /* One DB handle for each Citadel database */
static DB_ENV *dbenv; /* The DB environment (global) */
/* Verbose logging callback */
void cdb_verbose_err(const DB_ENV *dbenv, const char *errpfx, const char *msg)
{
+ int *FOO = NULL;
syslog(LOG_ALERT, "DB: %s", msg);
cit_backtrace();
+ *FOO = 1;
}
/*
- * Cull the database logs
+ * Cull the database logs by removing log files that are no longer needed.
+ * Note: this code will be removed once we are confident that Berkeley DB can do this on its own.
*/
-static void cdb_cull_logs(void)
+void cdb_cull_logs(void)
{
u_int32_t flags;
int ret;
}
}
-/*
- * Manually initiate log file cull.
- */
-void cmd_cull(char *argbuf) {
- if (CtdlAccessCheck(ac_internal)) return;
- cdb_cull_logs();
- cprintf("%d Database log file cull completed.\n", CIT_OK);
-}
-
/*
* Request a checkpoint of the database. Called once per minute by the thread manager.
}
/* After a successful checkpoint, we can cull the unused logs */
- if (config.c_auto_cull) {
- cdb_cull_logs();
+ if (CtdlGetConfigInt("c_auto_cull")) {
+#ifdef DB_LOG_AUTO_REMOVE
+ ret = dbenv->log_set_config(dbenv, DB_LOG_AUTO_REMOVE, 1); // This version of Berkeley DB can cull the logs on its own!
+#else
+ cdb_cull_logs(); // Citadel knows how to do it too.
+#endif
+ }
+#ifdef DB_LOG_AUTO_REMOVE
+ else {
+ ret = dbenv->log_set_config(dbenv, DB_LOG_AUTO_REMOVE, 0);
}
+#endif
}
char dbfilename[32];
u_int32_t flags = 0;
int dbversion_major, dbversion_minor, dbversion_patch;
- int current_dbversion = 0;
syslog(LOG_DEBUG, "bdb(): open_databases() starting");
syslog(LOG_DEBUG, "Compiled db: %s", DB_VERSION_STRING);
- syslog(LOG_INFO, " Linked db: %s",
- db_version(&dbversion_major, &dbversion_minor, &dbversion_patch));
-
- current_dbversion = (dbversion_major * 1000000) + (dbversion_minor * 1000) + dbversion_patch;
-
- syslog(LOG_DEBUG, "Calculated dbversion: %d", current_dbversion);
- syslog(LOG_DEBUG, " Previous dbversion: %d", CitControl.MMdbversion);
-
- if ( (getenv("SUPPRESS_DBVERSION_CHECK") == NULL)
- && (CitControl.MMdbversion > current_dbversion) ) {
- syslog(LOG_EMERG, "You are attempting to run the Citadel server using a version");
- syslog(LOG_EMERG, "of Berkeley DB that is older than that which last created or");
- syslog(LOG_EMERG, "updated the database. Because this would probably cause data");
- syslog(LOG_EMERG, "corruption or loss, the server is aborting execution now.");
- exit(CTDLEXIT_DB);
- }
-
- CitControl.MMdbversion = current_dbversion;
- put_control();
-
- syslog(LOG_INFO, "Linked zlib: %s\n", zlibVersion());
+ syslog(LOG_INFO, " Linked db: %s", db_version(&dbversion_major, &dbversion_minor, &dbversion_patch));
+ syslog(LOG_INFO, "Linked zlib: %s", zlibVersion());
/*
* Silently try to create the database subdirectory. If it's
/* db_env_set_func_yield((int (*)(u_long, u_long))sched_yield); */
ret = db_env_create(&dbenv, 0);
if (ret) {
- syslog(LOG_EMERG, "bdb(): db_env_create: %s\n", db_strerror(ret));
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_EMERG, "bdb(): db_env_create: %s", db_strerror(ret));
+ syslog(LOG_EMERG, "exit code %d", ret);
exit(CTDLEXIT_DB);
}
dbenv->set_errpfx(dbenv, "citserver");
dbenv->set_paniccall(dbenv, dbpanic);
dbenv->set_errcall(dbenv, cdb_verbose_err);
dbenv->set_errpfx(dbenv, "ctdl");
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
dbenv->set_msgcall(dbenv, cdb_verbose_log);
-#endif
dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK, 1);
dbenv->set_verbose(dbenv, DB_VERB_RECOVERY, 1);
*/
ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0);
if (ret) {
- syslog(LOG_EMERG, "bdb(): set_cachesize: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "bdb(): set_cachesize: %s", db_strerror(ret));
dbenv->close(dbenv, 0);
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_EMERG, "exit code %d", ret);
exit(CTDLEXIT_DB);
}
if ((ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT))) {
- syslog(LOG_EMERG, "bdb(): set_lk_detect: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "bdb(): set_lk_detect: %s", db_strerror(ret));
dbenv->close(dbenv, 0);
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_EMERG, "exit code %d", ret);
exit(CTDLEXIT_DB);
}
flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_TXN | DB_INIT_LOCK | DB_THREAD | DB_RECOVER;
- syslog(LOG_DEBUG, "dbenv->open(dbenv, %s, %d, 0)\n", ctdl_data_dir, flags);
+ syslog(LOG_DEBUG, "dbenv->open(dbenv, %s, %d, 0)", ctdl_data_dir, flags);
ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
if (ret == DB_RUNRECOVERY) {
- syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret));
+ syslog(LOG_ALERT, "dbenv->open: %s", db_strerror(ret));
syslog(LOG_ALERT, "Attempting recovery...\n");
flags |= DB_RECOVER;
ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
}
if (ret == DB_RUNRECOVERY) {
- syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret));
- syslog(LOG_ALERT, "Attempting catastrophic recovery...\n");
+ syslog(LOG_ALERT, "dbenv->open: %s", db_strerror(ret));
+ syslog(LOG_ALERT, "Attempting catastrophic recovery...");
flags &= ~DB_RECOVER;
flags |= DB_RECOVER_FATAL;
ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
}
if (ret) {
- syslog(LOG_EMERG, "dbenv->open: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "dbenv->open: %s", db_strerror(ret));
dbenv->close(dbenv, 0);
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_EMERG, "exit code %d", ret);
exit(CTDLEXIT_DB);
}
- syslog(LOG_INFO, "Starting up DB\n");
+ syslog(LOG_INFO, "Starting up DB");
for (i = 0; i < MAXCDB; ++i) {
/* Create a database handle */
ret = db_create(&dbp[i], dbenv, 0);
if (ret) {
- syslog(LOG_EMERG, "db_create: %s\n", db_strerror(ret));
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_EMERG, "db_create: %s", db_strerror(ret));
+ syslog(LOG_EMERG, "exit code %d", ret);
exit(CTDLEXIT_DB);
}
0600
);
if (ret) {
- syslog(LOG_EMERG, "db_open[%02x]: %s\n", i, db_strerror(ret));
+ syslog(LOG_EMERG, "db_open[%02x]: %s", i, db_strerror(ret));
if (ret == ENOMEM) {
syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
}
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_EMERG, "exit code %d", ret);
exit(CTDLEXIT_DB);
}
}
if (dp != NULL) {
while (d = readdir(dp), d != NULL) {
if (d->d_name[0] != '.') {
- snprintf(filename, sizeof filename,
- "%s/%s", ctdl_data_dir, d->d_name);
- syslog(LOG_DEBUG, "chmod(%s, 0600) returned %d\n",
- filename, chmod(filename, 0600)
- );
- syslog(LOG_DEBUG, "chown(%s, CTDLUID, -1) returned %d\n",
+ snprintf(filename, sizeof filename, "%s/%s", ctdl_data_dir, d->d_name);
+ syslog(LOG_DEBUG, "chmod(%s, 0600) returned %d", filename, chmod(filename, 0600));
+ syslog(LOG_DEBUG, "chown(%s, CTDLUID, -1) returned %d",
filename, chown(filename, CTDLUID, (-1))
);
}
closedir(dp);
}
- syslog(LOG_DEBUG, "open_databases() finished\n");
- CtdlRegisterProtoHook(cmd_cull, "CULL", "Cull database logs");
+ syslog(LOG_DEBUG, "open_databases() finished");
}
int a;
int ret;
+ syslog(LOG_INFO, "Performing final checkpoint.");
if ((ret = dbenv->txn_checkpoint(dbenv, 0, 0, 0))) {
- syslog(LOG_EMERG,
- "txn_checkpoint: %s\n", db_strerror(ret));
+ syslog(LOG_ERR, "txn_checkpoint: %s", db_strerror(ret));
+ }
+
+ syslog(LOG_INFO, "Flushing the database logs.");
+ if ((ret = dbenv->log_flush(dbenv, NULL))) {
+ syslog(LOG_ERR, "log_flush: %s", db_strerror(ret));
}
/* print some statistics... */
/* close the tables */
for (a = 0; a < MAXCDB; ++a) {
- syslog(LOG_INFO, "Closing database %02x\n", a);
+ syslog(LOG_INFO, "Closing database %02x", a);
ret = dbp[a]->close(dbp[a], 0);
if (ret) {
- syslog(LOG_EMERG, "db_close: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "db_close: %s", db_strerror(ret));
}
}
/* Close the handle. */
ret = dbenv->close(dbenv, 0);
if (ret) {
- syslog(LOG_EMERG, "DBENV->close: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "DBENV->close: %s", db_strerror(ret));
}
}
if (uncompress((Bytef *) uncompressed_data,
(uLongf *) & destLen,
(const Bytef *) compressed_data,
- (uLong) sourceLen) != Z_OK) {
- syslog(LOG_EMERG, "uncompress() error\n");
+ (uLong) sourceLen) != Z_OK)
+ {
+ syslog(LOG_EMERG, "uncompress() error");
cdb_abort();
}
}
-
/*
* Store a piece of data. Returns 0 if the operation was successful. If a
* key already exists it should be overwritten.
compressing = 1;
zheader.magic = COMPRESS_MAGIC;
zheader.uncompressed_len = cdatalen;
- buffer_len = ((cdatalen * 101) / 100) + 100
- + sizeof(struct CtdlCompressHeader);
+ buffer_len = ((cdatalen * 101) / 100) + 100 + sizeof(struct CtdlCompressHeader);
destLen = (uLongf) buffer_len;
compressed_data = malloc(buffer_len);
if (compress2((Bytef *) (compressed_data + sizeof(struct CtdlCompressHeader)),
&destLen, (Bytef *) cdata, (uLongf) cdatalen, 1) != Z_OK)
{
- syslog(LOG_EMERG, "compress2() error\n");
+ syslog(LOG_EMERG, "compress2() error");
cdb_abort();
}
zheader.compressed_len = (size_t) destLen;
if (compressing)
free(compressed_data);
return ret;
-
- } else {
+ }
+ else {
bailIfCursor(TSD->cursors, "attempt to write during r/o cursor");
retry:
if (TSD->tid != NULL) {
ret = dbp[cdb]->del(dbp[cdb], TSD->tid, &dkey, 0);
if (ret) {
- syslog(LOG_EMERG, "cdb_delete(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "cdb_delete(%d): %s", cdb, db_strerror(ret));
if (ret != DB_NOTFOUND) {
cdb_abort();
}
txabort(tid);
goto retry;
} else {
- syslog(LOG_EMERG, "cdb_delete(%d): %s\n",
+ syslog(LOG_EMERG, "cdb_delete(%d): %s",
cdb, db_strerror(ret));
cdb_abort();
}
ret = TSD->cursors[cdb]->c_dup(TSD->cursors[cdb], &curs, DB_POSITION);
if (ret) {
- syslog(LOG_EMERG, "localcursor: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "localcursor: %s", db_strerror(ret));
cdb_abort();
}
}
if ((ret != 0) && (ret != DB_NOTFOUND)) {
- syslog(LOG_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "cdb_fetch(%d): %s", cdb, db_strerror(ret));
cdb_abort();
}
tempcdb = (struct cdbdata *) malloc(sizeof(struct cdbdata));
if (tempcdb == NULL) {
- syslog(LOG_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n");
+ syslog(LOG_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb");
cdb_abort();
return NULL; /* make it easier for static analysis... */
}
int ret = 0;
if (TSD->cursors[cdb] != NULL) {
- syslog(LOG_EMERG,
- "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
+ syslog(LOG_EMERG, "cdb_rewind: must close cursor on database %d before reopening.", cdb);
cdb_abort();
/* cclose(TSD->cursors[cdb]); */
}
*/
ret = dbp[cdb]->cursor(dbp[cdb], TSD->tid, &TSD->cursors[cdb], 0);
if (ret) {
- syslog(LOG_EMERG, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "cdb_rewind: db_cursor: %s", db_strerror(ret));
cdb_abort();
}
}
if (ret) {
if (ret != DB_NOTFOUND) {
- syslog(LOG_EMERG, "cdb_next_item(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "cdb_next_item(%d): %s", cdb, db_strerror(ret));
cdb_abort();
}
cdb_close_cursor(cdb);
bailIfCursor(TSD->cursors, "can't begin transaction during r/o cursor");
if (TSD->tid != NULL) {
- syslog(LOG_EMERG, "cdb_begin_transaction: ERROR: nested transaction\n");
+ syslog(LOG_EMERG, "cdb_begin_transaction: ERROR: nested transaction");
cdb_abort();
}
for (i = 0; i < MAXCDB; i++)
if (TSD->cursors[i] != NULL) {
syslog(LOG_WARNING,
- "cdb_end_transaction: WARNING: cursor %d still open at transaction end\n",
+ "cdb_end_transaction: WARNING: cursor %d still open at transaction end",
i);
cclose(TSD->cursors[i]);
TSD->cursors[i] = NULL;
}
if (TSD->tid == NULL) {
- syslog(LOG_EMERG,
- "cdb_end_transaction: ERROR: txcommit(NULL) !!\n");
+ syslog(LOG_ERR, "cdb_end_transaction: ERROR: txcommit(NULL) !!");
cdb_abort();
- } else {
+ }
+ else {
txcommit(TSD->tid);
}
if (TSD->tid != NULL) {
syslog(LOG_EMERG, "cdb_trunc must not be called in a transaction.");
cdb_abort();
- } else {
+ }
+ else {
bailIfCursor(TSD->cursors, "attempt to write during r/o cursor");
retry:
/* txabort(tid); */
goto retry;
} else {
- syslog(LOG_EMERG, "cdb_truncate(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "cdb_truncate(%d): %s", cdb, db_strerror(ret));
if (ret == ENOMEM) {
syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
}
int SeentDebugEnabled = 0;
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SeentDebugEnabled != 0))
-#define SEENM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%ld] SEEN[%s][%d] " FORMAT, \
- ioid, ccid, Facility, cType)
-
time_t CheckIfAlreadySeen(const char *Facility,
StrBuf *guid,
time_t now,
long ccid,
long ioid)
{
+ time_t InDBTimeStamp = 0;
struct UseTable ut;
struct cdbdata *cdbut;
if (cType != eWrite)
{
- time_t InDBTimeStamp = 0;
- SEENM_syslog(LOG_DEBUG, "Loading");
+ syslog(LOG_DEBUG, "Loading [%s]", ChrPtr(guid));
cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
- if (cdbut != NULL) {
+ if ((cdbut != NULL) && (cdbut->ptr != NULL)) {
memcpy(&ut, cdbut->ptr,
((cdbut->len > sizeof(struct UseTable)) ?
sizeof(struct UseTable) : cdbut->len));
-
- if (ut.ut_timestamp > antiexpire)
+ InDBTimeStamp = now - ut.ut_timestamp;
+
+ if (InDBTimeStamp < antiexpire)
{
- SEENM_syslog(LOG_DEBUG, "Found - Not expired.");
+ syslog(LOG_DEBUG, "Found - Not expired %ld < %ld", InDBTimeStamp, antiexpire);
cdb_free(cdbut);
- return ut.ut_timestamp;
+ return InDBTimeStamp;
}
else
{
- SEENM_syslog(LOG_DEBUG, "Found - Expired.");
- InDBTimeStamp = ut.ut_timestamp;
+ syslog(LOG_DEBUG, "Found - Expired. %ld >= %ld", InDBTimeStamp, antiexpire);
cdb_free(cdbut);
}
}
else
{
- SEENM_syslog(LOG_DEBUG, "not Found");
+ if (cdbut) cdb_free(cdbut);
+
+ syslog(LOG_DEBUG, "not Found");
+ if (cType == eCheckUpdate)
+ return 0;
}
if (cType == eCheckExist)
memcpy(ut.ut_msgid, SKEY(guid));
ut.ut_timestamp = now;
- SEENM_syslog(LOG_DEBUG, "Saving");
+ syslog(LOG_DEBUG, "Saving new Timestamp");
/* rewrite the record anyway, to update the timestamp */
cdb_store(CDB_USETABLE,
SKEY(guid),
&ut, sizeof(struct UseTable) );
- SEENM_syslog(LOG_DEBUG, "Done Saving");
- return 0;
+ syslog(LOG_DEBUG, "Done Saving");
+ return InDBTimeStamp;
}
+void cmd_rsen(char *argbuf) {
+ char Token[SIZ];
+ long TLen;
+ char Time[SIZ];
+
+ struct UseTable ut;
+ struct cdbdata *cdbut;
+
+ if (CtdlAccessCheck(ac_aide)) return;
+
+ TLen = extract_token(Token, argbuf, 1, '|', sizeof Token);
+ if (strncmp(argbuf, "GET", 3) == 0) {
+ cdbut = cdb_fetch(CDB_USETABLE, Token, TLen);
+ if (cdbut != NULL) {
+ memcpy(&ut, cdbut->ptr,
+ ((cdbut->len > sizeof(struct UseTable)) ?
+ sizeof(struct UseTable) : cdbut->len));
+
+ cprintf("%d %ld\n", CIT_OK, ut.ut_timestamp);
+ }
+ else {
+ cprintf("%d not found\n", ERROR + NOT_HERE);
+ }
+
+ }
+ else if (strncmp(argbuf, "SET", 3) == 0) {
+ memcpy(ut.ut_msgid, Token, TLen);
+ extract_token(Time, argbuf, 2, '|', sizeof Time);
+ ut.ut_timestamp = atol(Time);
+ cdb_store(CDB_USETABLE,
+ Token, TLen,
+ &ut, sizeof(struct UseTable) );
+ cprintf("%d token updated\n", CIT_OK);
+ }
+ else if (strncmp(argbuf, "DEL", 3) == 0) {
+ if (cdb_delete(CDB_USETABLE, Token, TLen))
+ cprintf("%d not found\n", ERROR + NOT_HERE);
+ else
+ cprintf("%d deleted.\n", CIT_OK);
+
+ }
+ else {
+ cprintf("%d Usage: [GET|SET|DEL]|Token|timestamp\n", ERROR);
+ }
+
+}
void LogDebugEnableSeenEnable(const int n)
{
SeentDebugEnabled = n;
if (!threading)
{
CtdlRegisterDebugFlagHook(HKEY("SeenDebug"), LogDebugEnableSeenEnable, &SeentDebugEnabled);
+ CtdlRegisterProtoHook(cmd_rsen, "RSEN", "manipulate Aggregators seen database");
}
/* return our module id for the log */
projects / citadel.git / blobdiff