X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcnid_metad.c;h=aa214be6a60a41d9ba3a6b7a72625a1401a5b061;hb=9ebba6f4ae4965d0d63e4015fa5345fcd5eef9e0;hp=85ea7a4fb21b88fd71b19a05a4376fe49c142b7f;hpb=4209e62c0346332dfe05efaec90f219abf1266e5;p=netatalk.git diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c index 85ea7a4f..aa214be6 100644 --- a/etc/cnid_dbd/cnid_metad.c +++ b/etc/cnid_dbd/cnid_metad.c @@ -40,14 +40,14 @@ #include #include #include +#include #include #include #include -#define _XPG4_2 1 +// #define _XPG4_2 1 #include #include #include -#include #ifndef WEXITSTATUS #define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) @@ -89,7 +89,11 @@ #include #include #include -#include +#include +#include +#include +#include +#include #include "usockfd.h" @@ -99,16 +103,17 @@ static int srvfd; static int rqstfd; static volatile sig_atomic_t sigchild = 0; +static uint maxvol; #define MAXSPAWN 3 /* Max times respawned in.. */ #define TESTTIME 42 /* this much seconds apfd client tries to * * to reconnect every 5 secondes, catch it */ -#define MAXVOLS 512 +#define MAXVOLS 4096 #define DEFAULTHOST "localhost" #define DEFAULTPORT "4700" struct server { - struct volinfo *volinfo; + struct vol *vol; pid_t pid; time_t tm; /* When respawned last */ int count; /* Times respawned in the last TESTTIME secondes */ @@ -117,9 +122,6 @@ struct server { static struct server srv[MAXVOLS]; -/* Default logging config: log to syslog with level log_note */ -static char logconfig[MAXPATHLEN + 21 + 1] = "default log_note"; - static void daemon_exit(int i) { server_unlock(_PATH_CNID_METAD_LOCK); @@ -139,72 +141,23 @@ static void sigterm_handler(int sig) daemon_exit(0); } -static struct server *test_usockfn(struct volinfo *volinfo) +static struct server *test_usockfn(const struct vol *vol) { int i; - for (i = 0; i < MAXVOLS; i++) { - if ((srv[i].volinfo) && (strcmp(srv[i].volinfo->v_path, volinfo->v_path) == 0)) { - return &srv[i]; - } - } - return NULL; -} - -/* -------------------- */ -static int send_cred(int socket, int fd) -{ - int ret; - struct msghdr msgh; - struct iovec iov[1]; - struct cmsghdr *cmsgp = NULL; - char *buf; - size_t size; - int er=0; - - size = CMSG_SPACE(sizeof fd); - buf = malloc(size); - if (!buf) { - LOG(log_error, logtype_cnid, "error in sendmsg: %s", strerror(errno)); - return -1; - } - - memset(&msgh,0,sizeof (msgh)); - memset(buf,0, size); - - msgh.msg_name = NULL; - msgh.msg_namelen = 0; - - msgh.msg_iov = iov; - msgh.msg_iovlen = 1; - - iov[0].iov_base = &er; - iov[0].iov_len = sizeof(er); - - msgh.msg_control = buf; - msgh.msg_controllen = size; - cmsgp = CMSG_FIRSTHDR(&msgh); - cmsgp->cmsg_level = SOL_SOCKET; - cmsgp->cmsg_type = SCM_RIGHTS; - cmsgp->cmsg_len = CMSG_LEN(sizeof(fd)); + if (!(vol->v_flags & AFPVOL_OPEN)) + return NULL; - *((int *)CMSG_DATA(cmsgp)) = fd; - msgh.msg_controllen = cmsgp->cmsg_len; - - do { - ret = sendmsg(socket,&msgh, 0); - } while ( ret == -1 && errno == EINTR ); - if (ret == -1) { - LOG(log_error, logtype_cnid, "error in sendmsg: %s", strerror(errno)); - free(buf); - return -1; + for (i = 0; i < maxvol; i++) { + if (vol->v_vid == srv[i].vol->v_vid) + return &srv[i]; } - free(buf); - return 0; + + return NULL; } /* -------------------- */ -static int maybe_start_dbd(char *dbdpn, struct volinfo *volinfo) +static int maybe_start_dbd(const AFPObj *obj, char *dbdpn, struct vol *vol) { pid_t pid; struct server *up; @@ -213,14 +166,14 @@ static int maybe_start_dbd(char *dbdpn, struct volinfo *volinfo) time_t t; char buf1[8]; char buf2[8]; - char *volpath = volinfo->v_path; + char *volpath = vol->v_path; LOG(log_debug, logtype_cnid, "maybe_start_dbd: Volume: \"%s\"", volpath); - up = test_usockfn(volinfo); + up = test_usockfn(vol); if (up && up->pid) { /* we already have a process, send our fd */ - if (send_cred(up->control_fd, rqstfd) < 0) { + if (send_fd(up->control_fd, rqstfd) < 0) { /* FIXME */ return -1; } @@ -231,14 +184,16 @@ static int maybe_start_dbd(char *dbdpn, struct volinfo *volinfo) time(&t); if (!up) { - /* find an empty slot */ - for (i = 0; i < MAXVOLS; i++) { - if (srv[i].volinfo == NULL) { + /* find an empty slot (i < maxvol) or the first free slot (i == maxvol)*/ + for (i = 0; i <= maxvol; i++) { + if (srv[i].vol == NULL && i < MAXVOLS) { up = &srv[i]; - up->volinfo = volinfo; - retainvolinfo(volinfo); + up->vol = vol; + vol->v_flags |= AFPVOL_OPEN; up->tm = t; up->count = 0; + if (i == maxvol) + maxvol++; break; } } @@ -303,14 +258,13 @@ static int maybe_start_dbd(char *dbdpn, struct volinfo *volinfo) sprintf(buf2, "%i", rqstfd); if (up->count == MAXSPAWN) { - /* there's a pb with the db inform child - * it will run recover, delete the db whatever - */ - LOG(log_error, logtype_cnid, "try with -d %s", up->volinfo->v_path); - ret = execlp(dbdpn, dbdpn, "-d", volpath, buf1, buf2, logconfig, NULL); - } - else { - ret = execlp(dbdpn, dbdpn, volpath, buf1, buf2, logconfig, NULL); + /* there's a pb with the db inform child, it will delete the db */ + LOG(log_warning, logtype_cnid, + "Multiple attempts to start CNID db daemon for \"%s\" failed, wiping the slate clean...", + up->vol->v_path); + ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, "-d", NULL); + } else { + ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, NULL); } /* Yikes! We're still here, so exec failed... */ LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno)); @@ -457,6 +411,26 @@ static void set_signal(void) sigprocmask(SIG_BLOCK, &set, NULL); } +static int setlimits(void) +{ + struct rlimit rlim; + + if (getrlimit(RLIMIT_NOFILE, &rlim) != 0) { + LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno)); + exit(1); + } + if (rlim.rlim_cur != RLIM_INFINITY && rlim.rlim_cur < 65535) { + rlim.rlim_cur = 65535; + if (rlim.rlim_max != RLIM_INFINITY && rlim.rlim_max < 65535) + rlim.rlim_max = 65535; + if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { + LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno)); + exit(1); + } + } + return 0; +} + /* ------------------ */ int main(int argc, char *argv[]) { @@ -474,78 +448,48 @@ int main(int argc, char *argv[]) int err = 0; int debug = 0; int ret; - char *loglevel = NULL; - char *logfile = NULL; sigset_t set; - struct volinfo *volinfo; - - set_processname("cnid_metad"); + AFPObj obj = { 0 }; + struct vol *vol; - while (( cc = getopt( argc, argv, "ds:p:h:u:g:l:f:")) != -1 ) { + while (( cc = getopt( argc, argv, "dF:v")) != -1 ) { switch (cc) { case 'd': debug = 1; break; - case 'h': - host = strdup(optarg); - break; - case 'u': - uid = user_to_uid (optarg); - if (!uid) { - LOG(log_error, logtype_cnid, "main: bad user %s", optarg); - err++; - } - break; - case 'g': - gid =group_to_gid (optarg); - if (!gid) { - LOG(log_error, logtype_cnid, "main: bad group %s", optarg); - err++; - } - break; - case 'p': - port = strdup(optarg); - break; - case 's': - dbdpn = strdup(optarg); - break; - case 'l': - loglevel = strdup(optarg); - break; - case 'f': - logfile = strdup(optarg); + case 'F': + obj.cmdlineconfigfile = strdup(optarg); break; + case 'v': + printf("cnid_metad (Netatalk %s)\n", VERSION); + return -1; default: - err++; - break; + printf("cnid_metad [-dv] [-F alternate configfile ]\n"); + return -1; } } - if (loglevel) { - strlcpy(logconfig + 8, loglevel, 13); - free(loglevel); - strcat(logconfig, " "); - } - if (logfile) { - strlcat(logconfig, logfile, MAXPATHLEN); - free(logfile); - } - setuplog(logconfig); + /* Check for PID lockfile */ + if (check_lockfile("cnid_metad", _PATH_CNID_METAD_LOCK)) + return -1; + + if (!debug && daemonize(0, 0) != 0) + exit(EXITERR_SYS); + + /* Create PID lockfile */ + if (create_lockfile("cnid_metad", _PATH_CNID_METAD_LOCK)) + return -1; - if (err) { - LOG(log_error, logtype_cnid, "main: bad arguments"); + if (afp_config_parse(&obj) != 0) daemon_exit(1); - } - /* Check PID lockfile and become a daemon */ - switch(server_lock("cnid_metad", _PATH_CNID_METAD_LOCK, debug)) { - case -1: /* error */ - daemon_exit(EXITERR_SYS); - case 0: /* child */ - break; - default: /* server */ - exit(0); - } + set_processname("cnid_metad"); + setuplog(obj.options.logconfig, obj.options.logfile); + + if (load_volumes(&obj, NULL) != 0) + daemon_exit(1); + + (void)setlimits(); if ((srvfd = tsockfd_create(host, port, 10)) < 0) daemon_exit(1); @@ -577,19 +521,20 @@ int main(int argc, char *argv[]) rqstfd = usockfd_check(srvfd, &set); /* Collect zombie processes and log what happened to them */ if (sigchild) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { - for (i = 0; i < MAXVOLS; i++) { + for (i = 0; i < maxvol; i++) { if (srv[i].pid == pid) { srv[i].pid = 0; close(srv[i].control_fd); + srv[i].vol->v_flags &= ~AFPVOL_OPEN; break; } } if (WIFEXITED(status)) { - LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with exit code %i", + LOG(log_info, logtype_cnid, "cnid_dbd[%i] exited with exit code %i", pid, WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with signal %i", + LOG(log_info, logtype_cnid, "cnid_dbd[%i] got signal %i", pid, WTERMSIG(status)); } sigchild = 0; @@ -631,20 +576,17 @@ int main(int argc, char *argv[]) } volpath[len] = '\0'; - /* Load .volinfo file */ - if ((volinfo = allocvolinfo(volpath)) == NULL) { - LOG(log_severe, logtype_cnid, "allocvolinfo: %s", strerror(errno)); + + if ((vol = getvolbypath(volpath)) == NULL) { + LOG(log_severe, logtype_cnid, "getvolbypath(\"%s\"): %s", volpath, strerror(errno)); goto loop_end; } - if (set_dbdir(volinfo->v_dbpath) < 0) { + if (set_dbdir(vol->v_dbpath) < 0) { goto loop_end; } - maybe_start_dbd(dbdpn, volinfo); - - (void)closevolinfo(volinfo); - + maybe_start_dbd(&obj, dbdpn, vol); loop_end: close(rqstfd); }