SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30437 from YHNdnzj/job-start-msg

Browse Source 
core/job: emit job start message if we're only waiting for unit state
This commit is contained in:
Yu Watanabe
2023-12-12 21:59:34 +09:00
committed by GitHub
parent 6cfce71b50 d8deb18720
commit 61738a1a92
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/device.c
+1
View File
@@ -1291,6 +1291,7 @@ const UnitVTable device_vtable = {
.status_message_formats = {
.starting_stopping = {
[0] = "Expecting device %s...",
[1] = "Waiting for device %s to disappear...",
},
.finished_start_job = {
[JOB_DONE] = "Found device %s.",
src/core/job.c
+14 -17
View File
@@ -833,13 +833,12 @@ static int job_perform_on_unit(Job **j) {
Manager *m;
JobType t;
Unit *u;
bool wait_only;
int r;
/* While we execute this operation the job might go away (for
* example: because it finishes immediately or is replaced by
* a new, conflicting job.) To make sure we don't access a
* freed job later on we store the id here, so that we can
* verify the job is still valid. */
/* While we execute this operation the job might go away (for example: because it finishes immediately
* or is replaced by a new, conflicting job). To make sure we don't access a freed job later on we
* store the id here, so that we can verify the job is still valid. */
assert(j);
assert(*j);
@@ -853,6 +852,7 @@ static int job_perform_on_unit(Job **j) {
switch (t) {
case JOB_START:
r = unit_start(u, a);
wait_only = r == -EBADR; /* If the unit type does not support starting, then simply wait. */
break;
case JOB_RESTART:
@@ -860,24 +860,28 @@ static int job_perform_on_unit(Job **j) {
_fallthrough_;
case JOB_STOP:
r = unit_stop(u);
wait_only = r == -EBADR; /* If the unit type does not support stopping, then simply wait. */
break;
case JOB_RELOAD:
r = unit_reload(u);
wait_only = false; /* A clear error is generated if reload is not supported. */
break;
default:
assert_not_reached();
}
/* Log if the job still exists and the start/stop/reload function actually did something. Note that this means
* for units for which there's no 'activating' phase (i.e. because we transition directly from 'inactive' to
* 'active') we'll possibly skip the "Starting..." message. */
/* Log if the job still exists and the start/stop/reload function actually did something or we're
* only waiting for unit status change (common for device units). The latter ensures that job start
* messages for device units are correctly shown. Note that if the job disappears too quickly, e.g.
* for units for which there's no 'activating' phase (i.e. because we transition directly from
* 'inactive' to 'active'), we'll possibly skip the "Starting..." message. */
*j = manager_get_job(m, id);
if (*j && r > 0)
if (*j && (r > 0 || wait_only))
job_emit_start_message(u, id, t);
return r;
return wait_only ? 0 : r;
}
int job_run_and_invalidate(Job *j) {
@@ -919,13 +923,6 @@ int job_run_and_invalidate(Job *j) {
case JOB_START:
case JOB_STOP:
case JOB_RESTART:
r = job_perform_on_unit(&j);
/* If the unit type does not support starting/stopping, then simply wait. */
if (r == -EBADR)
r = 0;
break;
case JOB_RELOAD:
r = job_perform_on_unit(&j);
break;