X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcmd_dbd.c;h=5493a28059461cb525f49f99ecaa0cbf16dbb15d;hb=1f995330836cf20b5db3e5b6076735a2a0f4e81e;hp=86ff5ec46e2f26c88d7977d0e6d3537e956f7b52;hpb=5738c43401e312e75b153f844efbaabf450b98b2;p=netatalk.git diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c index 86ff5ec4..5493a280 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.6 2009-09-03 08:35:15 franklahm Exp $ - Copyright (c) 2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -74,31 +72,37 @@ #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) -static DBD *dbd; +int nocniddb = 0; /* Dont open CNID database, only scan filesystem */ +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 ? */ -volatile sig_atomic_t alarmed; +static DBD *dbd; static int verbose; /* Logging flag */ static int exclusive; /* Exclusive volume access */ static struct db_param db_param = { NULL, /* Volume dirpath */ 1, /* bdb logfile autoremove */ - 16384, /* bdb cachesize */ - -1, /* not used ... */ - -1, - "", - -1, - -1, - -1 + 64 * 1024, /* bdb cachesize (64 MB) */ + 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 @@ -130,7 +134,7 @@ static void sig_handler(int signo) return; } -void set_signal(void) +static void set_signal(void) { struct sigaction sv; @@ -164,76 +168,14 @@ void set_signal(void) } } -int get_lock(const char *dbpath) +static void usage (void) { - 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; -} - -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 () -{ - printf("Usage: dbd [-e|-v|-x|-u] -d [-i] | -s | -r [-f] \n" + printf("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" " -d Dump CNID database\n" - " Option: -i dump indexes too\n" + " Option: -i dump indexes too\n\n" " -s Scan volume:\n" " 1. Compare CNIDs in database with volume\n" " 2. Check if .AppleDouble dirs exist\n" @@ -242,6 +184,9 @@ static void usage () " 5. Check for directories inside AppleDouble directories\n" " 6. Check name encoding by roundtripping, log on error\n" " 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" " -r Rebuild volume:\n" " 1. Sync CNIDSs in database with volume\n" " 2. Make sure .AppleDouble dir exist, create if missing\n" @@ -250,8 +195,10 @@ static void usage () " 5. Check for directories inside AppleDouble directories\n" " 6. Check name encoding by roundtripping, log on error\n" " 7. Check for orphaned CNIDs in database (requires -e)\n" - " Option: -f wipe database and rebuild from IDs stored in AppleDouble files,\n" - " only available for volumes with 'cachecnid' option. Implies -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" @@ -260,11 +207,11 @@ static void usage () "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" - "If you want/need to run an -r -f rebuild after adding 'cachecnid' to a volume configuration,\n" - "you must run a rebuild with -r alone at first in order to sync all existing CNIDs from the db\n" - "to the AppleDouble files!\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" ); } @@ -274,15 +221,20 @@ 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) { usage(); exit(EXIT_FAILURE); } + /* Inhereting perms in ad_mkdir etc requires this */ + ad_setfuid(0); - while ((c = getopt(argc, argv, ":dsruvxife")) != -1) { + while ((c = getopt(argc, argv, ":cdefinrstuvx")) != -1) { switch(c) { + case 'c': + flags |= DBD_FLAGS_CLEANUP; + break; case 'd': dump = 1; break; @@ -293,9 +245,15 @@ int main(int argc, char **argv) scan = 1; flags |= DBD_FLAGS_SCAN; break; + case 'n': + nocniddb = 1; /* FIXME: this could/should be a flag too for consistency */ + break; case 'r': rebuild = 1; break; + case 't': + flags |= DBD_FLAGS_STATS; + break; case 'u': prep_upgrade = 1; break; @@ -333,8 +291,9 @@ int main(int argc, char **argv) } volpath = argv[optind]; + setvbuf(stdout, (char *) NULL, _IONBF, 0); + /* Remember cwd */ - int cdir; if ((cdir = open(".", O_RDONLY)) < 0) { dbd_log( LOGSTD, "Can't open dir: %s", strerror(errno)); exit(EXIT_FAILURE); @@ -351,7 +310,7 @@ int main(int argc, char **argv) /* Load .volinfo file */ if (loadvolinfo(volpath, &volinfo) == -1) { - dbd_log( LOGSTD, "Unkown volume options!"); + dbd_log( LOGSTD, "Not a Netatalk volume at '%s', no .volinfo file at '%s/.AppleDesktop/.volinfo' or unknown volume options", volpath, volpath); exit(EXIT_FAILURE); } if (vol_load_charsets(&volinfo) == -1) { @@ -359,23 +318,65 @@ int main(int argc, char **argv) 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"); - /* - 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); + /* Check or create dbpath */ + int dbdirfd = open(dbpath, O_RDONLY); + if (dbdirfd == -1 && errno == ENOENT) { + if (errno == ENOENT) { + if ((mkdir(dbpath, 0755)) != 0) { + dbd_log( LOGSTD, "Can't create .AppleDB for \"%s\": %s", dbpath, strerror(errno)); + exit(EXIT_FAILURE); + } + } else { + dbd_log( LOGSTD, "Somethings wrong with .AppleDB for \"%s\", giving up: %s", dbpath, strerror(errno)); + exit(EXIT_FAILURE); + } + } else { + close(dbdirfd); + } + + /* Get db lock */ + if ((db_locked = get_lock(LOCK_EXCL, dbpath)) == -1) + goto exit_failure; + 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_failure; + } + if ((db_locked = get_lock(LOCK_SHRD, NULL)) != LOCK_SHRD) + goto exit_failure; + } /* Prepare upgrade ? */ if (prep_upgrade) { - if (dbif_prep_upgrade(dbpath)) + if (dbif_env_remove(dbpath)) goto exit_failure; goto exit_success; } @@ -383,56 +384,77 @@ int main(int argc, char **argv) /* Check if -f is requested and wipe db if yes */ if ((flags & DBD_FLAGS_FORCE) && rebuild && (volinfo.v_flags & AFPVOL_CACHE)) { char cmd[8 + MAXPATHLEN]; - snprintf(cmd, 8 + MAXPATHLEN, "rm -f %s/*", dbpath); + if ((db_locked = get_lock(LOCK_FREE, NULL)) != 0) + goto exit_failure; + + 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_failure; } /* Lets start with the BerkeleyDB stuff */ - if ((dbd = dbif_init(dbpath, "cnid2.db")) == NULL) - goto exit_failure; - - if (dbif_env_open(dbd, &db_param, exclusive ? (DBOPTIONS | DB_RECOVER) : DBOPTIONS) < 0) { - dbd_log( LOGSTD, "error opening database!"); - goto exit_failure; - } + if ( ! nocniddb) { + if ((dbd = dbif_init(dbpath, "cnid2.db")) == NULL) + goto exit_failure; + + 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; + } - if (exclusive) - dbd_log( LOGDEBUG, "Finished recovery."); + if (db_locked == LOCK_EXCL) + dbd_log( LOGDEBUG, "Finished recovery."); - if (dbif_open(dbd, &db_param, rebuildindexes) < 0) { - dbif_close(dbd); - goto exit_failure; + if (dbif_open(dbd, NULL, rebuildindexes) < 0) { + dbif_close(dbd); + goto exit_failure; + } } - if (dbd_stamp(dbd) < 0) { - dbif_close(dbd); - goto exit_failure; + /* 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; } - if (dump) { + /* Now execute given command scan|rebuild|dump */ + if (dump && ! nocniddb) { if (dbif_dump(dbd, dumpindexes) < 0) { dbd_log( LOGSTD, "Error dumping database"); } - } else if (rebuild || scan) { + } else if ((rebuild && ! nocniddb) || scan) { if (cmd_dbd_scanvol(dbd, &volinfo, flags) < 0) { dbd_log( LOGSTD, "Error repairing database."); } } - if (dbif_close(dbd) < 0) { - dbd_log( LOGSTD, "Error closing database"); - goto exit_failure; + /* Cleanup */ + 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); + get_lock(0, NULL); if ((fchdir(cdir)) < 0) dbd_log(LOGSTD, "fchdir: %s", strerror(errno));