diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-02-06 00:37:18 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-02-06 00:46:15 -0500 |
| commit | 75cb8502dfec0a6a5305fe766d4b6a1a04a43549 (patch) | |
| tree | 88b77c9ca51e5a73321b6166904753d354e2ff06 | |
| parent | 3ce09b7da2eb8b888066468663b2b5c81a05a03c (diff) | |
transaction: print more information about conflicting jobs
Also remove some debug statement that should not have been committed.
| -rw-r--r-- | src/core/manager.c | 3 | ||||
| -rw-r--r-- | src/core/transaction.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 3f8bf58be2..45f5f70b2a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -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; diff --git a/src/core/transaction.c b/src/core/transaction.c index 36e31c45c9..d00f4277e1 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -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; |