Skip to content

udiskslinuxmdraid: Add uevent triggers #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbzatek merged 2 commits into from
Dec 17, 2025
Merged

udiskslinuxmdraid: Add uevent triggers #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbcedef
udiskslinuxmdraid: Add uevent triggers
tbzatek Sep 25, 2025
e988f9a
integration-test: Sleep for a while after mdraid creation
tbzatek Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/tests/integration-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,6 +1831,7 @@ class MDRaid(UDisksTestCase):
create.extend(self.md_legs)
self.assertEqual(subprocess.call(create), 0)
self.sync()
time.sleep(2) # FIXME: find a better way
Copy link
Member

@vojtechtrefny vojtechtrefny Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I doubt there is a better way when we are calling mdadm --create outside udisks here.

Copy link
Member Author

@tbzatek tbzatek Dec 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are several places in the code with # TODO or an arbitrary sleep(5). There is a better way to watch out for objects on the bus, but not trivial to implement.

IOW, are you saying the comment should be removed?


def tearDown(self):
self.assertEqual(
Expand Down
36 changes: 36 additions & 0 deletions src/udiskslinuxmdraid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,7 @@ udisks_linux_mdraid_stop (UDisksMDRaid *_mdraid,
UDisksLinuxDevice *raid_device = NULL;
UDisksBaseJob *job = NULL;
const gchar *device_file = NULL;
const gchar *sysfs_path;
GError *local_error = NULL;
gboolean ret = FALSE;

Expand Down Expand Up @@ -802,6 +803,7 @@ udisks_linux_mdraid_stop (UDisksMDRaid *_mdraid,
}

device_file = g_udev_device_get_device_file (raid_device->udev_device);
sysfs_path = g_udev_device_get_sysfs_path (raid_device->udev_device);

job = udisks_daemon_launch_simple_job (daemon,
UDISKS_OBJECT (object),
Expand All @@ -825,6 +827,8 @@ udisks_linux_mdraid_stop (UDisksMDRaid *_mdraid,
goto out;
}

udisks_daemon_util_trigger_uevent_sync (daemon, NULL, sysfs_path, UDISKS_DEFAULT_WAIT_TIMEOUT);

udisks_simple_job_complete (UDISKS_SIMPLE_JOB (job), TRUE, NULL);
ret = TRUE;

Expand Down Expand Up @@ -930,6 +934,7 @@ handle_remove_device (UDisksMDRaid *_mdraid,
UDisksLinuxDevice *raid_device = NULL;
const gchar *device_file = NULL;
const gchar *member_device_file = NULL;
const gchar *sysfs_path;
GError *error = NULL;
UDisksObject *member_device_object = NULL;
UDisksBlock *member_device = NULL;
Expand Down Expand Up @@ -1018,6 +1023,7 @@ handle_remove_device (UDisksMDRaid *_mdraid,
}

device_file = g_udev_device_get_device_file (raid_device->udev_device);
sysfs_path = g_udev_device_get_sysfs_path (raid_device->udev_device);

member_device_file = udisks_block_get_device (member_device);

Expand Down Expand Up @@ -1062,6 +1068,11 @@ handle_remove_device (UDisksMDRaid *_mdraid,
}
}

udisks_linux_block_object_trigger_uevent_sync (UDISKS_LINUX_BLOCK_OBJECT (member_device_object),
UDISKS_DEFAULT_WAIT_TIMEOUT);

udisks_daemon_util_trigger_uevent_sync (daemon, NULL, sysfs_path, UDISKS_DEFAULT_WAIT_TIMEOUT);

udisks_mdraid_complete_remove_device (_mdraid, invocation);

out:
Expand Down Expand Up @@ -1092,6 +1103,7 @@ handle_add_device (UDisksMDRaid *_mdraid,
UDisksLinuxDevice *raid_device = NULL;
const gchar *device_file = NULL;
const gchar *new_member_device_file = NULL;
const gchar *sysfs_path;
GError *error = NULL;
UDisksObject *new_member_device_object = NULL;
UDisksBlock *new_member_device = NULL;
Expand Down Expand Up @@ -1168,6 +1180,8 @@ handle_add_device (UDisksMDRaid *_mdraid,
}

device_file = g_udev_device_get_device_file (raid_device->udev_device);
sysfs_path = g_udev_device_get_sysfs_path (raid_device->udev_device);

new_member_device_file = udisks_block_get_device (new_member_device);

job = udisks_daemon_launch_simple_job (daemon,
Expand All @@ -1192,6 +1206,11 @@ handle_add_device (UDisksMDRaid *_mdraid,
goto out;
}

udisks_linux_block_object_trigger_uevent_sync (UDISKS_LINUX_BLOCK_OBJECT (new_member_device_object),
UDISKS_DEFAULT_WAIT_TIMEOUT);

udisks_daemon_util_trigger_uevent_sync (daemon, NULL, sysfs_path, UDISKS_DEFAULT_WAIT_TIMEOUT);

udisks_simple_job_complete (UDISKS_SIMPLE_JOB (job), TRUE, NULL);
udisks_mdraid_complete_add_device (_mdraid, invocation);

Expand Down Expand Up @@ -1221,6 +1240,7 @@ handle_set_bitmap_location (UDisksMDRaid *_mdraid,
uid_t caller_uid;
UDisksLinuxDevice *raid_device = NULL;
const gchar *device_file = NULL;
const gchar *sysfs_path;
GError *error = NULL;
UDisksBaseJob *job = NULL;

Expand Down Expand Up @@ -1286,6 +1306,7 @@ handle_set_bitmap_location (UDisksMDRaid *_mdraid,
}

device_file = g_udev_device_get_device_file (raid_device->udev_device);
sysfs_path = g_udev_device_get_sysfs_path (raid_device->udev_device);

job = udisks_daemon_launch_simple_job (daemon,
UDISKS_OBJECT (object),
Expand All @@ -1309,6 +1330,8 @@ handle_set_bitmap_location (UDisksMDRaid *_mdraid,
goto out;
}

udisks_daemon_util_trigger_uevent_sync (daemon, NULL, sysfs_path, UDISKS_DEFAULT_WAIT_TIMEOUT);

udisks_simple_job_complete (UDISKS_SIMPLE_JOB (job), TRUE, NULL);
udisks_mdraid_complete_add_device (_mdraid, invocation);
udisks_linux_mdraid_update (mdraid, object);
Expand Down Expand Up @@ -1338,6 +1361,7 @@ handle_request_sync_action (UDisksMDRaid *_mdraid,
UDisksLinuxDevice *raid_device = NULL;
GError *error = NULL;
const gchar *device_file = NULL;
const gchar *sysfs_path;
UDisksBaseJob *job = NULL;
gboolean opt_no_inhibit = FALSE;

Expand Down Expand Up @@ -1407,6 +1431,7 @@ handle_request_sync_action (UDisksMDRaid *_mdraid,
}

device_file = g_udev_device_get_device_file (raid_device->udev_device);
sysfs_path = g_udev_device_get_sysfs_path (raid_device->udev_device);

job = udisks_daemon_launch_simple_job (daemon,
UDISKS_OBJECT (object),
Expand All @@ -1430,6 +1455,8 @@ handle_request_sync_action (UDisksMDRaid *_mdraid,
goto out;
}

udisks_daemon_util_trigger_uevent_sync (daemon, NULL, sysfs_path, UDISKS_DEFAULT_WAIT_TIMEOUT);

udisks_simple_job_complete (UDISKS_SIMPLE_JOB (job), TRUE, NULL);
udisks_mdraid_complete_request_sync_action (_mdraid, invocation);

Expand All @@ -1455,6 +1482,7 @@ handle_delete (UDisksMDRaid *mdraid,
GList *member_devices = NULL;
GList *l;
UDisksLinuxDevice *raid_device = NULL;
const gchar *sysfs_path;
GError *error = NULL;

g_variant_lookup (options, "tear-down", "b", &teardown_flag);
Expand Down Expand Up @@ -1565,12 +1593,20 @@ handle_delete (UDisksMDRaid *mdraid,
UDisksLinuxDevice *member_device = UDISKS_LINUX_DEVICE (l->data);
const gchar *device = g_udev_device_get_device_file (member_device->udev_device);

sysfs_path = g_udev_device_get_sysfs_path (member_device->udev_device);
if (!bd_md_destroy (device, &error))
{
g_prefix_error (&error, "Error wiping device '%s': ", device);
g_dbus_method_invocation_take_error (invocation, error);
goto out;
}
udisks_daemon_util_trigger_uevent_sync (daemon, NULL, sysfs_path, UDISKS_DEFAULT_WAIT_TIMEOUT);
}

if (raid_device)
{
sysfs_path = g_udev_device_get_sysfs_path (raid_device->udev_device);
udisks_daemon_util_trigger_uevent_sync (daemon, NULL, sysfs_path, UDISKS_DEFAULT_WAIT_TIMEOUT);
}

udisks_mdraid_complete_delete (mdraid, invocation);
Expand Down