Skip to content
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

os-helpers: fs: replace wait4file w/ inotifywait #3081

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

os-helpers: fs: replace wait4file w/ inotifywait #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions meta-balena-common/recipes-core/initrdscripts/files/fsuuidsinit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ fsuuidsinit_enabled() {
return 1
fi

# Wait for balena by-state symlinks to come up
# We only wait for resin-rootA here as we use it right away
# but we in fact assume the other symlinks are created as well
# wait4file does $2 loops of 100ms, therefore use 10 * roottimeout
timeout=${bootparam_roottimeout:-5}
if ! wait4file "/dev/disk/by-state/resin-rootA" "$((timeout * 10))"; then
if ! ls /dev/disk/by-state/* \
&& ! inotifywait -r /dev \
--include 'disk/by-state/resin-+(boot|data|root[AB]|state)$' \
--timeout "${timeout}"; then
error "Timeout while waiting for resin-root partition to be detected"
return 1
fi
Expand Down
7 changes: 5 additions & 2 deletions meta-balena-common/recipes-core/initrdscripts/files/machineid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ machineid_enabled() {
machineid_run() {
# Mount the state partition - that's where we store the machine_id
state_partition_path="$(get_state_path_from_label "resin-state")"
if ! wait4file "$state_partition_path" "300"; then
if [ ! -e "${state_partition_path}" ] \
&& ! inotifywait -r /dev \
--include "${state_partition_path#/dev/}" \
--timeout 30; then
error "Timeout while waiting for resin-state partition to be detected."
error "Not able to mount resin-state, machine-id will not be persistent."
return
return
fi

info "Binding machine-id from ${state_partition_path}"
Expand Down
8 changes: 6 additions & 2 deletions meta-balena-common/recipes-core/initrdscripts/files/resindataexpander
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ resindataexpander_enabled() {
datadev=$(lsblk "/dev/${datapartdev}" -d -n -o PKNAME)
pttype=$(get_part_table_type "/dev/${datadev}")

if ! wait4file "$datapart" "300"; then
error "Timeout while waiting for data partition to be detected. Data partition expansion will not be tried."
if [ ! -e "${datapart}" ] \
&& ! inotifywait -r /dev \
--include "${datapart#/dev/}" \
--timeout 30; then
error "Timeout while waiting for data partition to be detected." \
"Data partition expansion will not be tried."
return 1
fi

Expand Down
2 changes: 1 addition & 1 deletion meta-balena-common/recipes-support/os-helpers/os-helpers.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${BALENA_COREBASE}/COPYING.Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"

DEPENDS = "time-native"
RDEPENDS:${PN}-fs = "e2fsprogs-tune2fs mtools parted bash util-linux-fdisk"
RDEPENDS:${PN}-fs = "e2fsprogs-tune2fs mtools parted bash util-linux-fdisk inotify-tools"
RDEPENDS:${PN}-fs:append = "${@bb.utils.contains('MACHINE_FEATURES','raid',' mdadm','',d)}"
RDEPENDS:${PN}-tpm2 = "libtss2-tcti-device tpm2-tools"
RDEPENDS:${PN}-config = "bash"
Expand Down
20 changes: 0 additions & 20 deletions meta-balena-common/recipes-support/os-helpers/os-helpers/os-helpers-fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,6 @@ if [ -f "/usr/libexec/os-helpers-logging" ]; then
. /usr/libexec/os-helpers-logging
fi

# Wait for a file to appear with loop count limit.
# Use-case example: wait for udev to create a filesystem symlink.
# Arguments:
# 1 - target path
# 2 - number of loops (each loop sleeps for 100ms)
wait4file() {
_lpath="$1"
_lloops="$2"

while [ ! -e "$_lpath" ]; do
if [ "$_lloops" -gt 0 ]; then
sleep 0.1
_lloops=$((_lloops-1))
else
return 1
fi
done
return 0
}

# Output the UUID for the specified block device.
Copy link
Contributor

@alexgg alexgg Mar 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

@jakogut I think the change is an improvement, but why not keep the wait4file abstraction and just re-implement it using inotifywait?
Also, as the include option is only supported from inotify-tools 3.21.9.0, if you abstract it in wait4file you can check that a specific version is installed and if not fallback to the current method for backwards compatibility with older Yocto versions that include older versions of inotifywait (or don't have an inotify-tools recipe)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good thoughts, thanks.

# Arguments:
# 1 - Target block device
Expand Down
7 changes: 4 additions & 3 deletions meta-balena-common/recipes-support/resin-mounts/resin-mounts/resin-partition-mounter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

set -e

TIMEOUT_LOOPS=300 # ~ 100ms/loop * 300loops = 30000ms = 30s

#
# Help message
#
Expand Down Expand Up @@ -103,7 +101,10 @@ if [ ! -d "$target_mountpoint" ]; then
echo "ERROR: Target mountpoint $target_mountpoint not found."
exit 1
fi
if ! wait4file "$target_path" "$TIMEOUT_LOOPS"; then
if [ ! -e "${target_path}" ] \
&& ! inotifywait -r /dev \
--include "${target_path#/dev/}" \
--timeout 30; then
echo "ERROR: Timeout while waiting for $target_path to come up."
exit 1
fi
Expand Down