From: Matthew Miller Date: Mon, 30 Aug 2010 22:17:56 +0000 (+0200) Subject: manager: rename 'maintenance' state to 'failed' to avoid user confusion X-Git-Tag: v9~28 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=74ac3cbd509de2f5995542aa5db39328e8cbd22a manager: rename 'maintenance' state to 'failed' to avoid user confusion https://bugzilla.redhat.com/show_bug.cgi?id=614619 --- diff --git a/fixme b/fixme index f68de38cb..f244b5cb8 100644 --- a/fixme +++ b/fixme @@ -50,7 +50,7 @@ * io priority during initialization -* if a service fails too often, make the service enter maintenance mode, and the socket, too. +* if a service fails too often, make the service enter failed mode, and the socket, too. * systemctl: warning wenn [Install] leer ist bei enable diff --git a/man/systemctl.xml b/man/systemctl.xml index 6af8e61d0..466d990db 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -399,18 +399,19 @@ - reset-maintenance [NAME...] - - Reset maintenance - state of the specified units, or if no - unit name is passed of all units. When - a unit fails in some way (i.e. process - exiting with non-zero error code, - terminating abnormally or timing out) - it will automatically enter - maintenance state and its exit codes - and status is recorded for - introspection by the administrator + reset-failed [NAME...] + + Reset the + 'failed' state of the + specified units, or if no unit name is + passed of all units. When a unit fails + in some way (i.e. process exiting with + non-zero error code, terminating + abnormally or timing out) it will + automatically enter the + 'failed' state and + its exit code and status is recorded + for introspection by the administrator until the service is restarted or reset with this command. diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 250989fe0..3bc5d3c66 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -418,8 +418,9 @@ Lists one or more units that are activated when this - unit fails (i.e. enters maintenance - state). + unit enters the + 'failed' + state. @@ -552,22 +553,23 @@ time. If this time limit is reached the job will be cancelled, the unit however will not change state or even - enter maintenance mode. This value - defaults to 0 (job timeouts disabled), - except for device units. NB: this - timeout is independent from any - unit-specific timeout (for example, - the timeout set with + enter the 'failed' + mode. This value defaults to 0 (job + timeouts disabled), except for device + units. NB: this timeout is independent + from any unit-specific timeout (for + example, the timeout set with Timeout= in service - units) as the job timeout has no effect - on the unit itself, only on the job - that might be pending for it. Or in - other words: unit-specific timeouts + units) as the job timeout has no + effect on the unit itself, only on the + job that might be pending for it. Or + in other words: unit-specific timeouts are useful to abort unit state changes, and revert them. The job timeout set with this option however - is useful to abort only the job waiting - for the unit state to change. + is useful to abort only the job + waiting for the unit state to + change. diff --git a/man/systemd.xml b/man/systemd.xml index edd824d31..428e17f63 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -256,7 +256,7 @@ as well as in the process of being activated or deactivated, i.e. between the two states (these states are called 'activating', 'deactivating'). A special - 'maintenance' state is available as well which is very + 'failed' state is available as well which is very similar to 'inactive' and is entered when the service failed in some way (process returned error code on exit, or crashed, or an operation timed out). If this diff --git a/src/automount.c b/src/automount.c index b32e0027c..414816b64 100644 --- a/src/automount.c +++ b/src/automount.c @@ -43,7 +43,7 @@ static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = { [AUTOMOUNT_DEAD] = UNIT_INACTIVE, [AUTOMOUNT_WAITING] = UNIT_ACTIVE, [AUTOMOUNT_RUNNING] = UNIT_ACTIVE, - [AUTOMOUNT_MAINTENANCE] = UNIT_MAINTENANCE + [AUTOMOUNT_FAILED] = UNIT_FAILED }; static int open_dev_autofs(Manager *m); @@ -294,7 +294,7 @@ static void automount_enter_dead(Automount *a, bool success) { if (!success) a->failure = true; - automount_set_state(a, a->failure ? AUTOMOUNT_MAINTENANCE : AUTOMOUNT_DEAD); + automount_set_state(a, a->failure ? AUTOMOUNT_FAILED : AUTOMOUNT_DEAD); } static int open_dev_autofs(Manager *m) { @@ -606,7 +606,7 @@ static int automount_start(Unit *u) { assert(a); - assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_MAINTENANCE); + assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED); if (path_is_mount_point(a->where)) { log_error("Path %s is already a mount point, refusing start for %s", a->where, u->meta.id); @@ -794,12 +794,12 @@ static void automount_shutdown(Manager *m) { close_nointr_nofail(m->dev_autofs_fd); } -static void automount_reset_maintenance(Unit *u) { +static void automount_reset_failed(Unit *u) { Automount *a = AUTOMOUNT(u); assert(a); - if (a->state == AUTOMOUNT_MAINTENANCE) + if (a->state == AUTOMOUNT_FAILED) automount_set_state(a, AUTOMOUNT_DEAD); a->failure = false; @@ -809,7 +809,7 @@ static const char* const automount_state_table[_AUTOMOUNT_STATE_MAX] = { [AUTOMOUNT_DEAD] = "dead", [AUTOMOUNT_WAITING] = "waiting", [AUTOMOUNT_RUNNING] = "running", - [AUTOMOUNT_MAINTENANCE] = "maintenance" + [AUTOMOUNT_FAILED] = "failed" }; DEFINE_STRING_TABLE_LOOKUP(automount_state, AutomountState); @@ -841,7 +841,7 @@ const UnitVTable automount_vtable = { .fd_event = automount_fd_event, - .reset_maintenance = automount_reset_maintenance, + .reset_failed = automount_reset_failed, .bus_interface = "org.freedesktop.systemd1.Automount", .bus_message_handler = bus_automount_message_handler, diff --git a/src/automount.h b/src/automount.h index 9786222d1..1a6cc98fd 100644 --- a/src/automount.h +++ b/src/automount.h @@ -30,7 +30,7 @@ typedef enum AutomountState { AUTOMOUNT_DEAD, AUTOMOUNT_WAITING, AUTOMOUNT_RUNNING, - AUTOMOUNT_MAINTENANCE, + AUTOMOUNT_FAILED, _AUTOMOUNT_STATE_MAX, _AUTOMOUNT_STATE_INVALID = -1 } AutomountState;