X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcnid_metad.c;h=2c8e3c92e948528de237b8b3670474bdd0027c80;hb=b0bcb8f6b0571592a50ce039882c9319e012a270;hp=4b089ae8a5b6625349efaf61464339eed63c4503;hpb=d31210e362fdbb3c980316489d1b64df5388798d;p=netatalk.git diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c index 4b089ae8..2c8e3c92 100644 --- a/etc/cnid_dbd/cnid_metad.c +++ b/etc/cnid_dbd/cnid_metad.c @@ -1,9 +1,8 @@ /* - * $Id: cnid_metad.c,v 1.22 2009-11-16 02:04:47 didg Exp $ - * * Copyright (C) Joerg Lenneis 2003 - * All Rights Reserved. See COPYING. + * Copyright (C) Frank Lahm 2009, 2010 * + * All Rights Reserved. See COPYING. */ /* @@ -22,6 +21,8 @@ Result: via TCP socket 4. afpd -------> cnid_dbd + + cnid_metad and cnid_dbd have been converted to non-blocking IO in 2010. */ @@ -37,24 +38,15 @@ #include #include #include -#ifdef HAVE_SYS_TYPES_H #include -#endif -#ifdef HAVE_SYS_TIME_H #include -#endif -#ifdef HAVE_SYS_WAIT_H #include -#endif -#ifdef HAVE_SYS_UIO_H #include -#endif #include -#define _XPG4_2 1 +// #define _XPG4_2 1 #include #include #include -#include #ifndef WEXITSTATUS #define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) @@ -96,8 +88,9 @@ #include #include #include +#include +#include -#include "db_param.h" #include "usockfd.h" #define DBHOME ".AppleDB" @@ -106,16 +99,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 { - char *name; + struct volinfo *volinfo; pid_t pid; time_t tm; /* When respawned last */ int count; /* Times respawned in the last TESTTIME secondes */ @@ -146,11 +140,11 @@ static void sigterm_handler(int sig) daemon_exit(0); } -static struct server *test_usockfn(char *dir) +static struct server *test_usockfn(struct volinfo *volinfo) { int i; - for (i = 0; i < MAXVOLS; i++) { - if (srv[i].name && !strcmp(srv[i].name, dir)) { + for (i = 0; i < maxvol; i++) { + if ((srv[i].volinfo) && (strcmp(srv[i].volinfo->v_path, volinfo->v_path) == 0)) { return &srv[i]; } } @@ -158,60 +152,7 @@ static struct server *test_usockfn(char *dir) } /* -------------------- */ -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)); - - *((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; - } - free(buf); - return 0; -} - -/* -------------------- */ -static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) +static int maybe_start_dbd(char *dbdpn, struct volinfo *volinfo) { pid_t pid; struct server *up; @@ -220,31 +161,34 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) time_t t; char buf1[8]; char buf2[8]; + char *volpath = volinfo->v_path; - LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: dbdir: '%s', UNIX socket file: '%s'", - dbdir, usockfn); + LOG(log_debug, logtype_cnid, "maybe_start_dbd: Volume: \"%s\"", volpath); - up = test_usockfn(dbdir); + up = test_usockfn(volinfo); 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; } return 0; } - LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: no cnid_dbd for that volume yet. Starting one ..."); + LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: no cnid_dbd for that volume yet"); time(&t); if (!up) { - /* find an empty slot */ - for (i = 0; i < MAXVOLS; i++) { - if ( !srv[i].name ) { + /* find an empty slot (i < maxvol) or the first free slot (i == maxvol)*/ + for (i = 0; i <= maxvol; i++) { + if (srv[i].volinfo == NULL && i < MAXVOLS) { up = &srv[i]; + up->volinfo = volinfo; + retainvolinfo(volinfo); up->tm = t; up->count = 0; - up->name = strdup(dbdir); + if (i == maxvol) + maxvol++; break; } } @@ -252,8 +196,7 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) LOG(log_error, logtype_cnid, "no free slot for cnid_dbd child. Configured maximum: %d. Do you have so many volumes?", MAXVOLS); return -1; } - } - else { + } else { /* we have a slot but no process, check for respawn too fast */ if ( (t < (up->tm + TESTTIME)) /* We're in the respawn time window */ && @@ -313,11 +256,11 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) /* 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->name); - ret = execlp(dbdpn, dbdpn, "-d", dbdir, buf1, buf2, logconfig, NULL); + 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, dbdir, buf1, buf2, logconfig, NULL); + ret = execlp(dbdpn, dbdpn, volpath, buf1, buf2, logconfig, NULL); } /* Yikes! We're still here, so exec failed... */ LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno)); @@ -333,12 +276,12 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) } /* ------------------ */ -static int set_dbdir(char *dbdir, int len) +static int set_dbdir(char *dbdir) { + int len; struct stat st; - if (!len) - return -1; + len = strlen(dbdir); if (stat(dbdir, &st) < 0 && mkdir(dbdir, 0755) < 0) { LOG(log_error, logtype_cnid, "set_dbdir: mkdir failed for %s", dbdir); @@ -464,17 +407,36 @@ 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[]) { - char dbdir[MAXPATHLEN + 1]; + char volpath[MAXPATHLEN + 1]; int len, actual_len; pid_t pid; int status; char *dbdpn = _PATH_CNID_DBD; char *host = DEFAULTHOST; char *port = DEFAULTPORT; - struct db_param *dbp; int i; int cc; uid_t uid = 0; @@ -485,6 +447,7 @@ int main(int argc, char *argv[]) char *loglevel = NULL; char *logfile = NULL; sigset_t set; + struct volinfo *volinfo; set_processname("cnid_metad"); @@ -544,8 +507,10 @@ int main(int argc, char *argv[]) daemon_exit(1); } + (void)setlimits(); + /* Check PID lockfile and become a daemon */ - switch(server_lock("cnid_metad", _PATH_CNID_METAD_LOCK, 0)) { + switch(server_lock("cnid_metad", _PATH_CNID_METAD_LOCK, debug)) { case -1: /* error */ daemon_exit(EXITERR_SYS); case 0: /* child */ @@ -584,7 +549,7 @@ 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); @@ -604,9 +569,8 @@ int main(int argc, char *argv[]) if (rqstfd <= 0) continue; - /* TODO: Check out read errors, broken pipe etc. in libatalk. Is - SIGIPE ignored there? Answer: Ignored for dsi, but not for asp ... */ - ret = read(rqstfd, &len, sizeof(int)); + ret = readt(rqstfd, &len, sizeof(int), 1, 4); + if (!ret) { /* already close */ goto loop_end; @@ -628,7 +592,7 @@ int main(int argc, char *argv[]) goto loop_end; } - actual_len = read(rqstfd, dbdir, len); + actual_len = readt(rqstfd, volpath, len, 1, 5); if (actual_len < 0) { LOG(log_severe, logtype_cnid, "Read(2) error : %s", strerror(errno)); goto loop_end; @@ -637,17 +601,22 @@ int main(int argc, char *argv[]) LOG(log_error, logtype_cnid, "error/short read (dir): %s", strerror(errno)); goto loop_end; } - dbdir[len] = '\0'; + volpath[len] = '\0'; - if (set_dbdir(dbdir, len) < 0) { + /* Load .volinfo file */ + if ((volinfo = allocvolinfo(volpath)) == NULL) { + LOG(log_severe, logtype_cnid, "allocvolinfo(\"%s\"): %s", + volpath, strerror(errno)); goto loop_end; } - if ((dbp = db_param_read(dbdir, METAD)) == NULL) { - LOG(log_error, logtype_cnid, "Error reading config file"); + if (set_dbdir(volinfo->v_dbpath) < 0) { goto loop_end; } - maybe_start_dbd(dbdpn, dbdir, dbp->usock_file); + + maybe_start_dbd(dbdpn, volinfo); + + (void)closevolinfo(volinfo); loop_end: close(rqstfd);