SIGKILL is sent if instance process is still running after
<term_timeout> seconds after SIGTERM has been sent. To prevent
another daemon process being launched before old process dies,
the instance is kept until SIGCHLD confirms that service has
been stopped.
Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
INSTANCE_ATTR_SECCOMP,
INSTANCE_ATTR_PIDFILE,
INSTANCE_ATTR_RELOADSIG,
INSTANCE_ATTR_SECCOMP,
INSTANCE_ATTR_PIDFILE,
INSTANCE_ATTR_RELOADSIG,
+ INSTANCE_ATTR_TERMTIMEOUT,
[INSTANCE_ATTR_SECCOMP] = { "seccomp", BLOBMSG_TYPE_STRING },
[INSTANCE_ATTR_PIDFILE] = { "pidfile", BLOBMSG_TYPE_STRING },
[INSTANCE_ATTR_RELOADSIG] = { "reload_signal", BLOBMSG_TYPE_INT32 },
[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 },
- if (in->proc.pending || !in->command)
+ if (!in->command) {
+ LOG("Not starting instance %s::%s, command not set\n", in->srv->name, in->name);
+ }
+
+ 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) {
- in->halt = !in->respawn;
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)
return;
uloop_timeout_cancel(&in->timeout);
return;
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) {
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);
in->halt = true;
in->restart = in->respawn = false;
kill(in->proc.pid, SIGTERM);
in->halt = true;
in->restart = in->respawn = false;
kill(in->proc.pid, SIGTERM);
+ uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
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);
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};
{
bool changed = instance_config_changed(in, in_new);
bool running = in->proc.pending;
{
bool changed = instance_config_changed(in, in_new);
bool running = in->proc.pending;
+ bool stopping = in->halt;
+ if (!running || stopping) {
instance_config_move(in, in_new);
instance_start(in);
} else {
instance_config_move(in, in_new);
instance_start(in);
} else {
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->_stdout.fd.fd = -2;
in->_stdout.stream.string_data = true;
in->_stdout.fd.fd = -2;
in->_stdout.stream.string_data = true;
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;
char *seccomp;
char *pidfile;
char *seccomp;
char *pidfile;
uint32_t respawn_timeout;
uint32_t respawn_threshold;
uint32_t respawn_retry;
uint32_t respawn_timeout;
uint32_t respawn_threshold;
uint32_t respawn_retry;
instance_update(in_o, in_n);
instance_free(in_n);
} else if (in_o) {
instance_update(in_o, in_n);
instance_free(in_n);
} else if (in_o) {
- DEBUG(2, "Free instance %s::%s\n", in_o->srv->name, in_o->name);
+ DEBUG(2, "Stop instance %s::%s\n", in_o->srv->name, in_o->name);
- DEBUG(2, "Create instance %s::%s\n", in_n->srv->name, in_n->name);
+ DEBUG(2, "Start instance %s::%s\n", in_n->srv->name, in_n->name);
instance_start(in_n);
}
blob_buf_init(&b, 0);
instance_start(in_n);
}
blob_buf_init(&b, 0);
strcpy(new_name, name);
vlist_init(&s->instances, avl_strcmp, service_instance_update);
strcpy(new_name, name);
vlist_init(&s->instances, avl_strcmp, service_instance_update);
- s->instances.keep_old = true;
+ s->instances.no_delete = true;
s->name = new_name;
s->avl.key = s->name;
INIT_LIST_HEAD(&s->validators);
s->name = new_name;
s->avl.key = s->name;
INIT_LIST_HEAD(&s->validators);
static void
service_delete(struct service *s)
{
static void
service_delete(struct service *s)
{
- service_event("service.stop", s->name, NULL);
vlist_flush_all(&s->instances);
vlist_flush_all(&s->instances);
- avl_delete(&services, &s->avl);
- trigger_del(s);
- free(s->trigger);
- free(s);
- service_validate_del(s);
return service_handle_set(NULL, NULL, NULL, "add", b.head);
}
return service_handle_set(NULL, NULL, NULL, "add", b.head);
}
+void service_stopped(struct service *s)
+{
+ if (avl_is_empty(&s->instances.avl)) {
+ service_event("service.stop", s->name, NULL);
+ avl_delete(&services, &s->avl);
+ trigger_del(s);
+ free(s->trigger);
+ free(s);
+ service_validate_del(s);
+ }
+}
+
void service_event(const char *type, const char *service, const char *instance)
{
if (!ctx)
void service_event(const char *type, const char *service, const char *instance)
{
if (!ctx)
void service_validate_dump(struct blob_buf *b, struct service *s);
void service_validate_dump_all(struct blob_buf *b, char *p, char *s);
int service_start_early(char *name, char *cmdline);
void service_validate_dump(struct blob_buf *b, struct service *s);
void service_validate_dump_all(struct blob_buf *b, char *p, char *s);
int service_start_early(char *name, char *cmdline);
+void service_stopped(struct service *s);
void service_validate_del(struct service *s);
void service_event(const char *type, const char *service, const char *instance);
void service_validate_del(struct service *s);
void service_event(const char *type, const char *service, const char *instance);