X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=service.c;h=73e733bd845703e55e769265f02e7c7f5fe48d47;hp=28416894676591c940b2475ec862db211068380d;hb=18149b9f57f8971ebc7d6401fc0a08a3173bcb29;hpb=8e27452380193a5f81bfd08a59aab8b07008ba0b diff --git a/service.c b/service.c index 284168946..73e733bd8 100644 --- a/service.c +++ b/service.c @@ -35,6 +35,17 @@ #define NEWLINES "\n\r" #define LINE_MAX 4096 +static const char * const rcnd_table[] = { + "/rc0.d", SPECIAL_RUNLEVEL0_TARGET, + "/rc1.d", SPECIAL_RUNLEVEL1_TARGET, + "/rc2.d", SPECIAL_RUNLEVEL2_TARGET, + "/rc3.d", SPECIAL_RUNLEVEL3_TARGET, + "/rc4.d", SPECIAL_RUNLEVEL4_TARGET, + "/rc5.d", SPECIAL_RUNLEVEL5_TARGET, + "/rc6.d", SPECIAL_RUNLEVEL6_TARGET, + "/boot.d", SPECIAL_BASIC_TARGET +}; + static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, [SERVICE_START_PRE] = UNIT_ACTIVATING, @@ -63,8 +74,11 @@ static void service_done(Unit *u) { free(s->sysv_path); s->sysv_path = NULL; + free(s->sysv_runlevels); + s->sysv_runlevels = NULL; + exec_context_done(&s->exec_context); - exec_command_free_array(s->exec_command, _SERVICE_EXEC_MAX); + exec_command_free_array(s->exec_command, _SERVICE_EXEC_COMMAND_MAX); s->control_command = NULL; /* This will leak a process, but at least no memory or any of @@ -128,8 +142,8 @@ static int sysv_chkconfig_order(Service *s) { if (s->sysv_start_priority < 0) return 0; - /* If no LSB header is found we try to order init scripts via - * the start priority of the chkconfig header. */ + /* For each pair of services where at least one lacks a LSB + * header, we use the start priority value to order things. */ LIST_FOREACH(units_per_type, other, UNIT(s)->meta.manager->units_per_type[UNIT_SERVICE]) { Service *t; @@ -143,6 +157,12 @@ static int sysv_chkconfig_order(Service *s) { if (t->sysv_start_priority < 0) continue; + /* If both units have modern headers we don't care + * about the priorities */ + if ((!s->sysv_path || s->sysv_has_lsb) && + (!t->sysv_path || t->sysv_has_lsb)) + continue; + if (t->sysv_start_priority < s->sysv_start_priority) d = UNIT_AFTER; else if (t->sysv_start_priority > s->sysv_start_priority) @@ -200,6 +220,66 @@ static int sysv_exec_commands(Service *s) { return 0; } +static int priority_from_rcd(Service *s, const char *init_script) { + char **p; + unsigned i; + + STRV_FOREACH(p, UNIT(s)->meta.manager->sysvrcnd_path) + for (i = 0; i < ELEMENTSOF(rcnd_table); i += 2) { + char *path; + DIR *d; + struct dirent *de; + + if (asprintf(&path, "%s/%s", *p, rcnd_table[i]) < 0) + return -ENOMEM; + + d = opendir(path); + free(path); + + if (!d) { + if (errno != ENOENT) + log_warning("opendir() failed on %s: %s", path, strerror(errno)); + + continue; + } + + while ((de = readdir(d))) { + int a, b; + + if (ignore_file(de->d_name)) + continue; + + if (de->d_name[0] != 'S') + continue; + + if (strlen(de->d_name) < 4) + continue; + + if (!streq(de->d_name + 3, init_script)) + continue; + + /* Yay, we found it! Now decode the priority */ + + a = undecchar(de->d_name[1]); + b = undecchar(de->d_name[2]); + + if (a < 0 || b < 0) + continue; + + s->sysv_start_priority = a*10 + b; + + log_debug("Determined priority %i from link farm for %s", s->sysv_start_priority, unit_id(UNIT(s))); + + closedir(d); + return 0; + } + + closedir(d); + } + + return 0; +} + static int service_load_sysv_path(Service *s, const char *path) { FILE *f; Unit *u; @@ -211,7 +291,9 @@ static int service_load_sysv_path(Service *s, const char *path) { LSB, LSB_DESCRIPTION } state = NORMAL; - bool has_lsb = false; + + assert(s); + assert(path); u = UNIT(s); @@ -249,7 +331,7 @@ static int service_load_sysv_path(Service *s, const char *path) { if (state == NORMAL && streq(t, "### BEGIN INIT INFO")) { state = LSB; - has_lsb = true; + s->sysv_has_lsb = true; continue; } @@ -267,22 +349,38 @@ static int service_load_sysv_path(Service *s, const char *path) { if (startswith(t, "chkconfig:")) { int start_priority; + char runlevels[16], *k; state = NORMAL; - if (sscanf(t+10, "%*15s %i %*i", - &start_priority) != 1) { + if (sscanf(t+10, "%15s %i %*i", + runlevels, + &start_priority) != 2) { log_warning("[%s:%u] Failed to parse chkconfig line. Ignoring.", path, line); continue; } - if (start_priority < 0 || start_priority > 99) { + if (start_priority < 0 || start_priority > 99) log_warning("[%s:%u] Start priority out of range. Ignoring.", path, line); - continue; + else + s->sysv_start_priority = start_priority; + + char_array_0(runlevels); + k = delete_chars(runlevels, WHITESPACE "-"); + + if (k[0]) { + char *d; + + if (!(d = strdup(k))) { + r = -ENOMEM; + goto finish; + } + + free(s->sysv_runlevels); + s->sysv_runlevels = d; } - s->sysv_start_priority = start_priority; } else if (startswith(t, "description:")) { @@ -370,7 +468,13 @@ static int service_load_sysv_path(Service *s, const char *path) { if (r == 0) continue; - r = unit_add_name(u, m); + if (unit_name_to_type(m) == UNIT_SERVICE) + r = unit_add_name(u, m); + else { + if ((r = unit_add_dependency_by_name_inverse(u, UNIT_REQUIRES, m)) >= 0) + r = unit_add_dependency_by_name(u, UNIT_BEFORE, m); + } + free(m); if (r < 0) @@ -401,20 +505,28 @@ static int service_load_sysv_path(Service *s, const char *path) { if (r == 0) continue; - if (!(r = unit_add_dependency_by_name(u, UNIT_AFTER, m)) < 0) { - free(m); - goto finish; - } - - r = unit_add_dependency_by_name( - u, - startswith(t, "Required-Start:") ? UNIT_REQUIRES : UNIT_WANTS, - m); + r = unit_add_dependency_by_name(u, UNIT_AFTER, m); free(m); if (r < 0) goto finish; } + } else if (startswith(t, "Default-Start:")) { + char *k, *d; + + state = LSB; + + k = delete_chars(t+14, WHITESPACE "-"); + + if (k[0] != 0) { + if (!(d = strdup(k))) { + r = -ENOMEM; + goto finish; + } + + free(s->sysv_runlevels); + s->sysv_runlevels = d; + } } else if (startswith(t, "Description:")) { char *d; @@ -429,7 +541,8 @@ static int service_load_sysv_path(Service *s, const char *path) { free(u->meta.description); u->meta.description = d; - } else if (startswith(t, "Short-Description:") && !u->meta.description) { + } else if (startswith(t, "Short-Description:") && + !u->meta.description) { char *d; /* We use the short description only @@ -442,7 +555,6 @@ static int service_load_sysv_path(Service *s, const char *path) { goto finish; } - free(u->meta.description); u->meta.description = d; } else if (state == LSB_DESCRIPTION) { @@ -464,18 +576,38 @@ static int service_load_sysv_path(Service *s, const char *path) { } } - /* If the init script has no LSB header, then let's - * enforce the ordering via the chkconfig - * priorities */ + /* If init scripts have no LSB header, then we enforce the + * ordering via the chkconfig priorities. We try to determine + * a priority for *all* init scripts here, since they are + * needed as soon as at least one non-LSB script is used. */ - if (!has_lsb) - if ((r = sysv_chkconfig_order(s)) < 0) + if (s->sysv_start_priority < 0) { + log_debug("%s has no chkconfig header, trying to determine SysV priority from link farm.", unit_id(u)); + + if ((r = priority_from_rcd(s, file_name_from_path(path))) < 0) goto finish; + if (s->sysv_start_priority < 0) + log_warning("%s has neither a chkconfig header nor a directory link, cannot order unit!", unit_id(u)); + } + if ((r = sysv_exec_commands(s)) < 0) goto finish; - r = 1; + if (!s->sysv_runlevels || chars_intersect("12345", s->sysv_runlevels)) { + /* If there a runlevels configured for this service + * but none of the standard ones, then we assume this + * is some special kind of service (which might be + * needed for early boot) and don't create any links + * to it. */ + + if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_TARGET)) < 0 || + (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_TARGET)) < 0) + goto finish; + } + + u->meta.load_state = UNIT_LOADED; + r = 0; finish: @@ -504,8 +636,11 @@ static int service_load_sysv_name(Service *s, const char *name) { r = service_load_sysv_path(s, path); free(path); - if (r >= 0) + if (r < 0) return r; + + if ((UNIT(s)->meta.load_state != UNIT_STUB)) + break; } return 0; @@ -525,24 +660,29 @@ static int service_load_sysv(Service *s) { return 0; if ((t = unit_id(UNIT(s)))) - if ((r = service_load_sysv_name(s, t)) != 0) + if ((r = service_load_sysv_name(s, t)) < 0) return r; - SET_FOREACH(t, UNIT(s)->meta.names, i) - if ((r == service_load_sysv_name(s, t)) != 0) - return r; + if (UNIT(s)->meta.load_state == UNIT_STUB) + SET_FOREACH(t, UNIT(s)->meta.names, i) { + if (t == unit_id(UNIT(s))) + continue; + + if ((r == service_load_sysv_name(s, t)) < 0) + return r; + + if (UNIT(s)->meta.load_state != UNIT_STUB) + break; + } return 0; } -static int service_init(Unit *u) { - int r; +static void service_init(Unit *u) { Service *s = SERVICE(u); - assert(s); - - /* First, reset everything to the defaults, in case this is a - * reload */ + assert(u); + assert(u->meta.load_state == UNIT_STUB); s->type = 0; s->restart = 0; @@ -559,32 +699,50 @@ static int service_init(Unit *u) { s->sysv_start_priority = -1; s->permissions_start_only = false; s->root_directory_start_only = false; + s->valid_no_process = false; + s->kill_mode = 0; + s->sysv_has_lsb = false; + s->main_pid = s->control_pid = 0; + s->main_pid_known = false; + s->failure = false; RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5); +} + +static int service_load(Unit *u) { + int r; + Service *s = SERVICE(u); + + assert(s); /* Load a .service file */ - if ((r = unit_load_fragment(u)) < 0) { - service_done(u); + if ((r = unit_load_fragment(u)) < 0) return r; - } - /* Load a classic init script as a fallback, if we couldn*t find anything */ - if (r == 0) - if ((r = service_load_sysv(s)) <= 0) { - service_done(u); - return r < 0 ? r : -ENOENT; - } + /* Load a classic init script as a fallback, if we couldn't find anything */ + if (u->meta.load_state == UNIT_STUB) + if ((r = service_load_sysv(s)) < 0) + return r; - /* Load dropin directory data */ - if ((r = unit_load_dropin(u)) < 0) { - service_done(u); - return r; - } + /* Still nothing found? Then let's give up */ + if (u->meta.load_state == UNIT_STUB) + return -ENOENT; - /* Add default cgroup */ - if ((r = unit_add_default_cgroup(u)) < 0) { - service_done(u); + /* We were able to load something, then let's add in the + * dropin directories. */ + if ((r = unit_load_dropin(unit_follow_merge(u))) < 0) return r; + + /* This is a new unit? Then let's add in some extras */ + if (u->meta.load_state == UNIT_LOADED) { + if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0) + return r; + + if ((r = unit_add_default_cgroup(u)) < 0) + return r; + + if ((r = sysv_chkconfig_order(s)) < 0) + return r; } return 0; @@ -606,21 +764,34 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sService State: %s\n" "%sPermissionsStartOnly: %s\n" "%sRootDirectoryStartOnly: %s\n" - "%sValidNoProcess: %s\n", + "%sValidNoProcess: %s\n" + "%sKillMode: %s\n" + "%sType: %s\n", prefix, service_state_to_string(s->state), prefix, yes_no(s->permissions_start_only), prefix, yes_no(s->root_directory_start_only), - prefix, yes_no(s->valid_no_process)); + prefix, yes_no(s->valid_no_process), + prefix, kill_mode_to_string(s->kill_mode), + prefix, service_type_to_string(s->type)); + + if (s->control_pid > 0) + fprintf(f, + "%sControl PID: %llu\n", + prefix, (unsigned long long) s->control_pid); + + if (s->main_pid > 0) + fprintf(f, + "%sMain PID: %llu\n", + prefix, (unsigned long long) s->main_pid); if (s->pid_file) fprintf(f, "%sPIDFile: %s\n", prefix, s->pid_file); - exec_context_dump(&s->exec_context, f, prefix); - for (c = 0; c < _SERVICE_EXEC_MAX; c++) { + for (c = 0; c < _SERVICE_EXEC_COMMAND_MAX; c++) { if (!s->exec_command[c]) continue; @@ -633,14 +804,20 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { if (s->sysv_path) fprintf(f, - "%sSysV Init Script Path: %s\n", - prefix, s->sysv_path); + "%sSysV Init Script Path: %s\n" + "%sSysV Init Script has LSB Header: %s\n", + prefix, s->sysv_path, + prefix, yes_no(s->sysv_has_lsb)); if (s->sysv_start_priority >= 0) fprintf(f, - "%sSysV Start Priority: %i\n", + "%sSysVStartPriority: %i\n", prefix, s->sysv_start_priority); + if (s->sysv_runlevels) + fprintf(f, "%sSysVRunLevels: %s\n", + prefix, s->sysv_runlevels); + free(p2); } @@ -668,7 +845,17 @@ static int service_load_pid_file(Service *s) { if ((unsigned long) (pid_t) p != p) return -ERANGE; - s->main_pid = p; + if (kill((pid_t) p, 0) < 0 && errno != EPERM) { + log_warning("PID %llu read from file %s does not exist. Your service or init script might be broken.", + (unsigned long long) p, s->pid_file); + return -ESRCH; + } + + if ((r = unit_watch_pid(UNIT(s), (pid_t) p)) < 0) + /* FIXME: we need to do something here */ + return r; + + s->main_pid = (pid_t) p; s->main_pid_known = true; return 0; @@ -720,7 +907,7 @@ fail: } -static int service_notify_sockets(Service *s) { +static int service_notify_sockets_dead(Service *s) { Iterator i; Set *set; Socket *sock; @@ -782,19 +969,14 @@ static void service_set_state(Service *s, ServiceState state) { state != SERVICE_STOP_SIGKILL && state != SERVICE_STOP_POST && state != SERVICE_FINAL_SIGTERM && - state != SERVICE_FINAL_SIGKILL) + state != SERVICE_FINAL_SIGKILL) { if (s->control_pid > 0) { unit_unwatch_pid(UNIT(s), s->control_pid); s->control_pid = 0; } - if (state != SERVICE_START_PRE && - state != SERVICE_START && - state != SERVICE_START_POST && - state != SERVICE_RELOAD && - state != SERVICE_STOP && - state != SERVICE_STOP_POST) s->control_command = NULL; + } if (state == SERVICE_DEAD || state == SERVICE_STOP || @@ -805,9 +987,10 @@ static void service_set_state(Service *s, ServiceState state) { state == SERVICE_FINAL_SIGKILL || state == SERVICE_MAINTAINANCE || state == SERVICE_AUTO_RESTART) - service_notify_sockets(s); + service_notify_sockets_dead(s); - log_debug("%s changed %s → %s", unit_id(UNIT(s)), service_state_to_string(old_state), service_state_to_string(state)); + if (old_state != state) + log_debug("%s changed %s → %s", unit_id(UNIT(s)), service_state_to_string(old_state), service_state_to_string(state)); unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]); } @@ -999,23 +1182,34 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? SIGTERM : SIGKILL; - r = 0; - if (s->main_pid > 0) { - if (kill(s->main_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else - sent = true; - } + if (s->kill_mode == KILL_CONTROL_GROUP) { - if (s->control_pid > 0) { - if (kill(s->control_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else + if ((r = cgroup_bonding_kill_list(UNIT(s)->meta.cgroup_bondings, sig)) < 0) { + if (r != -EAGAIN && r != -ESRCH) + goto fail; + } else sent = true; } - if (r < 0) - goto fail; + if (!sent) { + r = 0; + if (s->main_pid > 0) { + if (kill(s->kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) + r = -errno; + else + sent = true; + } + + if (s->control_pid > 0) { + if (kill(s->kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) + r = -errno; + else + sent = true; + } + + if (r < 0) + goto fail; + } } service_set_state(s, state); @@ -1291,12 +1485,22 @@ static int service_stop(Unit *u) { assert(s); + /* Cannot do this now */ if (s->state == SERVICE_START_PRE || s->state == SERVICE_START || s->state == SERVICE_START_POST || s->state == SERVICE_RELOAD) return -EAGAIN; + /* Already on it */ + if (s->state == SERVICE_STOP || + s->state == SERVICE_STOP_SIGTERM || + s->state == SERVICE_STOP_SIGKILL || + s->state == SERVICE_STOP_POST || + s->state == SERVICE_FINAL_SIGTERM || + s->state == SERVICE_FINAL_SIGKILL) + return 0; + if (s->state == SERVICE_AUTO_RESTART) { service_set_state(s, SERVICE_DEAD); return 0; @@ -1383,7 +1587,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status; } - log_debug("%s: main process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status); + log_debug("%s: main process exited, code=%s, status=%i", unit_id(u), sigchld_code_to_string(code), status); /* The service exited, so the service is officially * gone. */ @@ -1436,7 +1640,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { * don't care about failing commands. */ if (s->control_command->command_next && - (success || (s->state == SERVICE_EXEC_STOP || s->state == SERVICE_EXEC_STOP_POST))) + (success || (s->state == SERVICE_STOP || s->state == SERVICE_STOP_POST))) /* There is another command to * * execute, so let's do that. */ @@ -1626,17 +1830,6 @@ static void service_cgroup_notify_event(Unit *u) { } static int service_enumerate(Manager *m) { - - static const char * const rcnd[] = { - "../rc0.d", SPECIAL_RUNLEVEL0_TARGET, - "../rc1.d", SPECIAL_RUNLEVEL1_TARGET, - "../rc2.d", SPECIAL_RUNLEVEL2_TARGET, - "../rc3.d", SPECIAL_RUNLEVEL3_TARGET, - "../rc4.d", SPECIAL_RUNLEVEL4_TARGET, - "../rc5.d", SPECIAL_RUNLEVEL5_TARGET, - "../rc6.d", SPECIAL_RUNLEVEL6_TARGET - }; - char **p; unsigned i; DIR *d = NULL; @@ -1645,13 +1838,13 @@ static int service_enumerate(Manager *m) { assert(m); - STRV_FOREACH(p, m->sysvinit_path) - for (i = 0; i < ELEMENTSOF(rcnd); i += 2) { + STRV_FOREACH(p, m->sysvrcnd_path) + for (i = 0; i < ELEMENTSOF(rcnd_table); i += 2) { struct dirent *de; free(path); path = NULL; - if (asprintf(&path, "%s/%s", *p, rcnd[i]) < 0) { + if (asprintf(&path, "%s/%s", *p, rcnd_table[i]) < 0) { r = -ENOMEM; goto finish; } @@ -1680,7 +1873,7 @@ static int service_enumerate(Manager *m) { free(fpath); fpath = NULL; - if (asprintf(&fpath, "%s/%s/%s", *p, rcnd[i], de->d_name) < 0) { + if (asprintf(&fpath, "%s/%s/%s", *p, rcnd_table[i], de->d_name) < 0) { r = -ENOMEM; goto finish; } @@ -1703,7 +1896,7 @@ static int service_enumerate(Manager *m) { if ((r = manager_load_unit(m, name, &service)) < 0) goto finish; - if ((r = manager_load_unit(m, rcnd[i+1], &runlevel)) < 0) + if ((r = manager_load_unit(m, rcnd_table[i+1], &runlevel)) < 0) goto finish; if (de->d_name[0] == 'S') { @@ -1712,7 +1905,18 @@ static int service_enumerate(Manager *m) { if ((r = unit_add_dependency(runlevel, UNIT_AFTER, service)) < 0) goto finish; - } else { + + } else if (de->d_name[0] == 'K' && + (streq(rcnd_table[i+1], SPECIAL_RUNLEVEL0_TARGET) || + streq(rcnd_table[i+1], SPECIAL_RUNLEVEL6_TARGET))) { + + /* We honour K links only for + * halt/reboot. For the normal + * runlevels we assume the + * stop jobs will be + * implicitly added by the + * core logic. */ + if ((r = unit_add_dependency(runlevel, UNIT_CONFLICTS, service)) < 0) goto finish; @@ -1768,7 +1972,7 @@ static const char* const service_type_table[_SERVICE_TYPE_MAX] = { DEFINE_STRING_TABLE_LOOKUP(service_type, ServiceType); -static const char* const service_exec_command_table[_SERVICE_EXEC_MAX] = { +static const char* const service_exec_command_table[_SERVICE_EXEC_COMMAND_MAX] = { [SERVICE_EXEC_START_PRE] = "ExecStartPre", [SERVICE_EXEC_START] = "ExecStart", [SERVICE_EXEC_START_POST] = "ExecStartPost", @@ -1783,6 +1987,7 @@ const UnitVTable service_vtable = { .suffix = ".service", .init = service_init, + .load = service_load, .done = service_done, .dump = service_dump,