projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
instance: properly compare and reload respawn config
[project/procd.git]
/
service
/
instance.c
diff --git
a/service/instance.c
b/service/instance.c
index
10e35ca
..
b7cb523
100644
(file)
--- a/
service/instance.c
+++ b/
service/instance.c
@@
-54,6
+54,8
@@
enum {
INSTANCE_ATTR_TRACE,
INSTANCE_ATTR_SECCOMP,
INSTANCE_ATTR_PIDFILE,
INSTANCE_ATTR_TRACE,
INSTANCE_ATTR_SECCOMP,
INSTANCE_ATTR_PIDFILE,
+ INSTANCE_ATTR_RELOADSIG,
+ INSTANCE_ATTR_TERMTIMEOUT,
__INSTANCE_ATTR_MAX
};
__INSTANCE_ATTR_MAX
};
@@
-77,6
+79,8
@@
static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
[INSTANCE_ATTR_TRACE] = { "trace", BLOBMSG_TYPE_BOOL },
[INSTANCE_ATTR_SECCOMP] = { "seccomp", BLOBMSG_TYPE_STRING },
[INSTANCE_ATTR_PIDFILE] = { "pidfile", BLOBMSG_TYPE_STRING },
[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 {
};
enum {
@@
-263,6
+267,7
@@
instance_writepid(struct service_instance *in)
if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) {
ERROR("failed to write pidfile: %s: %d (%s)",
in->pidfile, errno, strerror(errno));
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)) {
return 2;
}
if (fclose(_pidfile)) {
@@
-298,16
+303,13
@@
instance_run(struct service_instance *in, int _stdout, int _stderr)
if (seccomp)
setenv("SECCOMP_FILE", in->seccomp, 1);
if (seccomp)
setenv("SECCOMP_FILE", in->seccomp, 1);
- if ((seccomp || setlbf) && asprintf(&ld_preload, "LD_PRELOAD=%s%s%s",
- seccomp ? "/lib/libpreload-seccomp.so" : "",
- seccomp && setlbf ? ":" : "",
- setlbf ? "/lib/libsetlbf.so" : "") > 0)
+ if (setlbf && asprintf(&ld_preload, "LD_PRELOAD=/lib/libsetlbf.so") > 0)
putenv(ld_preload);
blobmsg_list_for_each(&in->limits, var)
instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
putenv(ld_preload);
blobmsg_list_for_each(&in->limits, var)
instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
- if (in->trace)
+ if (in->trace
|| seccomp
)
argc += 1;
argv = alloca(sizeof(char *) * (argc + in->jail.argc));
argc += 1;
argv = alloca(sizeof(char *) * (argc + in->jail.argc));
@@
-315,6
+317,8
@@
instance_run(struct service_instance *in, int _stdout, int _stderr)
if (in->trace)
argv[argc++] = trace;
if (in->trace)
argv[argc++] = trace;
+ else if (seccomp)
+ argv[argc++] = "/sbin/seccomp-trace";
if (in->has_jail)
argc = jail_run(in, argv);
if (in->has_jail)
argc = jail_run(in, argv);
@@
-386,8
+390,16
@@
instance_start(struct service_instance *in)
return;
}
return;
}
- if (in->proc.pending || !in->command)
+ if (!in->command) {
+ LOG("Not starting instance %s::%s, command not set\n", in->srv->name, in->name);
return;
return;
+ }
+
+ if (in->proc.pending) {
+ if (in->halt)
+ in->restart = true;
+ return;
+ }
instance_free_stdio(in);
if (in->_stdout.fd.fd > -2) {
instance_free_stdio(in);
if (in->_stdout.fd.fd > -2) {
@@
-405,7
+417,7
@@
instance_start(struct service_instance *in)
}
in->restart = false;
}
in->restart = false;
- in->halt =
!in->respawn
;
+ in->halt =
false
;
if (!in->valid)
return;
if (!in->valid)
return;
@@
-431,11
+443,13
@@
instance_start(struct service_instance *in)
if (opipe[0] > -1) {
ustream_fd_init(&in->_stdout, opipe[0]);
closefd(opipe[1]);
if (opipe[0] > -1) {
ustream_fd_init(&in->_stdout, opipe[0]);
closefd(opipe[1]);
+ fcntl(opipe[0], F_SETFD, FD_CLOEXEC);
}
if (epipe[0] > -1) {
ustream_fd_init(&in->_stderr, epipe[0]);
closefd(epipe[1]);
}
if (epipe[0] > -1) {
ustream_fd_init(&in->_stderr, epipe[0]);
closefd(epipe[1]);
+ fcntl(epipe[0], F_SETFD, FD_CLOEXEC);
}
service_event("instance.start", in->srv->name, in->name);
}
service_event("instance.start", in->srv->name, in->name);
@@
-491,7
+505,11
@@
instance_timeout(struct uloop_timeout *t)
in = container_of(t, struct service_instance, timeout);
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);
}
instance_start(in);
}
@@
-508,12
+526,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);
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);
uloop_timeout_cancel(&in->timeout);
+ service_event("instance.stop", in->srv->name, in->name);
+
if (in->halt) {
instance_removepid(in);
if (in->halt) {
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) {
} else if (in->restart) {
instance_start(in);
} else if (in->respawn) {
@@
-532,17
+559,17
@@
instance_exit(struct uloop_process *p, int ret)
uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000);
}
}
uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000);
}
}
- service_event("instance.stop", in->srv->name, in->name);
}
void
}
void
-instance_stop(struct service_instance *in)
+instance_stop(struct service_instance *in
, bool halt
)
{
if (!in->proc.pending)
return;
{
if (!in->proc.pending)
return;
- in->halt =
true
;
+ in->halt =
halt
;
in->restart = in->respawn = false;
kill(in->proc.pid, SIGTERM);
in->restart = in->respawn = false;
kill(in->proc.pid, SIGTERM);
+ uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
}
static void
}
static void
@@
-550,10
+577,16
@@
instance_restart(struct service_instance *in)
{
if (!in->proc.pending)
return;
{
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);
in->restart = true;
kill(in->proc.pid, SIGTERM);
-
instance_removepid(in
);
+
uloop_timeout_set(&in->timeout, in->term_timeout * 1000
);
}
static bool
}
static bool
@@
-568,9
+601,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->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;
if (!blobmsg_list_equal(&in->netdev, &in_new->netdev))
return true;
@@
-596,6
+626,13
@@
instance_config_changed(struct service_instance *in, struct service_instance *in
if (!in->pidfile && in_new->pidfile)
return true;
if (!in->pidfile && in_new->pidfile)
return true;
+ if (in->respawn_retry != in_new->respawn_retry)
+ return true;
+ if (in->respawn_threshold != in_new->respawn_threshold)
+ return true;
+ if (in->respawn_timeout != in_new->respawn_timeout)
+ return true;
+
if (!blobmsg_list_equal(&in->limits, &in_new->limits))
return true;
if (!blobmsg_list_equal(&in->limits, &in_new->limits))
return true;
@@
-790,6
+827,8
@@
instance_config_parse(struct service_instance *in)
if (!instance_config_parse_command(in, tb))
return false;
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};
if (tb[INSTANCE_ATTR_RESPAWN]) {
int i = 0;
uint32_t vals[3] = { 3600, 5, 5};
@@
-840,15
+879,8
@@
instance_config_parse(struct service_instance *in)
if (tb[INSTANCE_ATTR_NO_NEW_PRIVS])
in->no_new_privs = blobmsg_get_bool(tb[INSTANCE_ATTR_NO_NEW_PRIVS]);
if (tb[INSTANCE_ATTR_NO_NEW_PRIVS])
in->no_new_privs = blobmsg_get_bool(tb[INSTANCE_ATTR_NO_NEW_PRIVS]);
- if (!in->trace && tb[INSTANCE_ATTR_SECCOMP]) {
- char *seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
- struct stat s;
-
- if (stat(seccomp, &s))
- ERROR("%s: not starting seccomp as %s is missing\n", in->name, seccomp);
- else
- in->seccomp = seccomp;
- }
+ if (!in->trace && tb[INSTANCE_ATTR_SECCOMP])
+ in->seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
if (tb[INSTANCE_ATTR_PIDFILE]) {
char *pidfile = blobmsg_get_string(tb[INSTANCE_ATTR_PIDFILE]);
if (tb[INSTANCE_ATTR_PIDFILE]) {
char *pidfile = blobmsg_get_string(tb[INSTANCE_ATTR_PIDFILE]);
@@
-856,6
+888,9
@@
instance_config_parse(struct service_instance *in)
in->pidfile = 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]);
if (!in->trace && tb[INSTANCE_ATTR_JAIL])
in->has_jail = instance_jail_parse(in, tb[INSTANCE_ATTR_JAIL]);
@@
-911,7
+946,11
@@
instance_config_move(struct service_instance *in, struct service_instance *in_sr
in->trigger = in_src->trigger;
in->command = in_src->command;
in->pidfile = in_src->pidfile;
in->trigger = in_src->trigger;
in->command = in_src->command;
in->pidfile = in_src->pidfile;
+ in->respawn_retry = in_src->respawn_retry;
+ in->respawn_threshold = in_src->respawn_threshold;
+ in->respawn_timeout = in_src->respawn_timeout;
in->name = in_src->name;
in->name = in_src->name;
+ in->trace = in_src->trace;
in->node.avl.key = in_src->node.avl.key;
free(in->config);
in->node.avl.key = in_src->node.avl.key;
free(in->config);
@@
-919,25
+958,22
@@
instance_config_move(struct service_instance *in, struct service_instance *in_sr
in_src->config = NULL;
}
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;
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_start(in);
} else {
- instance_restart(in);
+ if (changed)
+ instance_restart(in);
instance_config_move(in, in_new);
/* restart happens in the child callback handler */
}
instance_config_move(in, in_new);
/* restart happens in the child callback handler */
}
- return true;
}
void
}
void
@@
-962,6
+998,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->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;
in->_stdout.fd.fd = -2;
in->_stdout.stream.string_data = true;
@@
-994,6
+1031,7
@@
void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
blobmsg_add_u32(b, "pid", in->proc.pid);
if (in->command)
blobmsg_add_blob(b, in->command);
blobmsg_add_u32(b, "pid", in->proc.pid);
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;
if (!avl_is_empty(&in->errors.avl)) {
struct blobmsg_list_node *var;
@@
-1027,6
+1065,9
@@
void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
blobmsg_close_table(b, e);
}
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);
if (in->respawn) {
void *r = blobmsg_open_table(b, "respawn");
blobmsg_add_u32(b, "threshold", in->respawn_threshold);