#include "config.h"
#endif /* HAVE_CONFIG_H */
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <signal.h>
#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
#include <sys/param.h>
-#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
-#endif /* HAVE_SYS_STAT_H */
#include <time.h>
#include <sys/file.h>
+#include <arpa/inet.h>
-#include <netatalk/endian.h>
#include <atalk/cnid_dbd_private.h>
#include <atalk/logger.h>
#include <atalk/volinfo.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)
/* 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)
{
}
}
-/* ------------------------ */
-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) {
- LOG(log_error, logtype_cnid, "get_lock: locked");
- 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)
}
}
-/* ----------------------- */
-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;
+ 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) {
- LOG(log_error, logtype_cnid, "main: not enough arguments");
- exit(1);
+ 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;
+ }
}
- ctrlfd = atoi(argv[2]);
- clntfd = atoi(argv[3]);
- logconfig = strdup(argv[4]);
- setuplog(logconfig);
+ if (argc - optind != 4) {
+ LOG(log_error, logtype_cnid, "main: not enough arguments");
+ exit(EXIT_FAILURE);
+ }
/* Load .volinfo file */
- if (loadvolinfo(argv[1], &volinfo) == -1) {
+ if (loadvolinfo(argv[optind], &volinfo) == -1) {
LOG(log_error, logtype_cnid, "Cant load volinfo for \"%s\"", argv[1]);
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);
+
if (vol_load_charsets(&volinfo) == -1) {
LOG(log_error, logtype_cnid, "Error loading charsets!");
exit(EXIT_FAILURE);
switch_to_user(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();
+ /* 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();
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");
}
LOG(log_debug, logtype_cnid, "Finished opening BerkeleyDB databases");
+ /* 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);
+ }
+ }
+
+
if (comm_init(dbp, ctrlfd, clntfd) < 0) {
dbif_close(dbd);
exit(3);
if (dbif_env_remove(dbpath) < 0)
err++;
- free_lock(lockfd);
-
if (err)
exit(4);
else if (exit_sig)
projects / netatalk.git / blobdiff