core/dbus-unit: disable service activation while dbus-broker.service … #27570
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…is deactivating fix: #26799
github-actions
bot
added
util-lib
please-review
yuwata
reviewed
May 8, 2023
| @@ -1858,6 +1859,14 @@ int bus_unit_queue_job( | |||
| (type == JOB_RELOAD_OR_START && job_type_collapse(type, u) == JOB_START && u->refuse_manual_start)) | |||
| return sd_bus_error_setf(error, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, unit %s may be requested by dependency only (it is configured to refuse manual start/stop).", u->id); | |||
|
|
|||
| if (u->manager && type == JOB_START && u->type == UNIT_SERVICE) { | |||
There was a problem hiding this comment.
The condition u->manager is mostly redundant. If you want, then please add assert(u->manager); at the beginning of the function.
| Manager *m = u->manager; | ||
| Service *s = SERVICE(u); | ||
| if (manager_unit_deactivating_or_pending(m, SPECIAL_DBUS_BROKER_SERVICE) && | ||
| s != NULL && s->type == SERVICE_DBUS) |
There was a problem hiding this comment.
s != NULL is mostly redundant. If you want to check that, please use ASSERT_PTR().
assert(u->manager);
...
if (type == JOB_START && u->type == UNIT_SERVICE &&
ASSERT_PTR(SERVICE(u))->type == SERVICE_DBUS &&
manager_unit_deactivating_or_pending(u->manager, SPECIAL_DBUS_BROKER_SERVICE))
return sd_bus_error_set(...);| if (u->manager && type == JOB_START && u->type == UNIT_SERVICE) { | ||
| Manager *m = u->manager; | ||
| Service *s = SERVICE(u); | ||
| if (manager_unit_deactivating_or_pending(m, SPECIAL_DBUS_BROKER_SERVICE) && |
There was a problem hiding this comment.
Why dbus-broker.service is checked instead of dbus.service? Even if dbus-broker.service is used, IIRC, we assume dbus.service is an alias of dbus-broker.service.
Also, in signal_activation_request(), we checked with manager_unit_inactive_or_pending(). Why not to also use that here?
There was a problem hiding this comment.
I think it's better to export and use manager_dbus_is_running?
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces systemd#27570 Closes systemd#26799
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces systemd#27570 Closes systemd#26799
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces systemd#27570 Closes systemd#26799
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces systemd#27570 Closes systemd#26799
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces systemd#27570 Closes systemd#26799
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces systemd#27570 Closes systemd#26799
YHNdnzj
added a commit
to YHNdnzj/systemd
that referenced
this pull request
May 8, 2023
dbus-broker issues StartUnit directly for activation requests, so let's add a check on bus state in bus_unit_queue_job to refuse that if dbus is not running. Replaces systemd#27570 Closes systemd#26799
|
superseded by #27579 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…is deactivating
fix: #26799