shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-02 13:47:27 +03:00
Code

Merge pull request #23354 from DaanDeMeyer/mount-implicit-device-dep-trace

Browse Source 
core: Add trace logging to mount_add_device_dependencies()
This commit is contained in:
Yu Watanabe 2022-05-31 01:00:56 +09:00 committed by GitHub
commit 8288382049
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/mount.c
View File

@ -354,26 +354,40 @@ static int mount_add_device_dependencies(Mount *m) {
assert(m);
log_unit_trace(UNIT(m), "Processing implicit device dependencies");
p = get_mount_parameters(m);
if (!p)
if (!p) {
log_unit_trace(UNIT(m), "Missing mount parameters, skipping implicit device dependencies");
return 0;
}
if (!p->what)
if (!p->what) {
log_unit_trace(UNIT(m), "Missing mount source, skipping implicit device dependencies");
return 0;
}
if (mount_is_bind(p))
if (mount_is_bind(p)) {
log_unit_trace(UNIT(m), "Mount unit is a bind mount, skipping implicit device dependencies");
return 0;
}
if (!is_device_path(p->what))
if (!is_device_path(p->what)) {
log_unit_trace(UNIT(m), "Mount source is not a device path, skipping implicit device dependencies");
return 0;
}
/* /dev/root is a really weird thing, it's not a real device, but just a path the kernel exports for
* the root file system specified on the kernel command line. Ignore it here. */
if (PATH_IN_SET(p->what, "/dev/root", "/dev/nfs"))
if (PATH_IN_SET(p->what, "/dev/root", "/dev/nfs")) {
log_unit_trace(UNIT(m), "Mount source is in /dev/root or /dev/nfs, skipping implicit device dependencies");
return 0;
}
if (path_equal(m->where, "/"))
if (path_equal(m->where, "/")) {
log_unit_trace(UNIT(m), "Mount destination is '/', skipping implicit device dependencies");
return 0;
}
/* Mount units from /proc/self/mountinfo are not bound to devices by default since they're subject to
* races when mounts are established by other tools with different backing devices than what we
@ -388,13 +402,23 @@ static int mount_add_device_dependencies(Mount *m) {
r = unit_add_node_dependency(UNIT(m), p->what, dep, mask);
if (r < 0)
return r;
if (r > 0)
log_unit_trace(UNIT(m), "Added %s dependency on %s", unit_dependency_to_string(dep), p->what);
if (mount_propagate_stop(m)) {
r = unit_add_node_dependency(UNIT(m), p->what, UNIT_STOP_PROPAGATED_FROM, mask);
if (r < 0)
return r;
if (r > 0)
log_unit_trace(UNIT(m), "Added %s dependency on %s",
unit_dependency_to_string(UNIT_STOP_PROPAGATED_FROM), p->what);
}
return unit_add_blockdev_dependency(UNIT(m), p->what, mask);
r = unit_add_blockdev_dependency(UNIT(m), p->what, mask);
if (r > 0)
log_unit_trace(UNIT(m), "Added %s dependency on %s", unit_dependency_to_string(UNIT_AFTER), p->what);
return r;
}
static int mount_add_quota_dependencies(Mount *m) {

2
src/core/unit.c
View File

@ -3146,7 +3146,7 @@ int unit_add_dependency(
if (!noop)
unit_add_to_dbus_queue(u);
return 0;
return 1;
}
int unit_add_two_dependencies(Unit *u, UnitDependency d, UnitDependency e, Unit *other, bool add_reference, UnitDependencyMask mask) {

8
src/core/unit.h
View File

@ -1025,6 +1025,14 @@ Condition *unit_find_failed_condition(Unit *u);
#define log_unit_warning_errno(unit, error, ...) log_unit_full_errno(unit, LOG_WARNING, error, __VA_ARGS__)
#define log_unit_error_errno(unit, error, ...) log_unit_full_errno(unit, LOG_ERR, error, __VA_ARGS__)
#if LOG_TRACE
# define log_unit_trace(...) log_unit_debug(__VA_ARGS__)
# define log_unit_trace_errno(...) log_unit_debug_errno(__VA_ARGS__)
#else
# define log_unit_trace(...) do {} while (0)
# define log_unit_trace_errno(e, ...) (-ERRNO_VALUE(e))
#endif
#define log_unit_struct_errno(unit, level, error, ...) \
({ \
const Unit *_u = (unit); \

4
src/test/test-engine.c
View File

@ -189,8 +189,8 @@ int main(int argc, char *argv[]) {
assert_se(!hashmap_get(unit_get_dependencies(a, UNIT_PROPAGATES_RELOAD_TO), c));
assert_se(!hashmap_get(unit_get_dependencies(c, UNIT_RELOAD_PROPAGATED_FROM), a));
assert_se(unit_add_dependency(a, UNIT_PROPAGATES_RELOAD_TO, b, true, UNIT_DEPENDENCY_UDEV) == 0);
assert_se(unit_add_dependency(a, UNIT_PROPAGATES_RELOAD_TO, c, true, UNIT_DEPENDENCY_PROC_SWAP) == 0);
assert_se(unit_add_dependency(a, UNIT_PROPAGATES_RELOAD_TO, b, true, UNIT_DEPENDENCY_UDEV) >= 0);
assert_se(unit_add_dependency(a, UNIT_PROPAGATES_RELOAD_TO, c, true, UNIT_DEPENDENCY_PROC_SWAP) >= 0);
assert_se( hashmap_get(unit_get_dependencies(a, UNIT_PROPAGATES_RELOAD_TO), b));
assert_se( hashmap_get(unit_get_dependencies(b, UNIT_RELOAD_PROPAGATED_FROM), a));