/*
- $Id: cmd_dbd.c,v 1.3 2009-05-22 20:48:44 franklahm Exp $
+ $Id: cmd_dbd.c,v 1.17 2009-11-30 15:51:30 franklahm Exp $
Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
#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 */
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 = {
-1,
-1
};
+static char dbpath[PATH_MAX]; /* Path to the dbd database */
/*
Provide some logging
return;
}
-void set_signal(void)
+static void set_signal(void)
{
struct sigaction sv;
}
}
-int get_lock(const char *dbpath)
+static int get_lock(const char *dbpath)
{
int lockfd;
char lockpath[PATH_MAX];
return lockfd;
}
-void free_lock(int lockfd)
+static void free_lock(int lockfd)
{
struct flock lock;
close(lockfd);
}
-static void usage ()
+static void usage (void)
{
- printf("Usage: dbd [-e|-v|-x] -d [-i] | -s
| -r [-f] <path to netatalk volume>\n"
+ printf("Usage: dbd [-e|-v|-x] -d [-i] | -s
[-n]| -r [-f] | -u <path to netatalk volume>\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"
" -s Scan volume:\n"
- " 1. Compare database with volume\n"
+ " 1. Compare CNIDs in database with volume\n"
" 2. Check if .AppleDouble dirs exist\n"
" 3. Check if AppleDouble file exist\n"
" 4. Report orphaned AppleDouble files\n"
" 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"
+ " Option: -n Don't open CNID database, skip CNID checks\n"
" -r Rebuild volume:\n"
- " 1. Sync database with volume\n"
+ " 1. Sync CNIDSs in database with volume\n"
" 2. Make sure .AppleDouble dir exist, create if missing\n"
" 3. Make sure AppleDouble file exists, create if missing\n"
" 4. Delete orphaned AppleDouble files\n"
" 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"
" Option: -f wipe database and rebuild from IDs stored in AppleDouble files,\n"
- " only available for volumes with 'cachecnid' option.\n"
- " Implies -e."
+ " only available for volumes without 'nocnidcache' option. Implies -e.\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"
"General options:\n"
" -e only work on inactive volumes and lock them (exclusive)\n"
" -x rebuild indexes (just for completeness, mostly useless!)\n"
- " -v verbose\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"
);
}
int main(int argc, char **argv)
{
- int c, lockfd;
- int dump=0, scan=0, rebuild=0, rebuildindexes=0, dumpindexes=0, force=0;
+ int c, lockfd, ret = -1;
+ 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);
}
- while ((c = getopt(argc, argv, ":dsrvxife")) != -1) {
+ while ((c = getopt(argc, argv, ":dsnruvxife")) != -1) {
switch(c) {
case 'd':
dump = 1;
scan = 1;
flags |= DBD_FLAGS_SCAN;
break;
+ case 'n':
+ nocniddb = 1;
+ break;
case 'r':
rebuild = 1;
break;
+ case 'u':
+ prep_upgrade = 1;
+ break;
case 'v':
verbose = 1;
break;
break;
case 'f':
force = 1;
+ exclusive = 1;
flags |= DBD_FLAGS_FORCE | DBD_FLAGS_EXCL;
break;
case ':':
}
}
- if ((dump + scan + rebuild) != 1) {
+ if ((dump + scan + rebuild + prep_upgrade) != 1) {
usage();
exit(EXIT_FAILURE);
}
}
volpath = argv[optind];
- /* Put "/.AppleDB" at end of volpath */
- if ( (strlen(volpath) + strlen("/.AppleDB")) > (PATH_MAX - 1) ) {
- dbd_log( LOGSTD, "Volume pathname too long");
- exit(EXIT_FAILURE);
- }
- char dbpath[PATH_MAX];
- strncpy(dbpath, volpath, PATH_MAX - 1);
- strcat(dbpath, "/.AppleDB");
-
/* Remember cwd */
- int cdir;
if ((cdir = open(".", O_RDONLY)) < 0) {
dbd_log( LOGSTD, "Can't open dir: %s", strerror(errno));
exit(EXIT_FAILURE);
}
- /*
- 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);
-
/* Setup signal handling */
set_signal();
/* Setup logging. Should be portable among *NIXes */
if (!verbose)
- setuplog("default log_info /dev/tty");
+ setuplog("console log_info /dev/tty");
else
- setuplog("default log_debug /dev/tty");
+ setuplog("console log_debug /dev/tty");
/* 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) {
exit(EXIT_FAILURE);
}
+ /* Put "/.AppleDB" at end of volpath, get path from volinfo file */
+ if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > (PATH_MAX - 1) ) {
+ dbd_log( LOGSTD, "Volume pathname too long");
+ exit(EXIT_FAILURE);
+ }
+ strncpy(dbpath, volinfo.v_dbpath, PATH_MAX - 9 - 1);
+ strcat(dbpath, "/.AppleDB");
+
+ /* 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);
+ }
+
+ /*
+ 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;
+ }
+
/* Check if -f is requested and wipe db if yes */
- if ((flags & DBD_FLAGS_FORCE) && (volinfo.v_flags & AFPVOL_CACHE)) {
+ if ((flags & DBD_FLAGS_FORCE) && rebuild && (volinfo.v_flags & AFPVOL_CACHE)) {
char cmd[8 + MAXPATHLEN];
- snprintf(cmd, 8 + MAXPATHLEN, "rm -f %s/cnid2.db", dbpath);
- dbd_log( LOGSTD, "Removing old database of volume: '%s'", volpath);
+ snprintf(cmd, 8 + MAXPATHLEN, "rm -f %s/*", dbpath);
+ dbd_log( LOGDEBUG, "Removing old database of volume: '%s'", volpath);
system(cmd);
- dbd_log( LOGSTD, "Removed old database.");
+ dbd_log( LOGDEBUG, "Removed old database.");
}
/*
Lets start with the BerkeleyDB stuff
*/
- if ((dbd = dbif_init(dbpath, "cnid2.db")) == NULL)
- exit(EXIT_FAILURE);
-
- if (dbif_env_open(dbd, &db_param, exclusive ? (DBOPTIONS | DB_RECOVER) : DBOPTIONS) < 0) {
- dbd_log( LOGSTD, "error opening database!");
- exit(EXIT_FAILURE);
- }
+ if ( ! nocniddb) {
+ 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 (exclusive)
- dbd_log( LOGDEBUG, "Finished recovery.");
+ if (exclusive)
+ dbd_log( LOGDEBUG, "Finished recovery.");
- if (dbif_open(dbd, &db_param, rebuildindexes) < 0) {
- dbif_close(dbd);
- exit(EXIT_FAILURE);
- }
+ if (dbif_open(dbd, &db_param, rebuildindexes) < 0) {
+ dbif_close(dbd);
+ goto exit_failure;
+ }
- if (dbd_stamp(dbd) < 0) {
- dbif_close(dbd);
- exit(EXIT_FAILURE);
+ if (dbd_stamp(dbd) < 0) {
+ dbif_close(dbd);
+ 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) {
+ /* Cleanup */
+ if (! nocniddb && dbif_close(dbd) < 0) {
dbd_log( LOGSTD, "Error closing database");
- exit(EXIT_FAILURE);
+ goto exit_failure;
}
- free_lock(lockfd);
+exit_success:
+ ret = 0;
+exit_failure:
+ free_lock(lockfd);
+
if ((fchdir(cdir)) < 0)
dbd_log(LOGSTD, "fchdir: %s", strerror(errno));
- return 0;
+ if (ret == 0)
+ exit(EXIT_SUCCESS);
+ else
+ exit(EXIT_FAILURE);
}
projects / netatalk.git / blobdiff