X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=a3ff85c86e3237da1a90a0dbf4b36209b257a9cb;hp=822c7ccfee43d3231db758374f6528fbed29ee22;hb=3d94f76c99da13e5603831d0b278f8c8c21bcb02;hpb=e66cf1a3f94fff48a572f6dbd19b43c9bcf7b8c7 diff --git a/src/core/manager.c b/src/core/manager.c index 822c7ccfe..a3ff85c86 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -84,9 +84,6 @@ #define JOBS_IN_PROGRESS_PERIOD_USEC (USEC_PER_SEC / 3) #define JOBS_IN_PROGRESS_PERIOD_DIVISOR 3 -/* Where clients shall send notification messages to */ -#define NOTIFY_SOCKET "@/org/freedesktop/systemd1/notify" - #define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1) static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata); @@ -105,7 +102,12 @@ static int manager_watch_jobs_in_progress(Manager *m) { return 0; next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC; - return sd_event_add_monotonic(m->event, &m->jobs_in_progress_event_source, next, 0, manager_dispatch_jobs_in_progress, m); + return sd_event_add_time( + m->event, + &m->jobs_in_progress_event_source, + CLOCK_MONOTONIC, + next, 0, + manager_dispatch_jobs_in_progress, m); } #define CYLON_BUFFER_EXTRA (2*(sizeof(ANSI_RED_ON)-1) + sizeof(ANSI_HIGHLIGHT_RED_ON)-1 + 2*(sizeof(ANSI_HIGHLIGHT_OFF)-1)) @@ -140,6 +142,8 @@ static void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned po } void manager_flip_auto_status(Manager *m, bool enable) { + assert(m); + if (enable) { if (m->show_status == SHOW_STATUS_AUTO) manager_set_show_status(m, SHOW_STATUS_TEMPORARY); @@ -221,8 +225,8 @@ static int manager_watch_idle_pipe(Manager *m) { static void manager_close_idle_pipe(Manager *m) { assert(m); - close_pipe(m->idle_pipe); - close_pipe(m->idle_pipe + 2); + safe_close_pair(m->idle_pipe); + safe_close_pair(m->idle_pipe + 2); } static int manager_setup_time_change(Manager *m) { @@ -248,8 +252,7 @@ static int manager_setup_time_change(Manager *m) { if (timerfd_settime(m->time_change_fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0) { log_debug("Failed to set up TFD_TIMER_CANCEL_ON_SET, ignoring: %m"); - close_nointr_nofail(m->time_change_fd); - m->time_change_fd = -1; + m->time_change_fd = safe_close(m->time_change_fd); return 0; } @@ -451,6 +454,10 @@ int manager_new(SystemdRunningAs running_as, Manager **_m) { if (r < 0) goto fail; + r = set_ensure_allocated(&m->failed_units, trivial_hash_func, trivial_compare_func); + if (r < 0) + goto fail; + r = sd_event_default(&m->event); if (r < 0) goto fail; @@ -500,16 +507,17 @@ fail: } static int manager_setup_notify(Manager *m) { - union { - struct sockaddr sa; - struct sockaddr_un un; - } sa = { - .sa.sa_family = AF_UNIX, - }; - int one = 1, r; + int r; if (m->notify_fd < 0) { _cleanup_close_ int fd = -1; + union { + struct sockaddr sa; + struct sockaddr_un un; + } sa = { + .sa.sa_family = AF_UNIX, + }; + int one = 1; /* First free all secondary fields */ free(m->notify_socket); @@ -522,13 +530,24 @@ static int manager_setup_notify(Manager *m) { return -errno; } - if (getpid() != 1 || detect_container(NULL) > 0) - snprintf(sa.un.sun_path, sizeof(sa.un.sun_path), NOTIFY_SOCKET "/%" PRIx64, random_u64()); - else - strncpy(sa.un.sun_path, NOTIFY_SOCKET, sizeof(sa.un.sun_path)); - sa.un.sun_path[0] = 0; + if (m->running_as == SYSTEMD_SYSTEM) + m->notify_socket = strdup("/run/systemd/notify"); + else { + const char *e; + + e = getenv("XDG_RUNTIME_DIR"); + if (!e) { + log_error("XDG_RUNTIME_DIR is not set: %m"); + return -EINVAL; + } - r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)); + m->notify_socket = strappend(e, "/systemd/notify"); + } + if (!m->notify_socket) + return log_oom(); + + strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1); + r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); if (r < 0) { log_error("bind() failed: %m"); return -errno; @@ -540,11 +559,6 @@ static int manager_setup_notify(Manager *m) { return -errno; } - sa.un.sun_path[0] = '@'; - m->notify_socket = strdup(sa.un.sun_path); - if (!m->notify_socket) - return log_oom(); - m->notify_fd = fd; fd = -1; @@ -778,6 +792,8 @@ void manager_free(Manager *m) { hashmap_free(m->watch_pids2); hashmap_free(m->watch_bus); + set_free(m->failed_units); + sd_event_source_unref(m->signal_event_source); sd_event_source_unref(m->notify_event_source); sd_event_source_unref(m->time_change_event_source); @@ -785,14 +801,10 @@ void manager_free(Manager *m) { sd_event_source_unref(m->idle_pipe_event_source); sd_event_source_unref(m->run_queue_event_source); - if (m->signal_fd >= 0) - close_nointr_nofail(m->signal_fd); - if (m->notify_fd >= 0) - close_nointr_nofail(m->notify_fd); - if (m->time_change_fd >= 0) - close_nointr_nofail(m->time_change_fd); - if (m->kdbus_fd >= 0) - close_nointr_nofail(m->kdbus_fd); + safe_close(m->signal_fd); + safe_close(m->notify_fd); + safe_close(m->time_change_fd); + safe_close(m->kdbus_fd); manager_close_idle_pipe(m); @@ -810,7 +822,7 @@ void manager_free(Manager *m) { free(m->switch_root); free(m->switch_root_init); - for (i = 0; i < RLIMIT_NLIMITS; i++) + for (i = 0; i < _RLIMIT_MAX; i++) free(m->rlimit[i]); assert(hashmap_isempty(m->units_requiring_mounts_for)); @@ -1621,6 +1633,11 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t break; } + if (fflush(f)) { + log_warning("Failed to flush status stream"); + break; + } + log_dump(LOG_INFO, dump); break; } @@ -1743,9 +1760,7 @@ static int manager_dispatch_time_change_fd(sd_event_source *source, int fd, uint /* Restart the watch */ m->time_change_event_source = sd_event_source_unref(m->time_change_event_source); - - close_nointr_nofail(m->time_change_fd); - m->time_change_fd = -1; + m->time_change_fd = safe_close(m->time_change_fd); manager_setup_time_change(m); @@ -1794,7 +1809,7 @@ int manager_loop(Manager *m) { RATELIMIT_DEFINE(rl, 1*USEC_PER_SEC, 50000); assert(m); - m->exit_code = MANAGER_RUNNING; + m->exit_code = MANAGER_OK; /* Release the path cache */ set_free_free(m->unit_path_cache); @@ -1808,7 +1823,7 @@ int manager_loop(Manager *m) { if (r < 0) return r; - while (m->exit_code == MANAGER_RUNNING) { + while (m->exit_code == MANAGER_OK) { usec_t wait_usec; if (m->runtime_watchdog > 0 && m->running_as == SYSTEMD_SYSTEM) @@ -2029,7 +2044,7 @@ int manager_open_serialization(Manager *m, FILE **_f) { f = fdopen(fd, "w+"); if (!f) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; } @@ -2250,11 +2265,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { if (safe_atoi(l + 10, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd)) log_debug("Failed to parse notify fd: %s", l + 10); else { - if (m->notify_fd >= 0) { - m->notify_event_source = sd_event_source_unref(m->notify_event_source); - close_nointr_nofail(m->notify_fd); - } - + m->notify_event_source = sd_event_source_unref(m->notify_event_source); + safe_close(m->notify_fd); m->notify_fd = fdset_remove(fds, fd); } @@ -2276,9 +2288,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { if (safe_atoi(l + 9, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd)) log_debug("Failed to parse kdbus fd: %s", l + 9); else { - if (m->kdbus_fd >= 0) - close_nointr_nofail(m->kdbus_fd); - + safe_close(m->kdbus_fd); m->kdbus_fd = fdset_remove(fds, fd); } @@ -2401,23 +2411,6 @@ int manager_reload(Manager *m) { return r; } -static bool manager_is_booting_or_shutting_down(Manager *m) { - Unit *u; - - assert(m); - - /* Is the initial job still around? */ - if (manager_get_job(m, m->default_unit_job_id)) - return true; - - /* Is there a job for the shutdown target? */ - u = manager_get_unit(m, SPECIAL_SHUTDOWN_TARGET); - if (u) - return !!u->job; - - return false; -} - bool manager_is_reloading_or_reexecuting(Manager *m) { assert(m); @@ -2458,10 +2451,12 @@ void manager_check_finished(Manager *m) { m->jobs_in_progress_event_source = sd_event_source_unref(m->jobs_in_progress_event_source); if (hashmap_size(m->jobs) > 0) { + if (m->jobs_in_progress_event_source) { - uint64_t next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC; - sd_event_source_set_time(m->jobs_in_progress_event_source, next); + sd_event_source_set_time(m->jobs_in_progress_event_source, + now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC); } + return; } @@ -2657,7 +2652,7 @@ void manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) - execute_directory(generator_path, d, (char**) argv); + execute_directory(generator_path, d, DEFAULT_TIMEOUT_USEC, (char**) argv); finish: trim_generator_dir(m, &m->generator_unit_path); @@ -2728,7 +2723,7 @@ int manager_set_default_rlimits(Manager *m, struct rlimit **default_rlimit) { assert(m); - for (i = 0; i < RLIMIT_NLIMITS; i++) { + for (i = 0; i < _RLIMIT_MAX; i++) { if (!default_rlimit[i]) continue; @@ -2789,6 +2784,9 @@ static bool manager_get_show_status(Manager *m) { if (m->no_console_output) return false; + if (!IN_SET(manager_state(m), MANAGER_STARTING, MANAGER_STOPPING)) + return false; + if (m->show_status > 0) return true; @@ -2809,9 +2807,6 @@ void manager_status_printf(Manager *m, bool ephemeral, const char *status, const if (ephemeral && m->n_on_console > 0) return; - if (!manager_is_booting_or_shutting_down(m)) - return; - va_start(ap, format); status_vprintf(status, true, ephemeral, format, ap); va_end(ap); @@ -2853,8 +2848,51 @@ Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path) { } const char *manager_get_runtime_prefix(Manager *m) { + assert(m); return m->running_as == SYSTEMD_SYSTEM ? "/run" : getenv("XDG_RUNTIME_DIR"); } + +ManagerState manager_state(Manager *m) { + Unit *u; + + assert(m); + + /* Did we ever finish booting? If not then we are still starting up */ + if (!dual_timestamp_is_set(&m->finish_timestamp)) + return MANAGER_STARTING; + + /* Is the special shutdown target queued? If so, we are in shutdown state */ + u = manager_get_unit(m, SPECIAL_SHUTDOWN_TARGET); + if (u && u->job && IN_SET(u->job->type, JOB_START, JOB_RESTART, JOB_TRY_RESTART, JOB_RELOAD_OR_START)) + return MANAGER_STOPPING; + + /* Are the rescue or emergency targets active or queued? If so we are in maintenance state */ + u = manager_get_unit(m, SPECIAL_RESCUE_TARGET); + if (u && (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)) || + (u->job && IN_SET(u->job->type, JOB_START, JOB_RESTART, JOB_TRY_RESTART, JOB_RELOAD_OR_START)))) + return MANAGER_MAINTENANCE; + + u = manager_get_unit(m, SPECIAL_EMERGENCY_TARGET); + if (u && (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)) || + (u->job && IN_SET(u->job->type, JOB_START, JOB_RESTART, JOB_TRY_RESTART, JOB_RELOAD_OR_START)))) + return MANAGER_MAINTENANCE; + + /* Are there any failed units? If so, we are in degraded mode */ + if (set_size(m->failed_units) > 0) + return MANAGER_DEGRADED; + + return MANAGER_RUNNING; +} + +static const char *const manager_state_table[_MANAGER_STATE_MAX] = { + [MANAGER_STARTING] = "starting", + [MANAGER_RUNNING] = "running", + [MANAGER_DEGRADED] = "degraded", + [MANAGER_MAINTENANCE] = "maintenance", + [MANAGER_STOPPING] = "stopping", +}; + +DEFINE_STRING_TABLE_LOOKUP(manager_state, ManagerState);