X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdatabase.c;h=8b5820edb1a5eb9d0e229bf52b33d3f78154fa62;hb=0566e798cbfc711e22b2e7328ed1d07a14265313;hp=724ee0f941cb20f73cfc1f0609ed6837c8af4256;hpb=951fbe7c1ee0b3554af22d6ae0d1d51c1642ae0f;p=citadel.git diff --git a/citadel/database.c b/citadel/database.c index 724ee0f94..8b5820edb 100644 --- a/citadel/database.c +++ b/citadel/database.c @@ -1,7 +1,7 @@ /* * 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-2019 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. @@ -10,7 +10,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * */ /***************************************************************************** @@ -29,82 +28,54 @@ #include "sysdep.h" #include #include -#include -#include -#include -#include -#include #include +#include #include -#include #include -#ifdef HAVE_DB_H #include -#elif defined(HAVE_DB4_DB_H) -#include -#else -#error Neither nor was found by configure. Install db4-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 -#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) */ -void cdb_abort(void) { - syslog(LOG_DEBUG, - "citserver is stopping in order to prevent data loss. uid=%d gid=%d euid=%d egid=%d", - getuid(), - getgid(), - geteuid(), - getegid() +void cdb_abort(void) +{ + syslog(LOG_DEBUG, "db: citserver is stopping in order to prevent data loss. uid=%d gid=%d euid=%d egid=%d", + getuid(), getgid(), geteuid(), getegid() ); - cit_backtrace(); exit(CTDLEXIT_DB); } /* Verbose logging callback */ -void cdb_verbose_log(const DB_ENV *dbenv, const char *msg) +void cdb_verbose_log(const DB_ENV * dbenv, const char *msg) { if (!IsEmptyStr(msg)) { - syslog(LOG_DEBUG, "DB: %s", msg); - cit_backtrace(); + syslog(LOG_DEBUG, "db: %s", msg); } } /* Verbose logging callback */ -void cdb_verbose_err(const DB_ENV *dbenv, const char *errpfx, const char *msg) +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; + syslog(LOG_ERR, "db: %s", msg); } -/* just a little helper function */ +/* wrapper for txn_abort() that logs/aborts on error */ static void txabort(DB_TXN * tid) { int ret; @@ -112,12 +83,13 @@ static void txabort(DB_TXN * tid) ret = tid->abort(tid); if (ret) { - syslog(LOG_EMERG, "bdb(): txn_abort: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: txn_abort: %s", db_strerror(ret)); cdb_abort(); } } -/* this one is even more helpful than the last. */ + +/* wrapper for txn_commit() that logs/aborts on error */ static void txcommit(DB_TXN * tid) { int ret; @@ -125,12 +97,13 @@ static void txcommit(DB_TXN * tid) ret = tid->commit(tid, 0); if (ret) { - syslog(LOG_EMERG, "bdb(): txn_commit: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: txn_commit: %s", db_strerror(ret)); cdb_abort(); } } -/* are you sensing a pattern yet? */ + +/* wrapper for txn_begin() that logs/aborts on error */ static void txbegin(DB_TXN ** tid) { int ret; @@ -138,34 +111,37 @@ static void txbegin(DB_TXN ** tid) ret = dbenv->txn_begin(dbenv, NULL, tid, 0); if (ret) { - syslog(LOG_EMERG, "bdb(): txn_begin: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: txn_begin: %s", db_strerror(ret)); cdb_abort(); } } + +/* panic callback */ static void dbpanic(DB_ENV * env, int errval) { - syslog(LOG_EMERG, "bdb(): PANIC: %s", db_strerror(errval)); - cit_backtrace(); + syslog(LOG_ERR, "db: PANIC: %s", db_strerror(errval)); } + static void cclose(DBC * cursor) { int ret; if ((ret = cursor->c_close(cursor))) { - syslog(LOG_EMERG, "bdb(): c_close: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: c_close: %s", db_strerror(ret)); cdb_abort(); } } + static void bailIfCursor(DBC ** cursors, const char *msg) { int i; for (i = 0; i < MAXCDB; i++) if (cursors[i] != NULL) { - syslog(LOG_EMERG, "bdb(): cursor still in progress on cdb %02x: %s", i, msg); + syslog(LOG_ERR, "db: cursor still in progress on cdb %02x: %s", i, msg); cdb_abort(); } } @@ -176,61 +152,12 @@ void cdb_check_handles(void) bailIfCursor(TSD->cursors, "in check_handles"); if (TSD->tid != NULL) { - syslog(LOG_EMERG, "bdb(): transaction still in progress!"); + syslog(LOG_ERR, "db: transaction still in progress!"); cdb_abort(); } } -/* - * Cull the database logs - */ -static void cdb_cull_logs(void) -{ - u_int32_t flags; - int ret; - char **file, **list; - char errmsg[SIZ]; - - flags = DB_ARCH_ABS; - - /* Get the list of names. */ - if ((ret = dbenv->log_archive(dbenv, &list, flags)) != 0) { - syslog(LOG_ERR, "cdb_cull_logs: %s", db_strerror(ret)); - return; - } - - /* Print the list of names. */ - if (list != NULL) { - for (file = list; *file != NULL; ++file) { - syslog(LOG_DEBUG, "Deleting log: %s", *file); - ret = unlink(*file); - if (ret != 0) { - snprintf(errmsg, sizeof(errmsg), - " ** ERROR **\n \n \n " - "Citadel was unable to delete the " - "database log file '%s' because of the " - "following error:\n \n %s\n \n" - " This log file is no longer in use " - "and may be safely deleted.\n", - *file, strerror(errno)); - CtdlAideMessage(errmsg, "Database Warning Message"); - } - } - free(list); - } -} - -/* - * 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. */ @@ -238,22 +165,24 @@ void cdb_checkpoint(void) { int ret; - syslog(LOG_DEBUG, "-- db checkpoint --"); + syslog(LOG_DEBUG, "db: -- checkpoint --"); ret = dbenv->txn_checkpoint(dbenv, MAX_CHECKPOINT_KBYTES, MAX_CHECKPOINT_MINUTES, 0); if (ret != 0) { - syslog(LOG_EMERG, "cdb_checkpoint: txn_checkpoint: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: cdb_checkpoint() txn_checkpoint: %s", db_strerror(ret)); cdb_abort(); } /* After a successful checkpoint, we can cull the unused logs */ - if (config.c_auto_cull) { - cdb_cull_logs(); + if (CtdlGetConfigInt("c_auto_cull")) { + ret = dbenv->log_set_config(dbenv, DB_LOG_AUTO_REMOVE, 1); + } + else { + ret = dbenv->log_set_config(dbenv, DB_LOG_AUTO_REMOVE, 0); } } - /* * Open the various databases we'll be using. Any database which * does not exist should be created. Note that we don't need a @@ -267,66 +196,37 @@ void open_databases(void) 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_DEBUG, "db: open_databases() starting"); + syslog(LOG_DEBUG, "db: Compiled libdb: %s", DB_VERSION_STRING); + syslog(LOG_DEBUG, "db: Linked libdb: %s", db_version(&dbversion_major, &dbversion_minor, &dbversion_patch)); + syslog(LOG_DEBUG, "db: Linked zlib: %s", zlibVersion()); /* - * Silently try to create the database subdirectory. If it's - * already there, no problem. + * Silently try to create the database subdirectory. If it's already there, no problem. */ - if ((mkdir(ctdl_data_dir, 0700) != 0) && (errno != EEXIST)){ - syslog(LOG_EMERG, - "unable to create database directory [%s]: %s", - ctdl_data_dir, strerror(errno)); - } - if (chmod(ctdl_data_dir, 0700) != 0){ - syslog(LOG_EMERG, - "unable to set database directory accessrights [%s]: %s", - ctdl_data_dir, strerror(errno)); - } - if (chown(ctdl_data_dir, CTDLUID, (-1)) != 0){ - syslog(LOG_EMERG, - "unable to set the owner for [%s]: %s", - ctdl_data_dir, strerror(errno)); - } - syslog(LOG_DEBUG, "bdb(): Setting up DB environment\n"); - /* db_env_set_func_yield((int (*)(u_long, u_long))sched_yield); */ + if ((mkdir(ctdl_data_dir, 0700) != 0) && (errno != EEXIST)) { + syslog(LOG_ERR, "db: unable to create database directory [%s]: %m", ctdl_data_dir); + } + if (chmod(ctdl_data_dir, 0700) != 0) { + syslog(LOG_ERR, "db: unable to set database directory permissions [%s]: %m", ctdl_data_dir); + } + if (chown(ctdl_data_dir, CTDLUID, (-1)) != 0) { + syslog(LOG_ERR, "db: unable to set the owner for [%s]: %m", ctdl_data_dir); + } + syslog(LOG_DEBUG, "db: Setting up DB environment"); + // 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_ERR, "db: db_env_create: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: 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); @@ -336,85 +236,70 @@ void open_databases(void) */ ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0); if (ret) { - syslog(LOG_EMERG, "bdb(): set_cachesize: %s\n", db_strerror(ret)); + syslog(LOG_ERR, "db: set_cachesize: %s", db_strerror(ret)); dbenv->close(dbenv, 0); - syslog(LOG_EMERG, "exit code %d\n", ret); + syslog(LOG_ERR, "db: 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_ERR, "db: set_lk_detect: %s", db_strerror(ret)); dbenv->close(dbenv, 0); - syslog(LOG_EMERG, "exit code %d\n", ret); + syslog(LOG_ERR, "db: 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); - ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0); + flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_TXN | DB_INIT_LOCK | DB_THREAD | DB_INIT_LOG; + syslog(LOG_DEBUG, "db: dbenv->open(dbenv, %s, %d, 0)", ctdl_data_dir, flags); + ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0); // try opening the database cleanly if (ret == DB_RUNRECOVERY) { - syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret)); - syslog(LOG_ALERT, "Attempting recovery...\n"); + syslog(LOG_ERR, "db: dbenv->open: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: attempting recovery..."); flags |= DB_RECOVER; - ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0); + ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0); // try recovery } if (ret == DB_RUNRECOVERY) { - syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret)); - syslog(LOG_ALERT, "Attempting catastrophic recovery...\n"); + syslog(LOG_ERR, "db: dbenv->open: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: attempting catastrophic recovery..."); flags &= ~DB_RECOVER; flags |= DB_RECOVER_FATAL; - ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0); + ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0); // try catastrophic recovery } if (ret) { - syslog(LOG_EMERG, "dbenv->open: %s\n", db_strerror(ret)); + syslog(LOG_ERR, "db: dbenv->open: %s", db_strerror(ret)); dbenv->close(dbenv, 0); - syslog(LOG_EMERG, "exit code %d\n", ret); + syslog(LOG_ERR, "db: exit code %d", ret); exit(CTDLEXIT_DB); } - syslog(LOG_INFO, "Starting up DB\n"); - + syslog(LOG_INFO, "db: mounting databases"); for (i = 0; i < MAXCDB; ++i) { - - /* Create a database handle */ - ret = db_create(&dbp[i], dbenv, 0); + ret = db_create(&dbp[i], dbenv, 0); // Create a database handle if (ret) { - syslog(LOG_EMERG, "db_create: %s\n", db_strerror(ret)); - syslog(LOG_EMERG, "exit code %d\n", ret); + syslog(LOG_ERR, "db: db_create: %s", db_strerror(ret)); + syslog(LOG_ERR, "db: exit code %d", ret); exit(CTDLEXIT_DB); } - - /* Arbitrary names for our tables -- we reference them by - * number, so we don't have string names for them. - */ - snprintf(dbfilename, sizeof dbfilename, "cdb.%02x", i); - - ret = dbp[i]->open(dbp[i], - NULL, - dbfilename, - NULL, - DB_BTREE, - DB_CREATE | DB_AUTO_COMMIT | DB_THREAD, - 0600 - ); + snprintf(dbfilename, sizeof dbfilename, "cdb.%02x", i); // table names by number + ret = dbp[i]->open(dbp[i], NULL, dbfilename, NULL, DB_BTREE, DB_CREATE | DB_AUTO_COMMIT | DB_THREAD, 0600); if (ret) { - syslog(LOG_EMERG, "db_open[%02x]: %s\n", i, db_strerror(ret)); + syslog(LOG_ERR, "db: 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_ERR, "db: 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_ERR, "db: exit code %d", ret); exit(CTDLEXIT_DB); } } - } -/* Make sure we own all the files, because in a few milliseconds - * we're going to drop root privs. +/* + * Make sure we own all the files, because in a few milliseconds we're going to drop root privs. */ -void cdb_chmod_data(void) { +void cdb_chmod_data(void) +{ DIR *dp; struct dirent *d; char filename[PATH_MAX]; @@ -423,21 +308,15 @@ void cdb_chmod_data(void) { 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, "db: chmod(%s, 0600) returned %d", filename, chmod(filename, 0600)); + syslog(LOG_DEBUG, "db: 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"); } @@ -447,25 +326,31 @@ void cdb_chmod_data(void) { */ void close_databases(void) { - int a; + int i; int ret; + syslog(LOG_INFO, "db: 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, "db: flushing the database logs"); + if ((ret = dbenv->log_flush(dbenv, NULL))) { + syslog(LOG_ERR, "db: log_flush: %s", db_strerror(ret)); } - /* print some statistics... */ #ifdef DB_STAT_ALL + /* print some statistics... */ dbenv->lock_stat_print(dbenv, DB_STAT_ALL); #endif /* close the tables */ - for (a = 0; a < MAXCDB; ++a) { - syslog(LOG_INFO, "Closing database %02x\n", a); - ret = dbp[a]->close(dbp[a], 0); + syslog(LOG_INFO, "db: closing databases"); + for (i = 0; i < MAXCDB; ++i) { + syslog(LOG_INFO, "db: closing database %02x", i); + ret = dbp[i]->close(dbp[i], 0); if (ret) { - syslog(LOG_EMERG, "db_close: %s\n", db_strerror(ret)); + syslog(LOG_ERR, "db: db_close: %s", db_strerror(ret)); } } @@ -473,7 +358,7 @@ void close_databases(void) /* Close the handle. */ ret = dbenv->close(dbenv, 0); if (ret) { - syslog(LOG_EMERG, "DBENV->close: %s\n", db_strerror(ret)); + syslog(LOG_EMERG, "db: DBENV->close: %s", db_strerror(ret)); } } @@ -485,11 +370,9 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb) { static int magic = COMPRESS_MAGIC; - if ((cdb == NULL) || - (cdb->ptr == NULL) || - (cdb->len < sizeof(magic)) || - (memcmp(cdb->ptr, &magic, sizeof(magic)))) - return; + if ((cdb == NULL) || (cdb->ptr == NULL) || (cdb->len < sizeof(magic)) || (memcmp(cdb->ptr, &magic, sizeof(magic)))) { + return; + } /* At this point we know we're looking at a compressed item. */ @@ -501,8 +384,9 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb) memset(&zheader, 0, sizeof(struct CtdlCompressHeader)); cplen = sizeof(struct CtdlCompressHeader); - if (sizeof(struct CtdlCompressHeader) > cdb->len) + if (sizeof(struct CtdlCompressHeader) > cdb->len) { cplen = cdb->len; + } memcpy(&zheader, cdb->ptr, cplen); compressed_data = cdb->ptr; @@ -513,10 +397,8 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb) uncompressed_data = malloc(zheader.uncompressed_len); if (uncompress((Bytef *) uncompressed_data, - (uLongf *) & destLen, - (const Bytef *) compressed_data, - (uLong) sourceLen) != Z_OK) { - syslog(LOG_EMERG, "uncompress() error\n"); + (uLongf *) & destLen, (const Bytef *) compressed_data, (uLong) sourceLen) != Z_OK) { + syslog(LOG_EMERG, "db: uncompress() error"); cdb_abort(); } @@ -526,7 +408,6 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb) } - /* * Store a piece of data. Returns 0 if the operation was successful. If a * key already exists it should be overwritten. @@ -547,25 +428,21 @@ int cdb_store(int cdb, const void *ckey, int ckeylen, void *cdata, int cdatalen) memset(&dkey, 0, sizeof(DBT)); memset(&ddata, 0, sizeof(DBT)); dkey.size = ckeylen; - /* no, we don't care for this error. */ - dkey.data = ckey; - + dkey.data = (void *) ckey; ddata.size = cdatalen; ddata.data = cdata; - /* Only compress Visit records. Everything else is uncompressed. */ - if (cdb == CDB_VISIT) { + /* Only compress Visit and UseTable records. Everything else is uncompressed. */ + if ((cdb == CDB_VISIT) || (cdb == CDB_USETABLE)) { 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"); + &destLen, (Bytef *) cdata, (uLongf) cdatalen, 1) != Z_OK) { + syslog(LOG_EMERG, "db: compress2() error"); cdb_abort(); } zheader.compressed_len = (size_t) destLen; @@ -575,19 +452,20 @@ int cdb_store(int cdb, const void *ckey, int ckeylen, void *cdata, int cdatalen) } if (TSD->tid != NULL) { - ret = dbp[cdb]->put(dbp[cdb], /* db */ - TSD->tid, /* transaction ID */ - &dkey, /* key */ - &ddata, /* data */ - 0); /* flags */ + ret = dbp[cdb]->put(dbp[cdb], // db + TSD->tid, // transaction ID + &dkey, // key + &ddata, // data + 0 // flags + ); if (ret) { - syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret)); + syslog(LOG_EMERG, "db: cdb_store(%d): %s", cdb, db_strerror(ret)); cdb_abort(); } - if (compressing) + if (compressing) { free(compressed_data); + } return ret; - } else { bailIfCursor(TSD->cursors, "attempt to write during r/o cursor"); @@ -603,7 +481,7 @@ int cdb_store(int cdb, const void *ckey, int ckeylen, void *cdata, int cdatalen) txabort(tid); goto retry; } else { - syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret)); + syslog(LOG_EMERG, "db: cdb_store(%d): %s", cdb, db_strerror(ret)); cdb_abort(); } } else { @@ -635,7 +513,7 @@ int cdb_delete(int cdb, void *key, int keylen) 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, "db: cdb_delete(%d): %s", cdb, db_strerror(ret)); if (ret != DB_NOTFOUND) { cdb_abort(); } @@ -646,14 +524,12 @@ int cdb_delete(int cdb, void *key, int keylen) retry: txbegin(&tid); - if ((ret = dbp[cdb]->del(dbp[cdb], tid, &dkey, 0)) - && ret != DB_NOTFOUND) { + if ((ret = dbp[cdb]->del(dbp[cdb], tid, &dkey, 0)) && ret != DB_NOTFOUND) { if (ret == DB_LOCK_DEADLOCK) { txabort(tid); goto retry; } else { - syslog(LOG_EMERG, "cdb_delete(%d): %s\n", - cdb, db_strerror(ret)); + syslog(LOG_EMERG, "db: cdb_delete(%d): %s", cdb, db_strerror(ret)); cdb_abort(); } } else { @@ -663,18 +539,21 @@ int cdb_delete(int cdb, void *key, int keylen) return ret; } + static DBC *localcursor(int cdb) { int ret; DBC *curs; - if (TSD->cursors[cdb] == NULL) + if (TSD->cursors[cdb] == NULL) { ret = dbp[cdb]->cursor(dbp[cdb], TSD->tid, &curs, 0); - else + } + else { 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, "db: localcursor: %s", db_strerror(ret)); cdb_abort(); } @@ -695,45 +574,41 @@ struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen) memset(&dkey, 0, sizeof(DBT)); dkey.size = keylen; - /* no we don't care about this error. */ - dkey.data = key; + dkey.data = (void *) key; if (TSD->tid != NULL) { memset(&dret, 0, sizeof(DBT)); dret.flags = DB_DBT_MALLOC; - ret = dbp[cdb]->get(dbp[cdb], TSD->tid, &dkey, &dret, 0); + ret = dbp[cdb]->get(dbp[cdb], TSD->tid, &dkey, &dret, 0); // crashing here } else { DBC *curs; do { memset(&dret, 0, sizeof(DBT)); dret.flags = DB_DBT_MALLOC; - curs = localcursor(cdb); - ret = curs->c_get(curs, &dkey, &dret, DB_SET); cclose(curs); } while (ret == DB_LOCK_DEADLOCK); - } if ((ret != 0) && (ret != DB_NOTFOUND)) { - syslog(LOG_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret)); + syslog(LOG_EMERG, "db: cdb_fetch(%d): %s", cdb, db_strerror(ret)); cdb_abort(); } - if (ret != 0) + if (ret != 0) { return NULL; + } + tempcdb = (struct cdbdata *) malloc(sizeof(struct cdbdata)); if (tempcdb == NULL) { - syslog(LOG_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n"); + syslog(LOG_EMERG, "db: cdb_fetch: Cannot allocate memory for tempcdb"); cdb_abort(); - return NULL; /* make it easier for static analysis... */ - } - else - { + return NULL; /* make it easier for static analysis... */ + } else { tempcdb->len = dret.size; tempcdb->ptr = dret.data; cdb_decompress_if_necessary(tempcdb); @@ -758,6 +633,7 @@ void cdb_free(struct cdbdata *cdb) free(cdb); } + void cdb_close_cursor(int cdb) { if (TSD->cursors[cdb] != NULL) { @@ -767,6 +643,7 @@ void cdb_close_cursor(int cdb) TSD->cursors[cdb] = NULL; } + /* * Prepare for a sequential search of an entire database. * (There is guaranteed to be no more than one traversal in @@ -777,8 +654,7 @@ void cdb_rewind(int cdb) 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, "db: cdb_rewind: must close cursor on database %d before reopening", cdb); cdb_abort(); /* cclose(TSD->cursors[cdb]); */ } @@ -788,7 +664,7 @@ void cdb_rewind(int 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, "db: cdb_rewind: db_cursor: %s", db_strerror(ret)); cdb_abort(); } } @@ -813,7 +689,7 @@ struct cdbdata *cdb_next_item(int cdb) if (ret) { if (ret != DB_NOTFOUND) { - syslog(LOG_EMERG, "cdb_next_item(%d): %s\n", cdb, db_strerror(ret)); + syslog(LOG_EMERG, "db: cdb_next_item(%d): %s", cdb, db_strerror(ret)); cdb_abort(); } cdb_close_cursor(cdb); @@ -829,40 +705,36 @@ struct cdbdata *cdb_next_item(int cdb) } - /* * Transaction-based stuff. I'm writing this as I bake cookies... */ - void cdb_begin_transaction(void) { 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, "db: cdb_begin_transaction: ERROR: nested transaction"); cdb_abort(); } txbegin(&TSD->tid); } + void cdb_end_transaction(void) { int i; 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", - i); + syslog(LOG_WARNING, "db: 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, "db: cdb_end_transaction: ERROR: txcommit(NULL) !!"); cdb_abort(); } else { txcommit(TSD->tid); @@ -871,6 +743,7 @@ void cdb_end_transaction(void) TSD->tid = NULL; } + /* * Truncate (delete every record) */ @@ -881,7 +754,7 @@ void cdb_trunc(int cdb) u_int32_t count; if (TSD->tid != NULL) { - syslog(LOG_EMERG, "cdb_trunc must not be called in a transaction."); + syslog(LOG_EMERG, "db: cdb_trunc must not be called in a transaction."); cdb_abort(); } else { bailIfCursor(TSD->cursors, "attempt to write during r/o cursor"); @@ -897,9 +770,10 @@ void cdb_trunc(int cdb) /* txabort(tid); */ goto retry; } else { - syslog(LOG_EMERG, "cdb_truncate(%d): %s\n", cdb, db_strerror(ret)); + syslog(LOG_EMERG, "db: 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."); + syslog(LOG_EMERG, + "db: 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."); } exit(CTDLEXIT_DB); } @@ -909,84 +783,101 @@ void cdb_trunc(int cdb) } } -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, - time_t antiexpire, - eCheckType cType, - long ccid, - long ioid) + +/* + * compact (defragment) the database , possibly returning space back to the underlying filesystem + */ +void cdb_compact(void) { - time_t InDBTimeStamp = 0; - struct UseTable ut; - struct cdbdata *cdbut; + int ret; + int i; - if (cType != eWrite) - { - SEENM_syslog(LOG_DEBUG, "Loading"); - cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid)); - if (cdbut != NULL) { - memcpy(&ut, cdbut->ptr, - ((cdbut->len > sizeof(struct UseTable)) ? - sizeof(struct UseTable) : cdbut->len)); - InDBTimeStamp = ut.ut_timestamp; - - if (InDBTimeStamp < antiexpire) - { - SEENM_syslog(LOG_DEBUG, "Found - Not expired."); - cdb_free(cdbut); - return InDBTimeStamp; - } - else - { - SEENM_syslog(LOG_DEBUG, "Found - Expired."); - InDBTimeStamp = ut.ut_timestamp; - cdb_free(cdbut); - } - } - else - { - SEENM_syslog(LOG_DEBUG, "not Found"); + syslog(LOG_DEBUG, "db: cdb_compact() started"); + for (i = 0; i < MAXCDB; i++) { + syslog(LOG_DEBUG, "db: compacting database %d", i); + ret = dbp[i]->compact(dbp[i], NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL); + if (ret) { + syslog(LOG_ERR, "db: compact: %s", db_strerror(ret)); } - - if (cType == eCheckExist) - return InDBTimeStamp; } + syslog(LOG_DEBUG, "db: cdb_compact() finished"); +} - memcpy(ut.ut_msgid, SKEY(guid)); - ut.ut_timestamp = now; - SEENM_syslog(LOG_DEBUG, "Saving"); - /* rewrite the record anyway, to update the timestamp */ - cdb_store(CDB_USETABLE, - SKEY(guid), - &ut, sizeof(struct UseTable) ); +// Has an item already been seen (is it in the CDB_USETABLE) ? +// Returns 0 if it hasn't, 1 if it has +// In either case, writes the item to the database for next time. +int CheckIfAlreadySeen(StrBuf *guid) +{ + int found = 0; + struct UseTable ut; + struct cdbdata *cdbut; + + syslog(LOG_DEBUG, "db: CheckIfAlreadySeen(%s)", ChrPtr(guid)); + cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid)); + if (cdbut != NULL) { + found = 1; + cdb_free(cdbut); + } - SEENM_syslog(LOG_DEBUG, "Done Saving"); - return InDBTimeStamp; + /* (Re)write the record, to update the timestamp. Zeroing it out makes it compress better. */ + memset(&ut, 0, sizeof(struct UseTable)); + memcpy(ut.ut_msgid, SKEY(guid)); + ut.ut_timestamp = time(NULL); + cdb_store(CDB_USETABLE, SKEY(guid), &ut, sizeof(struct UseTable)); + return (found); } -void LogDebugEnableSeenEnable(const int n) +void cmd_rsen(char *argbuf) { - SeentDebugEnabled = n; + 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); + } + } + CTDL_MODULE_INIT(database) { - if (!threading) - { - CtdlRegisterDebugFlagHook(HKEY("SeenDebug"), LogDebugEnableSeenEnable, &SeentDebugEnabled); + if (!threading) { + CtdlRegisterProtoHook(cmd_rsen, "RSEN", "manipulate Aggregators seen database"); } /* return our module id for the log */ - return "database"; + return "database"; }