diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-10-18 14:17:02 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-11-03 20:25:14 +0000 |
| commit | 12ab94a1e4961a39c32efb60b71866ab588d3ea2 (patch) | |
| tree | 4d4a316d5e2ec0dbccbc54a6c38a604f980718dc /src/core/socket.c | |
| parent | 7454acd73f4197600ca440a74583aba804d9af30 (diff) | |
| download | systemd-12ab94a1e4961a39c32efb60b71866ab588d3ea2.tar.gz | |
core: Propagate condition failed state to triggering units.
Alternative to https://github.com/systemd/systemd/pull/20531.
Whenever a service triggered by another unit fails condition checks,
stop the triggering unit to prevent systemd busy looping trying to
start the triggered unit.
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 81178e3de2..ffa3fe3317 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2336,6 +2336,15 @@ static void socket_enter_running(Socket *s, int cfd_in) { goto refuse; } + if (UNIT_ISSET(s->service) && cfd < 0) { + Unit *service = UNIT_DEREF(s->service); + + if (unit_has_failed_condition_or_assert(service)) { + socket_enter_dead(s, SOCKET_FAILURE_SERVICE_CONDITION_FAILED); + return; + } + } + if (cfd < 0) { bool pending = false; Unit *other; @@ -3445,15 +3454,16 @@ static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = { DEFINE_STRING_TABLE_LOOKUP(socket_exec_command, SocketExecCommand); static const char* const socket_result_table[_SOCKET_RESULT_MAX] = { - [SOCKET_SUCCESS] = "success", - [SOCKET_FAILURE_RESOURCES] = "resources", - [SOCKET_FAILURE_TIMEOUT] = "timeout", - [SOCKET_FAILURE_EXIT_CODE] = "exit-code", - [SOCKET_FAILURE_SIGNAL] = "signal", - [SOCKET_FAILURE_CORE_DUMP] = "core-dump", - [SOCKET_FAILURE_START_LIMIT_HIT] = "start-limit-hit", - [SOCKET_FAILURE_TRIGGER_LIMIT_HIT] = "trigger-limit-hit", - [SOCKET_FAILURE_SERVICE_START_LIMIT_HIT] = "service-start-limit-hit" + [SOCKET_SUCCESS] = "success", + [SOCKET_FAILURE_RESOURCES] = "resources", + [SOCKET_FAILURE_TIMEOUT] = "timeout", + [SOCKET_FAILURE_EXIT_CODE] = "exit-code", + [SOCKET_FAILURE_SIGNAL] = "signal", + [SOCKET_FAILURE_CORE_DUMP] = "core-dump", + [SOCKET_FAILURE_START_LIMIT_HIT] = "start-limit-hit", + [SOCKET_FAILURE_TRIGGER_LIMIT_HIT] = "trigger-limit-hit", + [SOCKET_FAILURE_SERVICE_START_LIMIT_HIT] = "service-start-limit-hit", + [SOCKET_FAILURE_SERVICE_CONDITION_FAILED] = "service-condition-failed", }; DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult); |