chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: add new "flush" job mode to cancel all other jobs when queuing a new job
[elogind.git]
/
src
/
core
/
transaction.c
diff --git
a/src/core/transaction.c
b/src/core/transaction.c
index dbc30af7d1c90c23f3bce82f2b4d29a1ad1be693..36e31c45c9949dc5a5a82b981ff31490242c24cb 100644
(file)
--- a/
src/core/transaction.c
+++ b/
src/core/transaction.c
@@
-22,8
+22,10
@@
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
-#include "transaction.h"
#include "bus-errors.h"
#include "bus-errors.h"
+#include "bus-util.h"
+#include "bus-error.h"
+#include "transaction.h"
static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependencies);
static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependencies);
@@
-97,6
+99,7
@@
static void transaction_merge_and_delete_job(Transaction *tr, Job *j, Job *other
j->type = t;
j->state = JOB_WAITING;
j->override = j->override || other->override;
j->type = t;
j->state = JOB_WAITING;
j->override = j->override || other->override;
+ j->irreversible = j->irreversible || other->irreversible;
j->matters_to_anchor = j->matters_to_anchor || other->matters_to_anchor;
j->matters_to_anchor = j->matters_to_anchor || other->matters_to_anchor;
@@
-138,7
+141,7
@@
static void transaction_merge_and_delete_job(Transaction *tr, Job *j, Job *other
transaction_delete_job(tr, other, true);
}
transaction_delete_job(tr, other, true);
}
-static bool job_is_conflicted_by(Job *j) {
+
_pure_
static bool job_is_conflicted_by(Job *j) {
JobDependency *l;
assert(j);
JobDependency *l;
assert(j);
@@
-229,7
+232,7
@@
static int delete_one_unmergeable_job(Transaction *tr, Job *j) {
return -EINVAL;
}
return -EINVAL;
}
-static int transaction_merge_jobs(Transaction *tr,
DBusE
rror *e) {
+static int transaction_merge_jobs(Transaction *tr,
sd_bus_e
rror *e) {
Job *j;
Iterator i;
int r;
Job *j;
Iterator i;
int r;
@@
-259,8
+262,9
@@
static int transaction_merge_jobs(Transaction *tr, DBusError *e) {
return -EAGAIN;
/* We couldn't merge anything. Failure */
return -EAGAIN;
/* We couldn't merge anything. Failure */
- dbus_set_error(e, BUS_ERROR_TRANSACTION_JOBS_CONFLICTING, "Transaction contains conflicting jobs '%s' and '%s' for %s. Probably contradicting requirement dependencies configured.",
- job_type_to_string(t), job_type_to_string(k->type), k->unit->id);
+ sd_bus_error_setf(
+ e, BUS_ERROR_TRANSACTION_JOBS_CONFLICTING, "Transaction contains conflicting jobs '%s' and '%s' for %s. Probably contradicting requirement dependencies configured.",
+ job_type_to_string(t), job_type_to_string(k->type), k->unit->id);
return r;
}
}
return r;
}
}
@@
-318,7
+322,7
@@
rescan:
}
}
}
}
-static bool unit_matters_to_anchor(Unit *u, Job *j) {
+
_pure_
static bool unit_matters_to_anchor(Unit *u, Job *j) {
assert(u);
assert(!j->transaction_prev);
assert(u);
assert(!j->transaction_prev);
@@
-332,7
+336,7
@@
static bool unit_matters_to_anchor(Unit *u, Job *j) {
return false;
}
return false;
}
-static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsigned generation,
DBusE
rror *e) {
+static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsigned generation,
sd_bus_e
rror *e) {
Iterator i;
Unit *u;
int r;
Iterator i;
Unit *u;
int r;
@@
-342,7
+346,7
@@
static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
assert(!j->transaction_prev);
/* Does a recursive sweep through the ordering graph, looking
assert(!j->transaction_prev);
/* Does a recursive sweep through the ordering graph, looking
- * for a cycle. If we find cycle we try to break it. */
+ * for a cycle. If we find
a
cycle we try to break it. */
/* Have we seen this before? */
if (j->generation == generation) {
/* Have we seen this before? */
if (j->generation == generation) {
@@
-369,7
+373,7
@@
static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
/* logging for j not k here here to provide consistent narrative */
log_info_unit(j->unit->id,
/* logging for j not k here here to provide consistent narrative */
log_info_unit(j->unit->id,
- "
Walked on cycle path to
%s/%s",
+ "
Found dependency on
%s/%s",
k->unit->id, job_type_to_string(k->type));
if (!delete &&
k->unit->id, job_type_to_string(k->type));
if (!delete &&
@@
-395,16
+399,16
@@
static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
"Job %s/%s deleted to break ordering cycle starting with %s/%s",
delete->unit->id, job_type_to_string(delete->type),
j->unit->id, job_type_to_string(j->type));
"Job %s/%s deleted to break ordering cycle starting with %s/%s",
delete->unit->id, job_type_to_string(delete->type),
j->unit->id, job_type_to_string(j->type));
-
status_printf(ANSI_HIGHLIGHT_RED_ON " SKIP " ANSI_HIGHLIGHT_OFF, true
,
-
"Ordering cycle found, skipping %s", unit_description(delete->unit)
);
+
unit_status_printf(delete->unit, ANSI_HIGHLIGHT_RED_ON " SKIP " ANSI_HIGHLIGHT_OFF
,
+
"Ordering cycle found, skipping %s"
);
transaction_delete_unit(tr, delete->unit);
return -EAGAIN;
}
log_error("Unable to break cycle");
transaction_delete_unit(tr, delete->unit);
return -EAGAIN;
}
log_error("Unable to break cycle");
-
dbus_set_error
(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC,
- "Transaction order is cyclic. See system logs for details.");
+
sd_bus_error_setf
(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC,
+
"Transaction order is cyclic. See system logs for details.");
return -ENOEXEC;
}
return -ENOEXEC;
}
@@
-443,7
+447,7
@@
static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
return 0;
}
return 0;
}
-static int transaction_verify_order(Transaction *tr, unsigned *generation,
DBusE
rror *e) {
+static int transaction_verify_order(Transaction *tr, unsigned *generation,
sd_bus_e
rror *e) {
Job *j;
int r;
Iterator i;
Job *j;
int r;
Iterator i;
@@
-488,7
+492,7
@@
rescan:
}
}
}
}
-static int transaction_is_destructive(Transaction *tr,
DBusE
rror *e) {
+static int transaction_is_destructive(Transaction *tr,
JobMode mode, sd_bus_e
rror *e) {
Iterator i;
Job *j;
Iterator i;
Job *j;
@@
-503,10
+507,10
@@
static int transaction_is_destructive(Transaction *tr, DBusError *e) {
assert(!j->transaction_prev);
assert(!j->transaction_next);
assert(!j->transaction_prev);
assert(!j->transaction_next);
- if (j->unit->job &&
+ if (j->unit->job &&
(mode == JOB_FAIL || j->unit->job->irreversible) &&
!job_type_is_superset(j->type, j->unit->job->type)) {
!job_type_is_superset(j->type, j->unit->job->type)) {
-
dbus_set_error
(e, BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE, "Transaction is destructive.");
+
sd_bus_error_setf
(e, BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE, "Transaction is destructive.");
return -EEXIST;
}
}
return -EEXIST;
}
}
@@
-574,7
+578,7
@@
static int transaction_apply(Transaction *tr, Manager *m, JobMode mode) {
/* Moves the transaction jobs to the set of active jobs */
/* Moves the transaction jobs to the set of active jobs */
- if (mode == JOB_ISOLATE) {
+ if (mode == JOB_ISOLATE
|| mode == JOB_FLUSH
) {
/* When isolating first kill all installed jobs which
* aren't part of the new transaction */
/* When isolating first kill all installed jobs which
* aren't part of the new transaction */
@@
-633,7
+637,7
@@
rollback:
return r;
}
return r;
}
-int transaction_activate(Transaction *tr, Manager *m, JobMode mode,
DBusE
rror *e) {
+int transaction_activate(Transaction *tr, Manager *m, JobMode mode,
sd_bus_e
rror *e) {
Iterator i;
Job *j;
int r;
Iterator i;
Job *j;
int r;
@@
-675,7
+679,7
@@
int transaction_activate(Transaction *tr, Manager *m, JobMode mode, DBusError *e
break;
if (r != -EAGAIN) {
break;
if (r != -EAGAIN) {
- log_warning("Requested transaction contains an unfixable cyclic ordering dependency: %s", bus_error(e, r));
+ log_warning("Requested transaction contains an unfixable cyclic ordering dependency: %s", bus_error
_message
(e, r));
return r;
}
return r;
}
@@
-692,7
+696,7
@@
int transaction_activate(Transaction *tr, Manager *m, JobMode mode, DBusError *e
break;
if (r != -EAGAIN) {
break;
if (r != -EAGAIN) {
- log_warning("Requested transaction contains unmergeable jobs: %s", bus_error(e, r));
+ log_warning("Requested transaction contains unmergeable jobs: %s", bus_error
_message
(e, r));
return r;
}
return r;
}
@@
-709,12
+713,10
@@
int transaction_activate(Transaction *tr, Manager *m, JobMode mode, DBusError *e
transaction_drop_redundant(tr);
/* Ninth step: check whether we can actually apply this */
transaction_drop_redundant(tr);
/* Ninth step: check whether we can actually apply this */
- if (mode == JOB_FAIL) {
- r = transaction_is_destructive(tr, e);
- if (r < 0) {
- log_notice("Requested transaction contradicts existing jobs: %s", bus_error(e, r));
- return r;
- }
+ r = transaction_is_destructive(tr, mode, e);
+ if (r < 0) {
+ log_notice("Requested transaction contradicts existing jobs: %s", bus_error_message(e, r));
+ return r;
}
/* Tenth step: apply changes */
}
/* Tenth step: apply changes */
@@
-733,8
+735,11
@@
int transaction_activate(Transaction *tr, Manager *m, JobMode mode, DBusError *e
* feature for cosmetics, not actually useful for
* anything beyond that. */
* feature for cosmetics, not actually useful for
* anything beyond that. */
- if (m->idle_pipe[0] < 0 && m->idle_pipe[1] < 0)
+ if (m->idle_pipe[0] < 0 && m->idle_pipe[1] < 0 &&
+ m->idle_pipe[2] < 0 && m->idle_pipe[3] < 0) {
pipe2(m->idle_pipe, O_NONBLOCK|O_CLOEXEC);
pipe2(m->idle_pipe, O_NONBLOCK|O_CLOEXEC);
+ pipe2(m->idle_pipe + 2, O_NONBLOCK|O_CLOEXEC);
+ }
}
return 0;
}
return 0;
@@
-770,11
+775,12
@@
static Job* transaction_add_one_job(Transaction *tr, JobType type, Unit *unit, b
j->marker = NULL;
j->matters_to_anchor = false;
j->override = override;
j->marker = NULL;
j->matters_to_anchor = false;
j->override = override;
+ j->irreversible = tr->irreversible;
- LIST_PREPEND(
Job,
transaction, f, j);
+ LIST_PREPEND(transaction, f, j);
if (hashmap_replace(tr->jobs, unit, f) < 0) {
if (hashmap_replace(tr->jobs, unit, f) < 0) {
- LIST_REMOVE(
Job,
transaction, f, j);
+ LIST_REMOVE(transaction, f, j);
job_free(j);
return NULL;
}
job_free(j);
return NULL;
}
@@
-831,7
+837,7
@@
int transaction_add_job_and_dependencies(
bool conflicts,
bool ignore_requirements,
bool ignore_order,
bool conflicts,
bool ignore_requirements,
bool ignore_order,
-
DBusE
rror *e) {
+
sd_bus_e
rror *e) {
Job *ret;
Iterator i;
Unit *dep;
Job *ret;
Iterator i;
Unit *dep;
@@
-850,13
+856,14
@@
int transaction_add_job_and_dependencies(
if (unit->load_state != UNIT_LOADED &&
unit->load_state != UNIT_ERROR &&
if (unit->load_state != UNIT_LOADED &&
unit->load_state != UNIT_ERROR &&
+ unit->load_state != UNIT_NOT_FOUND &&
unit->load_state != UNIT_MASKED) {
unit->load_state != UNIT_MASKED) {
-
dbus_set_error
(e, BUS_ERROR_LOAD_FAILED, "Unit %s is not loaded properly.", unit->id);
+
sd_bus_error_setf
(e, BUS_ERROR_LOAD_FAILED, "Unit %s is not loaded properly.", unit->id);
return -EINVAL;
}
if (type != JOB_STOP && unit->load_state == UNIT_ERROR) {
return -EINVAL;
}
if (type != JOB_STOP && unit->load_state == UNIT_ERROR) {
-
dbus_set_error
(e, BUS_ERROR_LOAD_FAILED,
+
sd_bus_error_setf
(e, BUS_ERROR_LOAD_FAILED,
"Unit %s failed to load: %s. "
"See system logs and 'systemctl status %s' for details.",
unit->id,
"Unit %s failed to load: %s. "
"See system logs and 'systemctl status %s' for details.",
unit->id,
@@
-865,13
+872,21
@@
int transaction_add_job_and_dependencies(
return -EINVAL;
}
return -EINVAL;
}
+ if (type != JOB_STOP && unit->load_state == UNIT_NOT_FOUND) {
+ sd_bus_error_setf(e, BUS_ERROR_LOAD_FAILED,
+ "Unit %s failed to load: %s.",
+ unit->id,
+ strerror(-unit->load_error));
+ return -EINVAL;
+ }
+
if (type != JOB_STOP && unit->load_state == UNIT_MASKED) {
if (type != JOB_STOP && unit->load_state == UNIT_MASKED) {
-
dbus_set_error(e, BUS_ERROR
_MASKED, "Unit %s is masked.", unit->id);
+
sd_bus_error_setf(e, BUS_ERROR_UNIT
_MASKED, "Unit %s is masked.", unit->id);
return -EADDRNOTAVAIL;
}
if (!unit_job_is_applicable(unit, type)) {
return -EADDRNOTAVAIL;
}
if (!unit_job_is_applicable(unit, type)) {
-
dbus_set_error
(e, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE, "Job type %s is not applicable for unit %s.", job_type_to_string(type), unit->id);
+
sd_bus_error_setf
(e, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE, "Job type %s is not applicable for unit %s.", job_type_to_string(type), unit->id);
return -EBADR;
}
return -EBADR;
}
@@
-903,10
+918,10
@@
int transaction_add_job_and_dependencies(
if (r < 0) {
log_warning_unit(dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
if (r < 0) {
log_warning_unit(dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
- dep->id, bus_error(e, r));
+ dep->id, bus_error
_message
(e, r));
if (e)
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-922,7
+937,7
@@
int transaction_add_job_and_dependencies(
goto fail;
if (e)
goto fail;
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-933,7
+948,7
@@
int transaction_add_job_and_dependencies(
goto fail;
if (e)
goto fail;
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-942,10
+957,10
@@
int transaction_add_job_and_dependencies(
if (r < 0) {
log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
if (r < 0) {
log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
- dep->id, bus_error(e, r));
+ dep->id, bus_error
_message
(e, r));
if (e)
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-954,10
+969,10
@@
int transaction_add_job_and_dependencies(
if (r < 0) {
log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
if (r < 0) {
log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
- dep->id, bus_error(e, r));
+ dep->id, bus_error
_message
(e, r));
if (e)
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-968,7
+983,7
@@
int transaction_add_job_and_dependencies(
goto fail;
if (e)
goto fail;
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-977,10
+992,10
@@
int transaction_add_job_and_dependencies(
if (r < 0) {
log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
if (r < 0) {
log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
- dep->id, bus_error(e, r));
+ dep->id, bus_error
_message
(e, r));
if (e)
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-991,7
+1006,7
@@
int transaction_add_job_and_dependencies(
goto fail;
if (e)
goto fail;
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-1000,10
+1015,10
@@
int transaction_add_job_and_dependencies(
if (r < 0) {
log_warning_unit(dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
if (r < 0) {
log_warning_unit(dep->id,
"Cannot add dependency job for unit %s, ignoring: %s",
- dep->id, bus_error(e, r));
+ dep->id, bus_error
_message
(e, r));
if (e)
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-1018,7
+1033,7
@@
int transaction_add_job_and_dependencies(
goto fail;
if (e)
goto fail;
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-1029,7
+1044,7
@@
int transaction_add_job_and_dependencies(
goto fail;
if (e)
goto fail;
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-1040,7
+1055,7
@@
int transaction_add_job_and_dependencies(
goto fail;
if (e)
goto fail;
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
@@
-1053,10
+1068,10
@@
int transaction_add_job_and_dependencies(
if (r < 0) {
log_warning_unit(dep->id,
"Cannot add dependency reload job for unit %s, ignoring: %s",
if (r < 0) {
log_warning_unit(dep->id,
"Cannot add dependency reload job for unit %s, ignoring: %s",
- dep->id, bus_error(e, r));
+ dep->id, bus_error
_message
(e, r));
if (e)
if (e)
-
d
bus_error_free(e);
+
sd_
bus_error_free(e);
}
}
}
}
}
}
@@
-1106,7
+1121,7
@@
int transaction_add_isolate_jobs(Transaction *tr, Manager *m) {
return 0;
}
return 0;
}
-Transaction *transaction_new(
void
) {
+Transaction *transaction_new(
bool irreversible
) {
Transaction *tr;
tr = new0(Transaction, 1);
Transaction *tr;
tr = new0(Transaction, 1);
@@
-1119,6
+1134,8
@@
Transaction *transaction_new(void) {
return NULL;
}
return NULL;
}
+ tr->irreversible = irreversible;
+
return tr;
}
return tr;
}