X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fsnapshot.c;h=b1d8448771d9fe6ef290448bc44ef4fb3456f28d;hb=f5b51ea7fcb0b6380c3ceb4d4f3f22f647c6fd32;hp=5c2a319cb6a6c6aa98de790d19c94a8ba1dd5993;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git diff --git a/src/core/snapshot.c b/src/core/snapshot.c index 5c2a319cb..b1d844877 100644 --- a/src/core/snapshot.c +++ b/src/core/snapshot.c @@ -25,7 +25,7 @@ #include "snapshot.h" #include "unit-name.h" #include "dbus-snapshot.h" -#include "bus-errors.h" +#include "bus-common-errors.h" static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = { [SNAPSHOT_DEAD] = UNIT_INACTIVE, @@ -40,6 +40,7 @@ static void snapshot_init(Unit *u) { UNIT(s)->ignore_on_isolate = true; UNIT(s)->ignore_on_snapshot = true; + UNIT(s)->allow_isolate = true; } static void snapshot_set_state(Snapshot *s, SnapshotState state) { @@ -50,10 +51,11 @@ static void snapshot_set_state(Snapshot *s, SnapshotState state) { s->state = state; if (state != old_state) - log_debug("%s changed %s -> %s", - UNIT(s)->id, - snapshot_state_to_string(old_state), - snapshot_state_to_string(state)); + log_unit_debug(UNIT(s)->id, + "%s changed %s -> %s", + UNIT(s)->id, + snapshot_state_to_string(old_state), + snapshot_state_to_string(state)); unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true); } @@ -66,14 +68,14 @@ static int snapshot_load(Unit *u) { /* Make sure that only snapshots created via snapshot_create() * can be loaded */ - if (!s->by_snapshot_create && UNIT(s)->manager->n_reloading <= 0) + if (!u->transient && UNIT(s)->manager->n_reloading <= 0) return -ENOENT; u->load_state = UNIT_LOADED; return 0; } -static int snapshot_coldplug(Unit *u) { +static int snapshot_coldplug(Unit *u, Hashmap *deferred_work) { Snapshot *s = SNAPSHOT(u); assert(s); @@ -109,7 +111,7 @@ static int snapshot_start(Unit *u) { if (s->cleanup) unit_add_to_cleanup_queue(u); - return 0; + return 1; } static int snapshot_stop(Unit *u) { @@ -119,7 +121,7 @@ static int snapshot_stop(Unit *u) { assert(s->state == SNAPSHOT_ACTIVE); snapshot_set_state(s, SNAPSHOT_DEAD); - return 0; + return 1; } static int snapshot_serialize(Unit *u, FILE *f, FDSet *fds) { @@ -151,44 +153,47 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value if (streq(key, "state")) { SnapshotState state; - if ((state = snapshot_state_from_string(value)) < 0) - log_debug("Failed to parse state value %s", value); + state = snapshot_state_from_string(value); + if (state < 0) + log_unit_debug(u->id, "Failed to parse state value %s", value); else s->deserialized_state = state; } else if (streq(key, "cleanup")) { - if ((r = parse_boolean(value)) < 0) - log_debug("Failed to parse cleanup value %s", value); + r = parse_boolean(value); + if (r < 0) + log_unit_debug(u->id, "Failed to parse cleanup value %s", value); else s->cleanup = r; } else if (streq(key, "wants")) { - if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, value, NULL, true)) < 0) + r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, value, NULL, true); + if (r < 0) return r; } else - log_debug("Unknown serialization key '%s'", key); + log_unit_debug(u->id, "Unknown serialization key '%s'", key); return 0; } -static UnitActiveState snapshot_active_state(Unit *u) { +_pure_ static UnitActiveState snapshot_active_state(Unit *u) { assert(u); return state_translation_table[SNAPSHOT(u)->state]; } -static const char *snapshot_sub_state_to_string(Unit *u) { +_pure_ static const char *snapshot_sub_state_to_string(Unit *u) { assert(u); return snapshot_state_to_string(SNAPSHOT(u)->state); } -int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Snapshot **_s) { - Iterator i; +int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e, Snapshot **_s) { + _cleanup_free_ char *n = NULL; Unit *other, *u = NULL; - char *n = NULL; + Iterator i; int r; const char *k; @@ -196,20 +201,14 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn assert(_s); if (name) { - if (!unit_name_is_valid(name, false)) { - dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name); - return -EINVAL; - } + if (!unit_name_is_valid(name, TEMPLATE_INVALID)) + return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name); - if (unit_name_to_type(name) != UNIT_SNAPSHOT) { - dbus_set_error(e, BUS_ERROR_UNIT_TYPE_MISMATCH, "Unit name %s lacks snapshot suffix.", name); - return -EINVAL; - } + if (unit_name_to_type(name) != UNIT_SNAPSHOT) + return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s lacks snapshot suffix.", name); - if (manager_get_unit(m, name)) { - dbus_set_error(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); - return -EEXIST; - } + if (manager_get_unit(m, name)) + return sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); } else { @@ -217,28 +216,28 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn if (asprintf(&n, "snapshot-%u.snapshot", ++ m->n_snapshots) < 0) return -ENOMEM; - if (!manager_get_unit(m, n)) + if (!manager_get_unit(m, n)) { + name = n; break; + } free(n); + n = NULL; } - - name = n; } r = manager_load_unit_prepare(m, name, NULL, e, &u); - free(n); - if (r < 0) goto fail; - SNAPSHOT(u)->by_snapshot_create = true; + u->transient = true; manager_dispatch_load_queue(m); assert(u->load_state == UNIT_LOADED); HASHMAP_FOREACH_KEY(other, k, m->units, i) { - if (other->ignore_on_snapshot) + if (other->ignore_on_snapshot || + other->transient) continue; if (k != other->id) @@ -251,13 +250,16 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other))) continue; - if ((r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, other, true)) < 0) + r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, other, true); + if (r < 0) goto fail; } SNAPSHOT(u)->cleanup = cleanup; *_s = SNAPSHOT(u); + log_unit_info(u->id, "Created snapshot %s.", u->id); + return 0; fail: @@ -270,6 +272,8 @@ fail: void snapshot_remove(Snapshot *s) { assert(s); + log_unit_info(UNIT(s)->id, "Removing snapshot %s.", UNIT(s)->id); + unit_add_to_cleanup_queue(UNIT(s)); } @@ -288,8 +292,8 @@ const UnitVTable snapshot_vtable = { .no_gc = true, .init = snapshot_init, - .load = snapshot_load, + .coldplug = snapshot_coldplug, .dump = snapshot_dump, @@ -304,5 +308,5 @@ const UnitVTable snapshot_vtable = { .sub_state_to_string = snapshot_sub_state_to_string, .bus_interface = "org.freedesktop.systemd1.Snapshot", - .bus_message_handler = bus_snapshot_message_handler + .bus_vtable = bus_snapshot_vtable };