X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcnid_metad.c;h=19087f19d5cc0ca31363bd79238717521daa9042;hb=2fdd522410f80afcd055d7333f491ee6c0b4b9fa;hp=85ea7a4fb21b88fd71b19a05a4376fe49c142b7f;hpb=5d0296cf678ce167a32663c9aa05a21881ff78b2;p=netatalk.git diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c index 85ea7a4f..19087f19 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) @@ -90,6 +90,7 @@ #include #include #include +#include #include "usockfd.h" @@ -99,11 +100,12 @@ 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" @@ -142,7 +144,7 @@ static void sigterm_handler(int sig) static struct server *test_usockfn(struct volinfo *volinfo) { int i; - for (i = 0; i < MAXVOLS; i++) { + for (i = 0; i < maxvol; i++) { if ((srv[i].volinfo) && (strcmp(srv[i].volinfo->v_path, volinfo->v_path) == 0)) { return &srv[i]; } @@ -150,59 +152,6 @@ static struct server *test_usockfn(struct volinfo *volinfo) 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)); - - *((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, struct volinfo *volinfo) { @@ -220,7 +169,7 @@ static int maybe_start_dbd(char *dbdpn, struct volinfo *volinfo) 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; } @@ -231,14 +180,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].volinfo == NULL && i < MAXVOLS) { up = &srv[i]; up->volinfo = volinfo; retainvolinfo(volinfo); up->tm = t; up->count = 0; + if (i == maxvol) + maxvol++; break; } } @@ -303,13 +254,12 @@ 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); + /* 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->volinfo->v_path); ret = execlp(dbdpn, dbdpn, "-d", volpath, buf1, buf2, logconfig, NULL); - } - else { + } else { ret = execlp(dbdpn, dbdpn, volpath, buf1, buf2, logconfig, NULL); } /* Yikes! We're still here, so exec failed... */ @@ -457,6 +407,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[]) { @@ -521,6 +491,17 @@ int main(int argc, char *argv[]) } } + /* 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 (loglevel) { strlcpy(logconfig + 8, loglevel, 13); free(loglevel); @@ -537,15 +518,7 @@ int main(int argc, char *argv[]) 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); - } + (void)setlimits(); if ((srvfd = tsockfd_create(host, port, 10)) < 0) daemon_exit(1); @@ -577,7 +550,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); @@ -633,7 +606,8 @@ int main(int argc, char *argv[]) /* Load .volinfo file */ if ((volinfo = allocvolinfo(volpath)) == NULL) { - LOG(log_severe, logtype_cnid, "allocvolinfo: %s", strerror(errno)); + LOG(log_severe, logtype_cnid, "allocvolinfo(\"%s\"): %s", + volpath, strerror(errno)); goto loop_end; }