X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Finstance.c;h=e5c483010340d0a62206604f7551bf44469498e4;hp=52f5cf29bb38a19387e9f8f5d90673f97664e079;hb=5b1fb35427ba36d20c9f2a6b9403d1545b3abee6;hpb=dfd5816bcbef980b11c8a286f8f52a434651c528 diff --git a/service/instance.c b/service/instance.c index 52f5cf2..e5c4830 100644 --- a/service/instance.c +++ b/service/instance.c @@ -53,6 +53,9 @@ enum { INSTANCE_ATTR_JAIL, INSTANCE_ATTR_TRACE, INSTANCE_ATTR_SECCOMP, + INSTANCE_ATTR_PIDFILE, + INSTANCE_ATTR_RELOADSIG, + INSTANCE_ATTR_TERMTIMEOUT, __INSTANCE_ATTR_MAX }; @@ -75,10 +78,14 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = { [INSTANCE_ATTR_JAIL] = { "jail", BLOBMSG_TYPE_TABLE }, [INSTANCE_ATTR_TRACE] = { "trace", BLOBMSG_TYPE_BOOL }, [INSTANCE_ATTR_SECCOMP] = { "seccomp", BLOBMSG_TYPE_STRING }, + [INSTANCE_ATTR_PIDFILE] = { "pidfile", BLOBMSG_TYPE_STRING }, + [INSTANCE_ATTR_RELOADSIG] = { "reload_signal", BLOBMSG_TYPE_INT32 }, + [INSTANCE_ATTR_TERMTIMEOUT] = { "term_timeout", BLOBMSG_TYPE_INT32 }, }; enum { JAIL_ATTR_NAME, + JAIL_ATTR_HOSTNAME, JAIL_ATTR_PROCFS, JAIL_ATTR_SYSFS, JAIL_ATTR_UBUS, @@ -90,6 +97,7 @@ enum { static const struct blobmsg_policy jail_attr[__JAIL_ATTR_MAX] = { [JAIL_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING }, + [JAIL_ATTR_HOSTNAME] = { "hostname", BLOBMSG_TYPE_STRING }, [JAIL_ATTR_PROCFS] = { "procfs", BLOBMSG_TYPE_BOOL }, [JAIL_ATTR_SYSFS] = { "sysfs", BLOBMSG_TYPE_BOOL }, [JAIL_ATTR_UBUS] = { "ubus", BLOBMSG_TYPE_BOOL }, @@ -120,14 +128,16 @@ static const struct rlimit_name rlimit_names[] = { { "data", RLIMIT_DATA }, { "fsize", RLIMIT_FSIZE }, { "memlock", RLIMIT_MEMLOCK }, - { "msgqueue", RLIMIT_MSGQUEUE }, - { "nice", RLIMIT_NICE }, { "nofile", RLIMIT_NOFILE }, { "nproc", RLIMIT_NPROC }, { "rss", RLIMIT_RSS }, + { "stack", RLIMIT_STACK }, +#ifdef linux + { "nice", RLIMIT_NICE }, { "rtprio", RLIMIT_RTPRIO }, + { "msgqueue", RLIMIT_MSGQUEUE }, { "sigpending", RLIMIT_SIGPENDING }, - { "stack", RLIMIT_STACK }, +#endif { NULL, 0 } }; @@ -185,6 +195,11 @@ jail_run(struct service_instance *in, char **argv) argv[argc++] = jail->name; } + if (jail->hostname) { + argv[argc++] = "-h"; + argv[argc++] = jail->hostname; + } + if (in->seccomp) { argv[argc++] = "-S"; argv[argc++] = in->seccomp; @@ -223,6 +238,47 @@ jail_run(struct service_instance *in, char **argv) return argc; } +static int +instance_removepid(struct service_instance *in) { + if (!in->pidfile) + return 0; + if (unlink(in->pidfile)) { + ERROR("Failed to removed pidfile: %s: %d - %s\n", + in->pidfile, errno, strerror(errno)); + return 1; + } + return 0; +} + +static int +instance_writepid(struct service_instance *in) +{ + FILE *_pidfile; + + if (!in->pidfile) { + return 0; + } + _pidfile = fopen(in->pidfile, "w"); + if (_pidfile == NULL) { + ERROR("failed to open pidfile for writing: %s: %d (%s)", + in->pidfile, errno, strerror(errno)); + return 1; + } + if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) { + ERROR("failed to write pidfile: %s: %d (%s)", + in->pidfile, errno, strerror(errno)); + fclose(_pidfile); + return 2; + } + if (fclose(_pidfile)) { + ERROR("failed to close pidfile: %s: %d (%s)", + in->pidfile, errno, strerror(errno)); + return 3; + } + + return 0; +} + static void instance_run(struct service_instance *in, int _stdout, int _stderr) { @@ -335,8 +391,16 @@ instance_start(struct service_instance *in) return; } - if (in->proc.pending) + if (!in->command) { + LOG("Not starting instance %s::%s, command not set\n", in->srv->name, in->name); + return; + } + + if (in->proc.pending) { + if (in->halt) + in->restart = true; return; + } instance_free_stdio(in); if (in->_stdout.fd.fd > -2) { @@ -354,7 +418,7 @@ instance_start(struct service_instance *in) } in->restart = false; - in->halt = !in->respawn; + in->halt = false; if (!in->valid) return; @@ -371,8 +435,9 @@ instance_start(struct service_instance *in) return; } - DEBUG(2, "Started instance %s::%s\n", in->srv->name, in->name); + DEBUG(2, "Started instance %s::%s[%d]\n", in->srv->name, in->name, pid); in->proc.pid = pid; + instance_writepid(in); clock_gettime(CLOCK_MONOTONIC, &in->start); uloop_process_add(&in->proc); @@ -439,7 +504,11 @@ instance_timeout(struct uloop_timeout *t) in = container_of(t, struct service_instance, timeout); - if (!in->halt && (in->restart || in->respawn)) + if (in->halt) { + LOG("Instance %s::%s pid %d not stopped on SIGTERM, sending SIGKILL instead\n", + in->srv->name, in->name, in->proc.pid); + kill(in->proc.pid, SIGKILL); + } else if (in->restart || in->respawn) instance_start(in); } @@ -456,12 +525,21 @@ instance_exit(struct uloop_process *p, int ret) runtime = tp.tv_sec - in->start.tv_sec; DEBUG(2, "Instance %s::%s exit with error code %d after %ld seconds\n", in->srv->name, in->name, ret, runtime); - if (upgrade_running) - return; uloop_timeout_cancel(&in->timeout); + service_event("instance.stop", in->srv->name, in->name); + if (in->halt) { - /* no action */ + instance_removepid(in); + if (in->restart) + instance_start(in); + else { + struct service *s = in->srv; + + avl_delete(&s->instances.avl, &in->node.avl); + instance_free(in); + service_stopped(s); + } } else if (in->restart) { instance_start(in); } else if (in->respawn) { @@ -474,21 +552,23 @@ instance_exit(struct uloop_process *p, int ret) in->srv->name, in->name, in->respawn_count, runtime); in->restart = in->respawn = 0; in->halt = 1; + service_event("instance.fail", in->srv->name, in->name); } else { + service_event("instance.respawn", in->srv->name, in->name); uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000); } } - service_event("instance.stop", in->srv->name, in->name); } void -instance_stop(struct service_instance *in) +instance_stop(struct service_instance *in, bool halt) { if (!in->proc.pending) return; - in->halt = true; + in->halt = halt; in->restart = in->respawn = false; kill(in->proc.pid, SIGTERM); + uloop_timeout_set(&in->timeout, in->term_timeout * 1000); } static void @@ -496,9 +576,16 @@ instance_restart(struct service_instance *in) { if (!in->proc.pending) return; - in->halt = false; + + if (in->reload_signal) { + kill(in->proc.pid, in->reload_signal); + return; + } + + in->halt = true; in->restart = true; kill(in->proc.pid, SIGTERM); + uloop_timeout_set(&in->timeout, in->term_timeout * 1000); } static bool @@ -513,9 +600,6 @@ instance_config_changed(struct service_instance *in, struct service_instance *in if (!blobmsg_list_equal(&in->env, &in_new->env)) return true; - if (!blobmsg_list_equal(&in->data, &in_new->data)) - return true; - if (!blobmsg_list_equal(&in->netdev, &in_new->netdev)) return true; @@ -531,6 +615,16 @@ instance_config_changed(struct service_instance *in, struct service_instance *in if (in->gid != in_new->gid) return true; + if (in->pidfile && in_new->pidfile) + if (strcmp(in->pidfile, in_new->pidfile)) + return true; + + if (in->pidfile && !in_new->pidfile) + return true; + + if (!in->pidfile && in_new->pidfile) + return true; + if (!blobmsg_list_equal(&in->limits, &in_new->limits)) return true; @@ -649,6 +743,10 @@ instance_jail_parse(struct service_instance *in, struct blob_attr *attr) jail->name = blobmsg_get_string(tb[JAIL_ATTR_NAME]); jail->argc += 2; } + if (tb[JAIL_ATTR_HOSTNAME]) { + jail->hostname = blobmsg_get_string(tb[JAIL_ATTR_HOSTNAME]); + jail->argc += 2; + } if (tb[JAIL_ATTR_PROCFS]) { jail->procfs = blobmsg_get_bool(tb[JAIL_ATTR_PROCFS]); jail->argc++; @@ -684,32 +782,45 @@ instance_jail_parse(struct service_instance *in, struct blob_attr *attr) } static bool -instance_config_parse(struct service_instance *in) +instance_config_parse_command(struct service_instance *in, struct blob_attr **tb) { - struct blob_attr *tb[__INSTANCE_ATTR_MAX]; struct blob_attr *cur, *cur2; - int argc = 0; + bool ret = false; int rem; - blobmsg_parse(instance_attr, __INSTANCE_ATTR_MAX, tb, - blobmsg_data(in->config), blobmsg_data_len(in->config)); - cur = tb[INSTANCE_ATTR_COMMAND]; - if (!cur) - return false; + if (!cur) { + in->command = NULL; + return true; + } if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING)) return false; blobmsg_for_each_attr(cur2, cur, rem) { - argc++; + ret = true; break; } - if (!argc) - return false; in->command = cur; + return ret; +} +static bool +instance_config_parse(struct service_instance *in) +{ + struct blob_attr *tb[__INSTANCE_ATTR_MAX]; + struct blob_attr *cur, *cur2; + int rem; + + blobmsg_parse(instance_attr, __INSTANCE_ATTR_MAX, tb, + blobmsg_data(in->config), blobmsg_data_len(in->config)); + + if (!instance_config_parse_command(in, tb)) + return false; + + if (tb[INSTANCE_ATTR_TERMTIMEOUT]) + in->term_timeout = blobmsg_get_u32(tb[INSTANCE_ATTR_TERMTIMEOUT]); if (tb[INSTANCE_ATTR_RESPAWN]) { int i = 0; uint32_t vals[3] = { 3600, 5, 5}; @@ -769,6 +880,16 @@ instance_config_parse(struct service_instance *in) else in->seccomp = seccomp; } + + if (tb[INSTANCE_ATTR_PIDFILE]) { + char *pidfile = blobmsg_get_string(tb[INSTANCE_ATTR_PIDFILE]); + if (pidfile) + in->pidfile = pidfile; + } + + if (tb[INSTANCE_ATTR_RELOADSIG]) + in->reload_signal = blobmsg_get_u32(tb[INSTANCE_ATTR_RELOADSIG]); + if (!in->trace && tb[INSTANCE_ATTR_JAIL]) in->has_jail = instance_jail_parse(in, tb[INSTANCE_ATTR_JAIL]); @@ -823,6 +944,7 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr blobmsg_list_move(&in->jail.mount, &in_src->jail.mount); in->trigger = in_src->trigger; in->command = in_src->command; + in->pidfile = in_src->pidfile; in->name = in_src->name; in->node.avl.key = in_src->node.avl.key; @@ -831,25 +953,22 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr in_src->config = NULL; } -bool +void instance_update(struct service_instance *in, struct service_instance *in_new) { bool changed = instance_config_changed(in, in_new); bool running = in->proc.pending; + bool stopping = in->halt; - if (!changed && running) - return false; - - if (!running) { - if (changed) - instance_config_move(in, in_new); + if (!running || stopping) { + instance_config_move(in, in_new); instance_start(in); } else { - instance_restart(in); + if (changed) + instance_restart(in); instance_config_move(in, in_new); /* restart happens in the child callback handler */ } - return true; } void @@ -874,6 +993,7 @@ instance_init(struct service_instance *in, struct service *s, struct blob_attr * in->config = config; in->timeout.cb = instance_timeout; in->proc.cb = instance_exit; + in->term_timeout = 5; in->_stdout.fd.fd = -2; in->_stdout.stream.string_data = true; @@ -904,7 +1024,9 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose) blobmsg_add_u8(b, "running", in->proc.pending); if (in->proc.pending) blobmsg_add_u32(b, "pid", in->proc.pid); - blobmsg_add_blob(b, in->command); + if (in->command) + blobmsg_add_blob(b, in->command); + blobmsg_add_u32(b, "term_timeout", in->term_timeout); if (!avl_is_empty(&in->errors.avl)) { struct blobmsg_list_node *var; @@ -938,6 +1060,9 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose) blobmsg_close_table(b, e); } + if (in->reload_signal) + blobmsg_add_u32(b, "reload_signal", in->reload_signal); + if (in->respawn) { void *r = blobmsg_open_table(b, "respawn"); blobmsg_add_u32(b, "threshold", in->respawn_threshold); @@ -955,10 +1080,15 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose) if (in->seccomp) blobmsg_add_string(b, "seccomp", in->seccomp); + if (in->pidfile) + blobmsg_add_string(b, "pidfile", in->pidfile); + if (in->has_jail) { void *r = blobmsg_open_table(b, "jail"); if (in->jail.name) blobmsg_add_string(b, "name", in->jail.name); + if (in->jail.hostname) + blobmsg_add_string(b, "hostname", in->jail.hostname); blobmsg_add_u8(b, "procfs", in->jail.procfs); blobmsg_add_u8(b, "sysfs", in->jail.sysfs); blobmsg_add_u8(b, "ubus", in->jail.ubus);