You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.7 KiB
52 lines
1.7 KiB
From 8ee652948b0255005e4c9d278ac06b30711d9dbd Mon Sep 17 00:00:00 2001 |
|
From: chenglin130 <cheng.lin130@zte.com.cn> |
|
Date: Sat, 9 Nov 2019 23:04:04 +0800 |
|
Subject: [PATCH] core: coldplug possible nop_job |
|
|
|
When a unit in a state INACTIVE or DEACTIVATING, JobType JOB_TRY_RESTART or |
|
JOB_TRY_RELOAD will be collapsed to JOB_NOP. And use u->nop_job instead |
|
of u->job. |
|
|
|
If a JOB_NOP job is going on with a waiting state, a parallel daemon-reload |
|
just install it during deserialization. Without a coldplug, the job will |
|
not be in m->run_queue, which results in a hung try-restart or |
|
try-reload process. |
|
|
|
Reproduce: |
|
1. run systemctl try-restart test.servcie (inactive) repeatly in a terminal. |
|
2. run systemctl daemon-reload repeatly in other terminals. |
|
|
|
After successful reproduce, systemctl list-jobs will list the hang job. |
|
|
|
Upsteam: |
|
https://github.com/systemd/systemd/pull/13124 |
|
|
|
Resolves: #1829754 |
|
--- |
|
src/core/unit.c | 6 ++++-- |
|
1 file changed, 4 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/src/core/unit.c b/src/core/unit.c |
|
index 2b058dd3e8..d953780a52 100644 |
|
--- a/src/core/unit.c |
|
+++ b/src/core/unit.c |
|
@@ -2918,6 +2918,7 @@ static int unit_add_deserialized_job_coldplug(Unit *u) { |
|
|
|
int unit_coldplug(Unit *u, Hashmap *deferred_work) { |
|
int r; |
|
+ Job *uj; |
|
|
|
assert(u); |
|
|
|
@@ -2925,8 +2926,9 @@ int unit_coldplug(Unit *u, Hashmap *deferred_work) { |
|
if ((r = UNIT_VTABLE(u)->coldplug(u, deferred_work)) < 0) |
|
return r; |
|
|
|
- if (u->job) { |
|
- r = job_coldplug(u->job); |
|
+ uj = u->job ?: u->nop_job; |
|
+ if (uj) { |
|
+ r = job_coldplug(uj); |
|
if (r < 0) |
|
return r; |
|
} else if (u->deserialized_job >= 0)
|
|
|