#include <signal.h>
#include <sys/types.h>
#include <sys/time.h>
+#include <sys/resource.h>
#include <sys/wait.h>
#include <sys/uio.h>
#include <sys/un.h>
-#define _XPG4_2 1
+// #define _XPG4_2 1
#include <sys/socket.h>
#include <stdio.h>
#include <time.h>
#include <atalk/logger.h>
#include <atalk/cnid_dbd_private.h>
#include <atalk/paths.h>
-#include <atalk/volinfo.h>
+#include <atalk/compat.h>
+#include <atalk/errchk.h>
+#include <atalk/bstrlib.h>
+#include <atalk/netatalk_conf.h>
+#include <atalk/volume.h>
#include "usockfd.h"
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 */
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);
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)) {
+
+ if (!(vol->v_flags & AFPVOL_OPEN))
+ return NULL;
+
+ for (i = 0; i < maxvol; i++) {
+ if (vol->v_vid == srv[i].vol->v_vid)
return &srv[i];
- }
}
+
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;
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_fd(up->control_fd, rqstfd) < 0) {
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;
}
}
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));
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[])
{
int err = 0;
int debug = 0;
int ret;
- char *loglevel = NULL;
- char *logfile = NULL;
sigset_t set;
- struct volinfo *volinfo;
+ AFPObj obj = { 0 };
+ struct vol *vol;
- set_processname("cnid_metad");
-
- 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);
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;
}
volpath[len] = '\0';
- /* Load .volinfo file */
- if ((volinfo = allocvolinfo(volpath)) == NULL) {
- LOG(log_severe, logtype_cnid, "allocvolinfo(\"%s\"): %s",
- volpath, 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);
}
projects / netatalk.git / blobdiff