X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fmain.c;h=e050a0e5137c4c1010f98ffc30865edffd4d384a;hb=2f3b0704e93342aaa09d2ec79f936d7c0ebbb828;hp=91027157292ea7dea5d85373b1c948cf95959d37;hpb=0d0481713f2a145802f8afc86750b58f10174fd4;p=netatalk.git diff --git a/etc/cnid_dbd/main.c b/etc/cnid_dbd/main.c index 91027157..e050a0e5 100644 --- a/etc/cnid_dbd/main.c +++ b/etc/cnid_dbd/main.c @@ -32,23 +32,25 @@ #include #include #include +#include #include "db_param.h" #include "dbif.h" #include "dbd.h" #include "comm.h" -#define LOCKFILENAME "lock" - /* Note: DB_INIT_LOCK is here so we can run the db_* utilities while netatalk is running. It's a likey performance hit, but it might we worth it. */ -#define DBOPTIONS (DB_CREATE | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | DB_RECOVER) +#define DBOPTIONS (DB_CREATE | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN) -static DBD *dbd; +/* Global, needed by pack.c:idxname() */ +struct volinfo volinfo; +static DBD *dbd; static int exit_sig = 0; +static int db_locked; static void sig_exit(int signo) { @@ -253,33 +255,6 @@ static void switch_to_user(char *dir) } } -/* ------------------------ */ -static int get_lock(void) -{ - int lockfd; - struct flock lock; - - if ((lockfd = open(LOCKFILENAME, O_RDWR | O_CREAT, 0644)) < 0) { - LOG(log_error, logtype_cnid, "main: error opening lockfile: %s", strerror(errno)); - exit(1); - } - - lock.l_start = 0; - lock.l_whence = SEEK_SET; - lock.l_len = 0; - lock.l_type = F_WRLCK; - - if (fcntl(lockfd, F_SETLK, &lock) < 0) { - if (errno == EACCES || errno == EAGAIN) { - exit(0); - } else { - LOG(log_error, logtype_cnid, "main: fcntl F_WRLCK lockfile: %s", strerror(errno)); - exit(1); - } - } - - return lockfd; -} /* ----------------------- */ static void set_signal(void) @@ -303,62 +278,99 @@ static void set_signal(void) } } -/* ----------------------- */ -static void free_lock(int lockfd) -{ - struct flock lock; - - lock.l_start = 0; - lock.l_whence = SEEK_SET; - lock.l_len = 0; - lock.l_type = F_UNLCK; - fcntl(lockfd, F_SETLK, &lock); - close(lockfd); -} - /* ------------------------ */ int main(int argc, char *argv[]) { struct db_param *dbp; - int err = 0; - int lockfd, ctrlfd, clntfd; - char *dir, *logconfig; + int err = 0, ret, delete_bdb = 0; + int ctrlfd, clntfd; + char *logconfig; set_processname("cnid_dbd"); - /* FIXME: implement -d from cnid_metad */ - if (argc != 5) { + while (( ret = getopt( argc, argv, "vVd")) != -1 ) { + switch (ret) { + case 'v': + case 'V': + printf("cnid_dbd (Netatalk %s)\n", VERSION); + return -1; + case 'd': + delete_bdb = 1; + break; + } + } + + if (argc - optind != 4) { LOG(log_error, logtype_cnid, "main: not enough arguments"); - exit(1); + exit(EXIT_FAILURE); } - dir = argv[1]; - ctrlfd = atoi(argv[2]); - clntfd = atoi(argv[3]); - logconfig = strdup(argv[4]); + /* Load .volinfo file */ + if (loadvolinfo(argv[optind], &volinfo) == -1) { + LOG(log_error, logtype_cnid, "Cant load volinfo for \"%s\"", argv[1]); + exit(EXIT_FAILURE); + } + /* Put "/.AppleDB" at end of volpath, get path from volinfo file */ + char dbpath[MAXPATHLEN+1]; + if ((strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > MAXPATHLEN ) { + LOG(log_error, logtype_cnid, "CNID db pathname too long: \"%s\"", volinfo.v_dbpath); + exit(EXIT_FAILURE); + } + strncpy(dbpath, volinfo.v_dbpath, MAXPATHLEN - strlen("/.AppleDB")); + strcat(dbpath, "/.AppleDB"); + + ctrlfd = atoi(argv[optind + 1]); + clntfd = atoi(argv[optind + 2]); + logconfig = strdup(argv[optind + 3]); setuplog(logconfig); - switch_to_user(dir); + if (vol_load_charsets(&volinfo) == -1) { + LOG(log_error, logtype_cnid, "Error loading charsets!"); + exit(EXIT_FAILURE); + } + LOG(log_debug, logtype_cnid, "db dir: \"%s\"", dbpath); - /* Before we do anything else, check if there is an instance of cnid_dbd - running already and silently exit if yes. */ - lockfd = get_lock(); + switch_to_user(dbpath); - LOG(log_info, logtype_cnid, "Startup, DB dir %s", dir); + /* Get db lock */ + if ((db_locked = get_lock(LOCK_EXCL, dbpath)) == -1) { + LOG(log_error, logtype_cnid, "main: fatal db lock error"); + exit(1); + } + if (db_locked != LOCK_EXCL) { + /* Couldn't get exclusive lock, try shared lock */ + if ((db_locked = get_lock(LOCK_SHRD, NULL)) != LOCK_SHRD) { + LOG(log_error, logtype_cnid, "main: fatal db lock error"); + exit(1); + } + } + + if (delete_bdb && (db_locked == LOCK_EXCL)) { + LOG(log_warning, logtype_cnid, "main: too many CNID db opening attempts, wiping the slate clean"); + chdir(dbpath); + system("rm -f cnid2.db lock log.* __db.*"); + if ((db_locked = get_lock(LOCK_EXCL, dbpath)) != LOCK_EXCL) { + LOG(log_error, logtype_cnid, "main: fatal db lock error"); + exit(EXIT_FAILURE); + } + } set_signal(); /* SIGINT and SIGTERM are always off, unless we are in pselect */ block_sigs_onoff(1); - if ((dbp = db_param_read(dir, CNID_DBD)) == NULL) + if ((dbp = db_param_read(dbpath)) == NULL) exit(1); LOG(log_maxdebug, logtype_cnid, "Finished parsing db_param config file"); - if (NULL == (dbd = dbif_init(".", "cnid2.db"))) + if (NULL == (dbd = dbif_init(dbpath, "cnid2.db"))) exit(2); - if (dbif_env_open(dbd, dbp, DBOPTIONS) < 0) + /* Only recover if we got the lock */ + if (dbif_env_open(dbd, + dbp, + (db_locked == LOCK_EXCL) ? DBOPTIONS | DB_RECOVER : DBOPTIONS) < 0) exit(2); /* FIXME: same exit code as failure for dbif_open() */ LOG(log_debug, logtype_cnid, "Finished initializing BerkeleyDB environment"); @@ -368,11 +380,18 @@ int main(int argc, char *argv[]) } LOG(log_debug, logtype_cnid, "Finished opening BerkeleyDB databases"); - if (dbd_stamp(dbd) < 0) { - dbif_close(dbd); - exit(5); + /* Downgrade db lock */ + if (db_locked == LOCK_EXCL) { + if (get_lock(LOCK_UNLOCK, NULL) != 0) { + dbif_close(dbd); + exit(2); + } + if (get_lock(LOCK_SHRD, NULL) != LOCK_SHRD) { + dbif_close(dbd); + exit(2); + } } - LOG(log_maxdebug, logtype_cnid, "Finished checking database stamp"); + if (comm_init(dbp, ctrlfd, clntfd) < 0) { dbif_close(dbd); @@ -385,11 +404,9 @@ int main(int argc, char *argv[]) if (dbif_close(dbd) < 0) err++; - if (dbif_env_remove(dir) < 0) + if (dbif_env_remove(dbpath) < 0) err++; - free_lock(lockfd); - if (err) exit(4); else if (exit_sig)