/*
- * $Id: cnid_open.c,v 1.22 2001-12-07 17:29:06 jmarcus Exp $
+ * $Id: cnid_open.c,v 1.34 2002-01-21 04:48:14 jmarcus Exp $
*
* Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
* 1 -- parent of root directory (handled by afpd)
* 2 -- root directory (handled by afpd)
*
- * so, CNID_START begins at 3.
+ * CNIDs 4-16 are reserved according to page 31 of the AFP 3.0 spec so,
+ * CNID_START begins at 17.
*/
#ifdef HAVE_CONFIG_H
#endif /* HAVE_FCNTL_H */
#include <sys/param.h>
#include <sys/stat.h>
-#include <syslog.h>
+#include <atalk/logger.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif /* HAVE_SYS_TIME_H */
#include <db.h>
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif /* ! MIN */
-#define DBHOME ".AppleDB"
-#define DBCNID "cnid.db"
-#define DBDEVINO "devino.db"
-#define DBDIDNAME "didname.db" /* did/full name mapping */
-#define DBSHORTNAME "shortname.db" /* did/8+3 mapping */
-#define DBMACNAME "macname.db" /* did/31 mapping */
-#define DBLONGNAME "longname.db" /* did/unicode mapping */
-#define DBLOCKFILE "cnid.lock"
+#define DBHOME ".AppleDB"
+#define DBCNID "cnid.db"
+#define DBDEVINO "devino.db"
+#define DBDIDNAME "didname.db" /* did/full name mapping */
+#define DBSHORTNAME "shortname.db" /* did/8+3 mapping */
+#define DBMACNAME "macname.db" /* did/31 mapping */
+#define DBLONGNAME "longname.db" /* did/unicode mapping */
+#define DBLOCKFILE "cnid.lock"
+#define DBRECOVERFILE "cnid.dbrecover"
+#define DBCLOSEFILE "cnid.close"
#define DBHOMELEN 8
#define DBLEN 10
#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
DB_INIT_LOG | DB_INIT_TXN)
#else /* DB_VERSION_MINOR < 1 */
-#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
-DB_INIT_LOG | DB_INIT_TXN | DB_TXN_NOSYNC)
/*#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
-DB_INIT_LOG | DB_INIT_TXN)*/
+DB_INIT_LOG | DB_INIT_TXN | DB_TXN_NOSYNC)*/
+#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
+DB_INIT_LOG | DB_INIT_TXN)
#endif /* DB_VERSION_MINOR */
+/* Let's try and use the youngest lock detector if present.
+ * If we can't do that, then let DB3 use its default deadlock detector. */
+#if defined DB_LOCK_YOUNGEST
+#define DEAD_LOCK_DETECT DB_LOCK_YOUNGEST
+#else /* DB_LOCK_YOUNGEST */
+#define DEAD_LOCK_DETECT DB_LOCK_DEFAULT
+#endif /* DB_LOCK_YOUNGEST */
+
#define MAXITER 0xFFFF /* maximum number of simultaneously open CNID
* databases. */
static int have_lock = 0;
void *cnid_open(const char *dir) {
- struct stat st;
+ struct stat st, rsb, csb;
struct flock lock;
char path[MAXPATHLEN + 1];
+ char recover_file[MAXPATHLEN + 1];
CNID_private *db;
DBT key, data;
DB_TXN *tid;
u_int32_t DBEXTRAS = 0;
int open_flag, len;
- int rc;
+ int rc, rfd = -1;
if (!dir) {
return NULL;
/* this checks .AppleDB */
if ((len = strlen(dir)) > (MAXPATHLEN - DBLEN - 1)) {
- syslog(LOG_ERR, "cnid_open: Pathname too large: %s", dir);
+ LOG(log_error, logtype_default, "cnid_open: Pathname too large: %s", dir);
return NULL;
}
if ((db = (CNID_private *)calloc(1, sizeof(CNID_private))) == NULL) {
- syslog(LOG_ERR, "cnid_open: Unable to allocate memory for database");
+ LOG(log_error, logtype_default, "cnid_open: Unable to allocate memory for database");
return NULL;
}
strcpy(path + len, DBHOME);
if ((stat(path, &st) < 0) && (ad_mkdir(path, 0777) < 0)) {
- syslog(LOG_ERR, "cnid_open: DBHOME mkdir failed for %s", path);
+ LOG(log_error, logtype_default, "cnid_open: DBHOME mkdir failed for %s", path);
goto fail_adouble;
}
- /* Make sure cnid.lock goes in .AppleDB. */
- strcat(path, "/");
- len++;
+ /* Make sure cnid.lock goes in .AppleDB. */
+ strcat(path, "/");
+ len++;
+
+ strcpy(db->close_file, path);
+ strcat(db->close_file, DBCLOSEFILE);
+
+ /* Check to make sure that a client isn't in the process of closing
+ * the database environment. To do this, select on the close file. */
+ while(stat(db->close_file, &csb) == 0) {
+ struct timeval ct;
+ ct.tv_sec = 1;
+ ct.tv_usec = 0;
+ (void)select(0, NULL, NULL, NULL, &ct);
+ }
+
+ strcpy(recover_file, path);
+ strcat(recover_file, DBRECOVERFILE);
/* Search for a byte lock. This allows us to cleanup the log files
* at cnid_close() in a clean fashion.
lock.l_len = 1;
while (fcntl(db->lockfd, F_SETLK, &lock) < 0) {
if (++lock.l_start > MAXITER) {
- syslog(LOG_INFO, "cnid_open: Cannot establish logfile cleanup for database environment %s lock (lock failed)", path);
+ LOG(log_error, logtype_default, "cnid_open: Cannot establish logfile cleanup for database environment %s lock (lock failed)", path);
close(db->lockfd);
db->lockfd = -1;
break;
}
}
else {
- syslog(LOG_INFO, "cnid_open: Cannot establish logfile cleanup lock for database environment %s (open() failed)", path);
+ LOG(log_error, logtype_default, "cnid_open: Cannot establish logfile cleanup lock for database environment %s (open() failed)", path);
}
+ /* Create a file to represent database recovery. While this file
+ * exists, the database is being recovered, and all other clients will
+ * select until recovery is complete, and this file goes away. */
if (!have_lock && db->lockfd > -1 && lock.l_start == 0) {
- /* We test to see if we have exclusive database access. If we do, we
- * will open the database with the DB_RECOVER flag.
- */
-#ifdef DEBUG
- syslog(LOG_INFO, "cnid_open: Opening database environment %s with DB_RECOVER flag", path);
-#endif
- DBEXTRAS |= DB_RECOVER;
- have_lock = 1;
+ if (stat(recover_file, &rsb) == 0) {
+ (void)remove(recover_file);
+ }
+ if ((rfd = open(recover_file, O_RDWR | O_CREAT, 0666)) > -1) {
+ DBEXTRAS |= DB_RECOVER;
+ have_lock = 1;
+ }
+ }
+ else if (!have_lock) {
+ while (stat(recover_file, &rsb) == 0) {
+ struct timeval rt;
+ rt.tv_sec = 1;
+ rt.tv_usec = 0;
+ (void)select(0, NULL, NULL, NULL, &rt);
+ }
}
-
path[len + DBHOMELEN] = '\0';
open_flag = DB_CREATE;
* transaction, logging, and locking support if we ever hope to
* be a true multi-acess file server. */
if ((rc = db_env_create(&db->dbenv, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: db_env_create: %s", db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: db_env_create: %s", db_strerror(rc));
goto fail_lock;
}
/* Setup internal deadlock detection. */
- if ((rc = db->dbenv->set_lk_detect(db->dbenv, DB_LOCK_DEFAULT)) != 0) {
- syslog(LOG_ERR, "cnid_open: set_lk_detect: %s", db_strerror(rc));
+ if ((rc = db->dbenv->set_lk_detect(db->dbenv, DEAD_LOCK_DETECT)) != 0) {
+ LOG(log_error, logtype_default, "cnid_open: set_lk_detect: %s", db_strerror(rc));
goto fail_lock;
}
#if DB_VERSION_MINOR > 1
+#if 0
/* Take care of setting the DB_TXN_NOSYNC flag in db3 > 3.1.x. */
if ((rc = db->dbenv->set_flags(db->dbenv, DB_TXN_NOSYNC, 1)) != 0) {
- syslog(LOG_ERR, "cnid_open: set_flags: %s", db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: set_flags: %s", db_strerror(rc));
goto fail_lock;
}
+#endif
#endif /* DB_VERSION_MINOR > 1 */
/* Open the database environment. */
if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS | DBEXTRAS, 0666)) != 0) {
if (rc == DB_RUNRECOVERY) {
/* This is the mother of all errors. We _must_ fail here. */
- syslog(LOG_ERR, "cnid_open: CATASTROPHIC ERROR opening database environment %s. Run db_recovery -c immediately", path);
+ LOG(log_error, logtype_default, "cnid_open: CATASTROPHIC ERROR opening database environment %s. Run db_recovery -c immediately", path);
goto fail_lock;
}
/* Nope, not a MPOOL, either. Last-ditch effort: we'll try to
* open the environment with no flags. */
if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666)) != 0) {
- syslog(LOG_ERR, "cnid_open: dbenv->open of %s failed: %s",
- path, db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s",
+ path, db_strerror(rc));
goto fail_lock;
}
}
db->flags |= CNIDFLAG_DB_RO;
open_flag = DB_RDONLY;
- syslog(LOG_INFO, "cnid_open: Obtained read-only database environment %s", path);
+ LOG(log_info, logtype_default, "cnid_open: Obtained read-only database environment %s", path);
+ }
+
+ /* If we have the recovery lock, close the file, remove it, so other
+ * clients can proceed opening the DB environment. */
+ if (rfd > -1) {
+ (void)remove(recover_file);
+ switch(errno) {
+ case 0:
+ case ENOENT:
+ break;
+ default:
+ LOG(log_error, logtype_default, "cnid_open: Unable to remove %s: %s",
+ recover_file, strerror(errno));
+ }
+ close(rfd);
+ rfd = -1;
}
/* did/name reverse mapping. We use a BTree for this one. */
if ((rc = db_create(&db->db_didname, db->dbenv, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to create did/name database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to create did/name database: %s",
+ db_strerror(rc));
goto fail_appinit;
}
- db->db_didname->set_bt_compare(db->db_didname, &compare_unix);
+ /*db->db_didname->set_bt_compare(db->db_didname, &compare_unix);*/
if ((rc = db->db_didname->open(db->db_didname, DBDIDNAME, NULL,
- DB_BTREE, open_flag, 0666))) {
- syslog(LOG_ERR, "cnid_open: Failed to open did/name database: %s",
- db_strerror(rc));
+ DB_HASH, open_flag, 0666))) {
+ LOG(log_error, logtype_default, "cnid_open: Failed to open did/name database: %s",
+ db_strerror(rc));
goto fail_appinit;
}
dbversion_retry:
if ((rc = txn_begin(db->dbenv, NULL, &tid, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: txn_begin: failed to check db version: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: txn_begin: failed to check db version: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
switch (rc) {
case DB_LOCK_DEADLOCK:
if ((ret = txn_abort(tid)) != 0) {
- syslog(LOG_ERR, "cnid_open: txn_abort: %s", db_strerror(ret));
+ LOG(log_error, logtype_default, "cnid_open: txn_abort: %s", db_strerror(ret));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
DB_NOOVERWRITE))) {
if (ret == DB_LOCK_DEADLOCK) {
if ((ret = txn_abort(tid)) != 0) {
- syslog(LOG_ERR, "cnid_open: txn_abort: %s",
- db_strerror(ret));
+ LOG(log_error, logtype_default, "cnid_open: txn_abort: %s",
+ db_strerror(ret));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
/* At this point, we don't care if the transaction aborts
* successfully or not. */
txn_abort(tid);
- syslog(LOG_ERR, "cnid_open: Error putting new version: %s",
- db_strerror(ret));
+ LOG(log_error, logtype_default, "cnid_open: Error putting new version: %s",
+ db_strerror(ret));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
break; /* while loop */
default:
txn_abort(tid);
- syslog(LOG_ERR, "cnid_open: Failed to check db version: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to check db version: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
}
if ((rc = txn_commit(tid, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to commit db version: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to commit db version: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
#ifdef EXTENDED_DB
/* did/macname (31 character) mapping. Use a BTree for this one. */
if ((rc = db_create(&db->db_macname, db->dbenv, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to create did/macname database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to create did/macname database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
db->db_macname->set_bt_compare(db->db_macname, &compare_mac);
if ((rc = db->db_macname->open(db->db_macname, DBMACNAME, NULL, DB_BTREE, open_flag, 0666)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to open did/macname database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to open did/macname database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
/* did/shortname (DOS 8.3) mapping. Use a BTree for this one. */
if ((rc = db_create(&db->db_shortname, db->dbenv, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to create did/shortname database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to create did/shortname database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
goto fail_appinit;
db->db_shortname->set_bt_compare(db->db_shortname, &compare_mac);
if ((rc = db->db_shortname->open(db->db_shortname, DBSHORTNAME, NULL, DB_BTREE, open_flag, 0666)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to open did/shortname database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to open did/shortname database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
goto fail_appinit;
/* did/longname (Unicode) mapping. Use a BTree for this one. */
if ((rc = db_create(&db->db_longname, db->dbenv, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to create did/longname database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to create did/longname database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
db->db_shortname->close(db->db_shortname, 0);
db->db_longname->set_bt_compare(db->db_longname, &compare_unicode);
if ((rc = db->db_longname->open(db->db_longname, DBLONGNAME, NULL, DB_BTREE, open_flag, 0666)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to open did/longname database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to open did/longname database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
db->db_shortname->close(db->db_shortname, 0);
/* dev/ino reverse mapping. Use a hash for this one. */
if ((rc = db_create(&db->db_devino, db->dbenv, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to create dev/ino database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to create dev/ino database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
}
if ((rc = db->db_devino->open(db->db_devino, DBDEVINO, NULL, DB_HASH, open_flag, 0666)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to open devino database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to open devino database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
/* Main CNID database. Use a hash for this one. */
if ((rc = db_create(&db->db_cnid, db->dbenv, 0)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to create cnid database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to create cnid database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
if ((rc = db->db_cnid->open(db->db_cnid, DBCNID, NULL, DB_HASH, open_flag, 0666)) != 0) {
- syslog(LOG_ERR, "cnid_open: Failed to open dev/ino database: %s",
- db_strerror(rc));
+ LOG(log_error, logtype_default, "cnid_open: Failed to open dev/ino database: %s",
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
return db;
fail_appinit:
- syslog(LOG_ERR, "cnid_open: Failed to setup CNID DB environment");
+ LOG(log_error, logtype_default, "cnid_open: Failed to setup CNID DB environment");
db->dbenv->close(db->dbenv, 0);
fail_lock:
if (db->lockfd > -1) {
close(db->lockfd);
}
+ if (rfd > -1) {
+ (void)remove(recover_file);
+ close(rfd);
+ }
fail_adouble:
projects / netatalk.git / blobdiff