From 652516802305e9cfef7fccfd059cdf9fbeb6e050 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 18 Jun 2025 11:47:25 +0200 Subject: [PATCH] core: make log cycle messages recognizable via message IDs (cherry picked from commit 5bbad6244ffc3849511c6ca652a27f1af550c599) Resolves: RHEL-106260 --- src/core/transaction.c | 5 +++++ src/systemd/sd-messages.h | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/core/transaction.c b/src/core/transaction.c index 9c911aef13..a96f37e148 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -3,6 +3,8 @@ #include #include +#include "sd-messages.h" + #include "alloc-util.h" #include "ansi-color.h" #include "bus-common-errors.h" @@ -410,6 +412,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi if (cycle_path_text) log_struct(LOG_WARNING, LOG_UNIT_MESSAGE(j->unit, "%s", cycle_path_text), + LOG_MESSAGE_ID(SD_MESSAGE_UNIT_ORDERING_CYCLE_STR), LOG_ITEM("%s", strna(unit_ids))); if (delete) { @@ -420,6 +423,7 @@ 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)), + LOG_MESSAGE_ID(SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE_STR), LOG_ITEM("%s", strna(unit_ids))); if (log_get_show_color()) @@ -439,6 +443,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi log_struct(LOG_ERR, LOG_UNIT_MESSAGE(j->unit, "Unable to break cycle starting with %s/%s", j->unit->id, job_type_to_string(j->type)), + LOG_MESSAGE_ID(SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE_STR), LOG_ITEM("%s", strna(unit_ids))); return sd_bus_error_setf(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC, diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h index 441f4e6888..562b29ccc6 100644 --- a/src/systemd/sd-messages.h +++ b/src/systemd/sd-messages.h @@ -280,6 +280,15 @@ _SD_BEGIN_DECLARATIONS; #define SD_MESSAGE_SYSCTL_CHANGED SD_ID128_MAKE(9c,f5,6b,8b,af,95,46,cf,94,78,78,3a,8d,e4,21,13) #define SD_MESSAGE_SYSCTL_CHANGED_STR SD_ID128_MAKE_STR(9c,f5,6b,8b,af,95,46,cf,94,78,78,3a,8d,e4,21,13) +#define SD_MESSAGE_UNIT_ORDERING_CYCLE SD_ID128_MAKE(f2,7a,3f,94,40,6a,47,83,b9,46,a9,bc,84,9e,94,52) +#define SD_MESSAGE_UNIT_ORDERING_CYCLE_STR SD_ID128_MAKE_STR(f2,7a,3f,94,40,6a,47,83,b9,46,a9,bc,84,9e,94,52) + +#define SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE SD_ID128_MAKE(50,84,36,75,42,f7,47,2d,bc,6a,94,12,5d,5d,eb,ce) +#define SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE_STR SD_ID128_MAKE_STR(50,84,36,75,42,f7,47,2d,bc,6a,94,12,5d,5d,eb,ce) + +#define SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE SD_ID128_MAKE(b3,11,2d,da,d1,90,45,53,8c,76,68,5b,a5,91,8a,80) +#define SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE_STR SD_ID128_MAKE_STR(b3,11,2d,da,d1,90,45,53,8c,76,68,5b,a5,91,8a,80) + _SD_END_DECLARATIONS; #endif