clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-03 23:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

transaction: print more information about conflicting jobs

Browse Source 
Also remove some debug statement that should not have been committed.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-02-06 00:46:15 -05:00
parent 3ce09b7da2
commit 75cb8502df
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/manager.c
-3
View File
@@ -105,7 +105,6 @@ static int manager_watch_jobs_in_progress(Manager *m) {
return 0;
next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC;
log_debug("queuing for "USEC_FMT, next);
return sd_event_add_monotonic(m->event, next, 0, manager_dispatch_jobs_in_progress, m, &m->jobs_in_progress_event_source);
}
@@ -1766,7 +1765,6 @@ static int manager_dispatch_jobs_in_progress(sd_event_source *source, usec_t use
manager_print_jobs_in_progress(m);
next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC;
log_debug("requeuing for "USEC_FMT, next);
r = sd_event_source_set_time(source, next);
if (r < 0)
return r;
@@ -2468,7 +2466,6 @@ void manager_check_finished(Manager *m) {
if (hashmap_size(m->jobs) > 0) {
if (m->jobs_in_progress_event_source) {
uint64_t next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC;
log_debug("requeuing for "USEC_FMT, next);
sd_event_source_set_time(m->jobs_in_progress_event_source, next);
}
return;
src/core/transaction.c
+3 -1
View File
@@ -223,7 +223,9 @@ static int delete_one_unmergeable_job(Transaction *tr, Job *j) {
/* Ok, we can drop one, so let's do so. */
log_debug_unit(d->unit->id,
"Fixing conflicting jobs by deleting job %s/%s",
"Fixing conflicting jobs %s/%s,%s/%s by deleting job %s/%s",
j->unit->id, job_type_to_string(j->type),
k->unit->id, job_type_to_string(k->type),
d->unit->id, job_type_to_string(d->type));
transaction_delete_job(tr, d, true);
return 0;