/*
- * $Id: dbif.c,v 1.11 2009-05-18 09:54:14 franklahm Exp $
+ * $Id: dbif.c,v 1.19 2009-12-21 06:41:09 franklahm Exp $
*
* Copyright (C) Joerg Lenneis 2003
* Copyright (C) Frank Lahm 2009
static char *old_dbfiles[] = {"cnid.db", NULL};
/* --------------- */
-static int upgrade_required()
+static int upgrade_required(void)
{
int i;
int found = 0;
int dbif_stamp(DBD *dbd, void *buffer, int size)
{
struct stat st;
- int rc;
+ int rc,cwd;
if (size < 8)
return -1;
+ /* Remember cwd */
+ if ((cwd = open(".", O_RDONLY)) < 0) {
+ LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+ return -1;
+ }
+
+ /* chdir to db_envhome */
+ if ((chdir(dbd->db_envhome)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
+ return -1;
+ }
+
if ((rc = stat(dbd->db_table[DBIF_CNID].name, &st)) < 0) {
LOG(log_error, logtype_cnid, "error stating database %s: %s", dbd->db_table[DBIF_CNID].name, db_strerror(rc));
return -1;
memset(buffer, 0, size);
memcpy(buffer, &st.st_ctime, sizeof(st.st_ctime));
+ if ((fchdir(cwd)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
+ return -1;
+ }
+
return 0;
}
return -1;
}
if (logfiles != NULL) {
+ /* Remember cwd */
+ if ((cwd = open(".", O_RDONLY)) < 0) {
+ LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+ goto logfiles_done;
+ }
+ /* chdir to db_envhome */
+ if ((chdir(dbd->db_envhome)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
+ goto logfiles_done;
+ }
+
for (file = logfiles; *file != NULL; file++) {
if (unlink(*file) < 0)
LOG(log_warning, logtype_cnid, "Error removing stale logfile %s: %s", *file, strerror(errno));
}
+
+ /* chdir back */
+ if ((fchdir(cwd)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
+ return -1;
+ }
+
+ logfiles_done:
free(logfiles);
}
}
/* --------------- */
-int dbif_open(DBD *dbd, struct db_param *dbp _U_, int do_truncate)
+int dbif_open(DBD *dbd, struct db_param *dbp, int reindex)
{
- int ret;
- int i;
+ int ret, i, cwd;
u_int32_t count;
+ struct stat st;
+ DB *upgrade_db;
+ /* Try to upgrade if it's a normal on-disk database */
+ if (dbd->db_envhome) {
+ /* Remember cwd */
+ if ((cwd = open(".", O_RDONLY)) < 0) {
+ LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+ return -1;
+ }
+
+ /* chdir to db_envhome. makes it easier checking for old db files and creating db_errlog file */
+ if ((chdir(dbd->db_envhome)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
+ return -1;
+ }
+
+ if ((stat(dbd->db_filename, &st)) == 0) {
+ LOG(log_debug, logtype_cnid, "See if we can upgrade the CNID database...");
+ if ((ret = db_create(&upgrade_db, dbd->db_env, 0))) {
+ LOG(log_error, logtype_cnid, "error creating handle for database: %s", db_strerror(ret));
+ return -1;
+ }
+ if ((ret = upgrade_db->upgrade(upgrade_db, dbd->db_filename, 0))) {
+ LOG(log_error, logtype_cnid, "error upgarding database: %s", db_strerror(ret));
+ return -1;
+ }
+ if ((ret = upgrade_db->close(upgrade_db, 0))) {
+ LOG(log_error, logtype_cnid, "error closing database: %s", db_strerror(ret));
+ return -1;
+ }
+ if ((ret = dbd->db_env->txn_checkpoint(dbd->db_env, 0, 0, DB_FORCE))) {
+ LOG(log_error, logtype_cnid, "error forcing checkpoint: %s", db_strerror(ret));
+ return -1;
+ }
+ LOG(log_debug, logtype_cnid, "Finished CNID database upgrade check");
+ }
+
+ if ((fchdir(cwd)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
+ return -1;
+ }
+ }
+
+ /* Now open databases ... */
for (i = 0; i != DBIF_DB_CNT; i++) {
if ((ret = db_create(&dbd->db_table[i].db, dbd->db_env, 0))) {
LOG(log_error, logtype_cnid, "error creating handle for database %s: %s",
}
}
+ if ( ! dbd->db_env) { /* In memory db */
+ if ((ret = dbd->db_table[i].db->set_cachesize(dbd->db_table[i].db,
+ 0,
+ dbp->cachesize,
+ 4)) /* split in 4 memory chunks */
+ < 0) {
+ LOG(log_error, logtype_cnid, "error setting cachesize %u KB for database %s: %s",
+ dbp->cachesize / 1024, dbd->db_table[i].name, db_strerror(ret));
+ return -1;
+ }
+ }
+
if (dbd->db_table[i].db->open(dbd->db_table[i].db,
dbd->db_txn,
dbd->db_filename,
if (dbd->db_errlog != NULL)
dbd->db_table[i].db->set_errfile(dbd->db_table[i].db, dbd->db_errlog);
- if (do_truncate && i > 0) {
+ if (reindex && i > 0) {
LOG(log_info, logtype_cnid, "Truncating CNID index.");
if ((ret = dbd->db_table[i].db->truncate(dbd->db_table[i].db, NULL, &count, 0))) {
LOG(log_error, logtype_cnid, "error truncating database %s: %s",
/* TODO: Implement CNID DB versioning info on new databases. */
/* Associate the secondary with the primary. */
- if (do_truncate)
+ if (reindex)
LOG(log_info, logtype_cnid, "Reindexing did/name index...");
if ((ret = dbd->db_table[0].db->associate(dbd->db_table[DBIF_CNID].db,
dbd->db_txn,
dbd->db_table[DBIF_IDX_DIDNAME].db,
didname,
- (do_truncate) ? DB_CREATE : 0))
+ (reindex) ? DB_CREATE : 0))
!= 0) {
LOG(log_error, logtype_cnid, "Failed to associate didname database: %s",db_strerror(ret));
return -1;
}
- if (do_truncate)
+ if (reindex)
LOG(log_info, logtype_cnid, "... done.");
- if (do_truncate)
+ if (reindex)
LOG(log_info, logtype_cnid, "Reindexing dev/ino index...");
if ((ret = dbd->db_table[0].db->associate(dbd->db_table[0].db,
dbd->db_txn,
dbd->db_table[DBIF_IDX_DEVINO].db,
devino,
- (do_truncate) ? DB_CREATE : 0))
+ (reindex) ? DB_CREATE : 0))
!= 0) {
LOG(log_error, logtype_cnid, "Failed to associate devino database: %s",db_strerror(ret));
return -1;
}
- if (do_truncate)
+ if (reindex)
LOG(log_info, logtype_cnid, "... done.");
return 0;
}
/* ------------------------ */
-int dbif_closedb(DBD *dbd)
+static int dbif_closedb(DBD *dbd)
{
int i;
int ret;
return 0;
}
+/*
+ In order to support silent database upgrades:
+ destroy env at cnid_dbd shutdown.
+ */
+int dbif_prep_upgrade(const char *path)
+{
+ int cwd, ret;
+ DBD *dbd;
+
+ LOG(log_debug, logtype_cnid, "Reopening BerkeleyDB environment");
+
+ if (NULL == (dbd = dbif_init(path, "cnid2.db")))
+ return -1;
+
+ /* Remember cwd */
+ if ((cwd = open(".", O_RDONLY)) < 0) {
+ LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+ return -1;
+ }
+
+ /* chdir to db_envhome. makes it easier checking for old db files and creating db_errlog file */
+ if ((chdir(dbd->db_envhome)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));
+ return -1;
+ }
+
+ if ((dbd->db_errlog = fopen(DB_ERRLOGFILE, "a")) == NULL)
+ LOG(log_warning, logtype_cnid, "error creating/opening DB errlogfile: %s", strerror(errno));
+
+ if ((fchdir(cwd)) != 0) {
+ LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));
+ return -1;
+ }
+
+ /* Get db_env handle */
+ if ((ret = db_env_create(&dbd->db_env, 0))) {
+ LOG(log_error, logtype_cnid, "error creating DB environment: %s", db_strerror(ret));
+ dbd->db_env = NULL;
+ return -1;
+ }
+
+ /* Set logfile */
+ if (dbd->db_errlog != NULL) {
+ dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
+ dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
+ dbd->db_env->set_verbose(dbd->db_env, DB_VERB_RECOVERY, 1);
+ }
+
+ /* Open environment with recovery */
+ if ((ret = dbd->db_env->open(dbd->db_env,
+ dbd->db_envhome,
+ DB_CREATE | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | DB_RECOVER | DB_PRIVATE,
+ 0))) {
+ LOG(log_error, logtype_cnid, "error opening DB environment: %s",
+ db_strerror(ret));
+ dbd->db_env->close(dbd->db_env, 0);
+ dbd->db_env = NULL;
+ return -1;
+ }
+
+ if (dbd->db_errlog != NULL)
+ fflush(dbd->db_errlog);
+
+ /* Remove logfiles */
+ if ((ret = dbd->db_env->log_archive(dbd->db_env, NULL, DB_ARCH_REMOVE))) {
+ LOG(log_error, logtype_cnid, "error removing transaction logfiles: %s", db_strerror(ret));
+ return -1;
+ }
+
+ if ((ret = dbd->db_env->close(dbd->db_env, 0))) {
+ LOG(log_error, logtype_cnid, "error closing DB environment after recovery: %s", db_strerror(ret));
+ dbd->db_env = NULL;
+ return -1;
+ }
+
+ LOG(log_debug, logtype_cnid, "BerkeleyDB environment recovery done.");
+
+ /* Get a new db_env handle and then remove environment */
+ if ((ret = db_env_create(&dbd->db_env, 0))) {
+ LOG(log_error, logtype_cnid, "error acquiring db_end handle: %s", db_strerror(ret));
+ dbd->db_env = NULL;
+ return -1;
+ }
+ if ((ret = dbd->db_env->remove(dbd->db_env, dbd->db_envhome, 0))) {
+ LOG(log_error, logtype_cnid, "error removing BerkeleyDB environment: %s", db_strerror(ret));
+ return -1;
+ }
+
+ LOG(log_debug, logtype_cnid, "Removed BerkeleyDB environment.");
+
+ return 0;
+}
+
/*
* The following three functions are wrappers for DB->get(), DB->put() and DB->del().
* All three return -1 on error. dbif_get()/dbif_del return 1 if the key was found and 0
{
int ret;
+ /* For cooperation with the dbd utility and its usage of a cursor */
+ if (dbd->db_cur) {
+ dbd->db_cur->close(dbd->db_cur);
+ dbd->db_cur = NULL;
+ }
+
if (dbif_txn_begin(dbd) < 0) {
LOG(log_error, logtype_cnid, "error deleting key/value from %s: %s",
dbd->db_table[dbi].name, db_strerror(errno));
/* Rootinfo node ? */
if (cnid == 0) {
- memcpy(&stamp, data.data + 4, sizeof(time_t));
- memcpy(&lastid, data.data + 20, sizeof(cnid_t));
+ memcpy(&stamp, (char *)data.data + 4, sizeof(time_t));
+ memcpy(&lastid, (char *)data.data + 20, sizeof(cnid_t));
lastid = ntohl(lastid);
strftime(timebuf, sizeof(timebuf), "%b %d %Y %H:%M:%S", localtime(&stamp));
printf("dbd stamp: 0x%08x (%s), next free CNID: %u\n", (unsigned int)stamp, timebuf, lastid + 1);
} else {
/* dev */
- memcpy(&dev, data.data + CNID_DEV_OFS, 8);
+ memcpy(&dev, (char *)data.data + CNID_DEV_OFS, 8);
dev = ntoh64(dev);
/* ino */
- memcpy(&ino, data.data + CNID_INO_OFS, 8);
+ memcpy(&ino, (char *)data.data + CNID_INO_OFS, 8);
ino = ntoh64(ino);
/* type */
- memcpy(&type, data.data + CNID_TYPE_OFS, 4);
+ memcpy(&type, (char *)data.data + CNID_TYPE_OFS, 4);
type = ntohl(type);
/* did */
- memcpy(&did, data.data + CNID_DID_OFS, 4);
+ memcpy(&did, (char *)data.data + CNID_DID_OFS, 4);
did = ntohl(did);
count++;
memcpy(&dev, key.data, CNID_DEV_LEN);
dev = ntoh64(dev);
/* ino */
- memcpy(&ino, key.data + CNID_DEV_LEN, CNID_INO_LEN);
+ memcpy(&ino, (char *)key.data + CNID_DEV_LEN, CNID_INO_LEN);
ino = ntoh64(ino);
printf("id: %10u <== dev: 0x%llx, ino: 0x%016llx\n",
return 0;
}
+/*
+ Iterates over dbd, returning cnids.
+ Uses in-value of cnid to seek to that cnid, then gets next and return that in cnid.
+ If close=1, close cursor.
+ Return -1 on error, 0 on EOD (end-of-database), 1 if returning cnid.
+*/
+int dbif_idwalk(DBD *dbd, cnid_t *cnid, int close)
+{
+ int rc;
+ int flag;
+ cnid_t id;
+
+ static DBT key = { 0 }, data = { 0 };
+ DB *db = dbd->db_table[DBIF_CNID].db;
+
+ if (close && dbd->db_cur) {
+ dbd->db_cur->close(dbd->db_cur);
+ dbd->db_cur = NULL;
+ return 0;
+ }
+
+ /* An dbif_del will have closed our cursor too */
+ if ( ! dbd->db_cur ) {
+ if (db->cursor(db, NULL, &dbd->db_cur, 0) != 0) {
+ LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
+ return -1;
+ }
+ flag = DB_SET_RANGE; /* This will seek to next cnid after the one just deleted */
+ id = htonl(*cnid);
+ key.data = &id;
+ key.size = sizeof(cnid_t);
+ } else
+ flag = DB_NEXT;
+
+ if ((rc = dbd->db_cur->get(dbd->db_cur, &key, &data, flag)) == 0) {
+ memcpy(cnid, key.data, sizeof(cnid_t));
+ *cnid = ntohl(*cnid);
+ return 1;
+ }
+
+ if (rc != DB_NOTFOUND) {
+ LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(errno));
+ dbd->db_cur->close(dbd->db_cur);
+ dbd->db_cur = NULL;
+ return -1;
+ }
+
+ if (dbd->db_cur) {
+ dbd->db_cur->close(dbd->db_cur);
+ dbd->db_cur = NULL;
+ }
+
+ return 0;
+}
projects / netatalk.git / blobdiff