X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcmd_dbd.c;h=ad0e22b4189acba3c2343baef0e8b11a8cc1ad8f;hb=260c314546ffcfdbef47f2c7de82d5310b26df0a;hp=dc4c3923d90eeb1a0e47c3c24bb4b4df32d4333f;hpb=dfd4a2594c2123549b2fd1e6d5dc43d15aafc850;p=netatalk.git diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c index dc4c3923..ad0e22b4 100644 --- a/etc/cnid_dbd/cmd_dbd.c +++ b/etc/cnid_dbd/cmd_dbd.c @@ -1,6 +1,4 @@ /* - $Id: cmd_dbd.c,v 1.26 2010-04-20 16:46:20 hat001 Exp $ - Copyright (c) 2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -14,49 +12,6 @@ GNU General Public License for more details. */ -/* - dbd specs and implementation progress - ===================================== - - St := Status - - Force option - ------------ - - St Spec - -- ---- - OK If -f is requested, ensure -e is too. - Check if volumes is using AFPVOL_CACHE, then wipe db from disk. Rebuild from ad-files. - - 1st pass: Scan volume - -------------------- - - St Type Check - -- ---- ----- - OK F/D Make sure ad file exists - OK D Make sure .AppleDouble dir exist, create if missing. Error creating - it is fatal as that shouldn't happen as root. - OK F/D Delete orphaned ad-files, log dirs in ad-dir - OK F/D Check name encoding by roundtripping, log on error - OK F/D try: read CNID from ad file (if cnid caching is on) - try: fetch CNID from database - -> on mismatch: use CNID from file, update database (deleting both found CNIDs first) - -> if no CNID in ad file: write CNID from database to ad file - -> if no CNID in database: add CNID from ad file to database - -> on no CNID at all: create one and store in both places - OK F/D Add found CNID, DID, filename, dev/inode, stamp to rebuild database - OK F/D Check/update stamp (implicitly done while checking CNIDs) - - - 2nd pass: Delete unused CNIDs - ----------------------------- - - St Spec - -- ---- - OK Step through dbd (the one on disk) and rebuild-db from pass 1 and delete any CNID from - dbd not in rebuild db. This in only done in exclusive mode. -*/ - #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ @@ -74,16 +29,19 @@ #include #include #include +#include + #include "cmd_dbd.h" #include "dbd.h" #include "dbif.h" #include "db_param.h" -#define LOCKFILENAME "lock" #define DBOPTIONS (DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN) int nocniddb = 0; /* Dont open CNID database, only scan filesystem */ -volatile sig_atomic_t alarmed; +struct volinfo volinfo; /* needed by pack.c:idxname() */ +volatile sig_atomic_t alarmed; /* flags for signals */ +int db_locked; /* have we got the fcntl lock on lockfile ? */ static DBD *dbd; static int verbose; /* Logging flag */ @@ -92,14 +50,16 @@ static struct db_param db_param = { NULL, /* Volume dirpath */ 1, /* bdb logfile autoremove */ 64 * 1024, /* bdb cachesize (64 MB) */ - -1, /* not used ... */ - -1, - "", - -1, - -1, - -1 + DEFAULT_MAXLOCKS, /* maxlocks */ + DEFAULT_MAXLOCKOBJS, /* maxlockobjs */ + 0, /* flush_interval */ + 0, /* flush_frequency */ + 0, /* usock_file */ + -1, /* fd_table_size */ + -1, /* idle_timeout */ + -1 /* max_vols */ }; -static char dbpath[PATH_MAX]; /* Path to the dbd database */ +static char dbpath[MAXPATHLEN+1]; /* Path to the dbd database */ /* Provide some logging @@ -165,71 +125,10 @@ static void set_signal(void) } } -static int get_lock(const char *dbpath) -{ - int lockfd; - char lockpath[PATH_MAX]; - struct flock lock; - struct stat st; - - if ( (strlen(dbpath) + strlen(LOCKFILENAME+1)) > (PATH_MAX - 1) ) { - dbd_log( LOGSTD, ".AppleDB pathname too long"); - exit(EXIT_FAILURE); - } - strncpy(lockpath, dbpath, PATH_MAX - 1); - strcat(lockpath, "/"); - strcat(lockpath, LOCKFILENAME); - - if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0644)) < 0) { - dbd_log( LOGSTD, "Error opening lockfile: %s", strerror(errno)); - exit(EXIT_FAILURE); - } - - if ((stat(dbpath, &st)) != 0) { - dbd_log( LOGSTD, "Error statting lockfile: %s", strerror(errno)); - exit(EXIT_FAILURE); - } - - if ((chown(lockpath, st.st_uid, st.st_gid)) != 0) { - dbd_log( LOGSTD, "Error inheriting lockfile permissions: %s", strerror(errno)); - exit(EXIT_FAILURE); - } - - 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) { - if (exclusive) { - dbd_log( LOGSTD, "Database is in use and exlusive was requested", strerror(errno)); - exit(EXIT_FAILURE); - }; - } else { - dbd_log( LOGSTD, "Error getting fcntl F_WRLCK on lockfile: %s", strerror(errno)); - exit(EXIT_FAILURE); - } - } - - return lockfd; -} - -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); -} - static void usage (void) { - printf("Usage: dbd [-e|-v|-x] -d [-i] | -s [-c|-n]| -r [-c|-f] | -u \n" + printf("dbd (Netatalk %s)\n" + "Usage: dbd [-e|-t|-v|-x] -d [-i] | -s [-c|-n]| -r [-c|-f] | -u \n" "dbd can dump, scan, reindex and rebuild Netatalk dbd CNID databases.\n" "dbd must be run with appropiate permissions i.e. as root.\n\n" "Main commands are:\n" @@ -245,7 +144,7 @@ static void usage (void) " 7. Check for orphaned CNIDs in database (requires -e)\n" " 8. Open and close adouble files\n" " Options: -c Don't check .AppleDouble stuff, only ckeck orphaned.\n" - " -n Don't open CNID database, skip CNID checks\n\n" + " -n Don't open CNID database, skip CNID checks.\n\n" " -r Rebuild volume:\n" " 1. Sync CNIDSs in database with volume\n" " 2. Make sure .AppleDouble dir exist, create if missing\n" @@ -256,20 +155,21 @@ static void usage (void) " 7. Check for orphaned CNIDs in database (requires -e)\n" " 8. Open and close adouble files\n" " Options: -c Don't create .AppleDouble stuff, only cleanup orphaned.\n" - " -f wipe database and rebuild from IDs stored in AppleDouble files,\n" - " only available for volumes without 'nocnidcache' option. Implies -e.\n\n" - " -u Prepare upgrade:\n" - " Before installing an upgraded version of Netatalk that is linked against\n" - " a newer BerkeleyDB lib, run `dbd -u ...` from the OLD Netatalk pior to\n" - " upgrading on all volumes. This removes the BerkleyDB environment.\n" - " On exit cnid_dbd does this automatically, so normally calling dbd -u should not be necessary.\n\n" + " -f wipe database and rebuild from IDs stored in AppleDouble\n" + " files, only available for volumes without 'nocnidcache'\n" + " option. Implies -e.\n\n" + " -u Upgrade:\n" + " Opens the database which triggers any necessary upgrades,\n" + " then closes and exits.\n\n" "General options:\n" " -e only work on inactive volumes and lock them (exclusive)\n" " -x rebuild indexes (just for completeness, mostly useless!)\n" + " -t show statistics while running\n" " -v verbose\n\n" "WARNING:\n" - "For -r -f restore of the CNID database from the adouble files, the CNID must of course\n" - "be synched to them files first with a plain -r rebuild !\n" + "For -r -f restore of the CNID database from the adouble files,\n" + "the CNID must of course be synched to them files first with a plain -r rebuild!\n" + , VERSION ); } @@ -279,7 +179,6 @@ int main(int argc, char **argv) int dump=0, scan=0, rebuild=0, prep_upgrade=0, rebuildindexes=0, dumpindexes=0, force=0; dbd_flags_t flags = 0; char *volpath; - struct volinfo volinfo; int cdir; if (geteuid() != 0) { @@ -289,7 +188,7 @@ int main(int argc, char **argv) /* Inhereting perms in ad_mkdir etc requires this */ ad_setfuid(0); - while ((c = getopt(argc, argv, ":cdefinrsuvx")) != -1) { + while ((c = getopt(argc, argv, ":cdefinrstuvx")) != -1) { switch(c) { case 'c': flags |= DBD_FLAGS_CLEANUP; @@ -310,6 +209,9 @@ int main(int argc, char **argv) case 'r': rebuild = 1; break; + case 't': + flags |= DBD_FLAGS_STATS; + break; case 'u': prep_upgrade = 1; break; @@ -360,9 +262,9 @@ int main(int argc, char **argv) /* Setup logging. Should be portable among *NIXes */ if (!verbose) - setuplog("default log_info /dev/tty"); + setuplog("default:info", "/dev/tty"); else - setuplog("default log_debug /dev/tty"); + setuplog("default:debug", "/dev/tty"); /* Load .volinfo file */ if (loadvolinfo(volpath, &volinfo) == -1) { @@ -374,18 +276,40 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + if (volinfo.v_adouble == AD_VERSION_EA) + dbd_log( LOGDEBUG, "adouble:ea volume"); + else if (volinfo.v_adouble == AD_VERSION2) + dbd_log( LOGDEBUG, "adouble:v2 volume"); + else { + dbd_log( LOGSTD, "unknown adouble volume"); + exit(EXIT_FAILURE); + } + /* Sanity checks to ensure we can touch this volume */ if (volinfo.v_vfs_ea != AFPVOL_EA_AD && volinfo.v_vfs_ea != AFPVOL_EA_SYS) { dbd_log( LOGSTD, "Unknown Extended Attributes option: %u", volinfo.v_vfs_ea); exit(EXIT_FAILURE); } + /* Enuser dbpath is there, create if necessary */ + struct stat st; + if (stat(volinfo.v_dbpath, &st) != 0) { + if (errno != ENOENT) { + dbd_log( LOGSTD, "Can't stat dbpath \"%s\": %s", volinfo.v_dbpath, strerror(errno)); + exit(EXIT_FAILURE); + } + if ((mkdir(volinfo.v_dbpath, 0755)) != 0) { + dbd_log( LOGSTD, "Can't create dbpath \"%s\": %s", dbpath, strerror(errno)); + exit(EXIT_FAILURE); + } + } + /* Put "/.AppleDB" at end of volpath, get path from volinfo file */ - if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > (PATH_MAX - 1) ) { + if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > MAXPATHLEN ) { dbd_log( LOGSTD, "Volume pathname too long"); exit(EXIT_FAILURE); } - strncpy(dbpath, volinfo.v_dbpath, PATH_MAX - 9 - 1); + strncpy(dbpath, volinfo.v_dbpath, MAXPATHLEN - strlen("/.AppleDB")); strcat(dbpath, "/.AppleDB"); /* Check or create dbpath */ @@ -404,26 +328,35 @@ int main(int argc, char **argv) close(dbdirfd); } - /* - Before we do anything else, check if there is an instance of cnid_dbd - running already and silently exit if yes. - */ - lockfd = get_lock(dbpath); - - /* Prepare upgrade ? */ - if (prep_upgrade) { - if (dbif_prep_upgrade(dbpath)) - goto exit_failure; - goto exit_success; - } + /* Get db lock */ + if ((db_locked = get_lock(LOCK_EXCL, dbpath)) == -1) + goto exit_noenv; + if (db_locked != LOCK_EXCL) { + /* Couldn't get exclusive lock, try shared lock if -e wasn't requested */ + if (exclusive) { + dbd_log(LOGSTD, "Database is in use and exlusive was requested"); + goto exit_noenv; + } + if ((db_locked = get_lock(LOCK_SHRD, NULL)) != LOCK_SHRD) + goto exit_noenv; + } /* Check if -f is requested and wipe db if yes */ - if ((flags & DBD_FLAGS_FORCE) && rebuild && (volinfo.v_flags & AFPVOL_CACHE)) { + if ((flags & DBD_FLAGS_FORCE) && rebuild) { char cmd[8 + MAXPATHLEN]; - snprintf(cmd, 8 + MAXPATHLEN, "rm -f %s/*", dbpath); + if ((db_locked = get_lock(LOCK_FREE, NULL)) != 0) + goto exit_noenv; + + snprintf(cmd, 8 + MAXPATHLEN, "rm -rf \"%s\"", dbpath); dbd_log( LOGDEBUG, "Removing old database of volume: '%s'", volpath); system(cmd); + if ((mkdir(dbpath, 0755)) != 0) { + dbd_log( LOGSTD, "Can't create dbpath \"%s\": %s", dbpath, strerror(errno)); + exit(EXIT_FAILURE); + } dbd_log( LOGDEBUG, "Removed old database."); + if ((db_locked = get_lock(LOCK_EXCL, dbpath)) == -1) + goto exit_noenv; } /* @@ -431,14 +364,16 @@ int main(int argc, char **argv) */ if ( ! nocniddb) { if ((dbd = dbif_init(dbpath, "cnid2.db")) == NULL) - goto exit_failure; + goto exit_noenv; - if (dbif_env_open(dbd, &db_param, exclusive ? (DBOPTIONS | DB_RECOVER) : DBOPTIONS) < 0) { + if (dbif_env_open(dbd, + &db_param, + (db_locked == LOCK_EXCL) ? (DBOPTIONS | DB_RECOVER) : DBOPTIONS) < 0) { dbd_log( LOGSTD, "error opening database!"); - goto exit_failure; + goto exit_noenv; } - if (exclusive) + if (db_locked == LOCK_EXCL) dbd_log( LOGDEBUG, "Finished recovery."); if (dbif_open(dbd, NULL, rebuildindexes) < 0) { @@ -446,12 +381,21 @@ int main(int argc, char **argv) goto exit_failure; } - if (dbd_stamp(dbd) < 0) { - dbif_close(dbd); - goto exit_failure; + /* Prepare upgrade ? We're done */ + if (prep_upgrade) { + (void)dbif_txn_close(dbd, 1); + goto cleanup; } } + /* Downgrade db lock if not running exclusive */ + if (!exclusive && (db_locked == LOCK_EXCL)) { + if (get_lock(LOCK_UNLOCK, NULL) != 0) + goto exit_failure; + if (get_lock(LOCK_SHRD, NULL) != LOCK_SHRD) + goto exit_failure; + } + /* Now execute given command scan|rebuild|dump */ if (dump && ! nocniddb) { if (dbif_dump(dbd, dumpindexes) < 0) { @@ -463,18 +407,27 @@ int main(int argc, char **argv) } } +cleanup: /* Cleanup */ - if (! nocniddb && dbif_close(dbd) < 0) { - dbd_log( LOGSTD, "Error closing database"); - goto exit_failure; + dbd_log(LOGDEBUG, "Closing db"); + if (! nocniddb) { + if (dbif_close(dbd) < 0) { + dbd_log( LOGSTD, "Error closing database"); + goto exit_failure; + } } exit_success: ret = 0; exit_failure: - free_lock(lockfd); - + if (dbif_env_remove(dbpath) < 0) { + dbd_log( LOGSTD, "Error removing BerkeleyDB database environment"); + ret++; + } + get_lock(0, NULL); + +exit_noenv: if ((fchdir(cdir)) < 0) dbd_log(LOGSTD, "fchdir: %s", strerror(errno));