[make-initrd] [PATCH] runtime: Freeze rootdelay countdown while paused

[Alexey Gladkov <gladkov.alexey@gmail.com>]

The rootdelay service tracks device discovery timeouts against an
absolute deadline timestamp. When rootdelay_pause is invoked (e.g.,
during fsck filesystem checks), the deadline was left unchanged while
boottime continued to advance. When unpaused, the time spent waiting on
the blocking operation was counted against the rootdelay allowance,
often causing the timeout to expire immediately.

Fix this by recording the timestamp when pausing and shifting the
deadline forward by the elapsed pause duration upon unpause. Atomic
mkdir and directory renaming are used to eliminate time-of-check to
time-of-use races between concurrent callers. If the timer is reset
while paused, advance the recorded pause start timestamp to prevent
adding duplicate time.

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---

Ты имеешь в виду что-то типа вот такого поведения ?

---

 features/runtime/data/bin/initrd-sh-functions | 59 ++++++++++++++++---
 features/runtime/data/sbin/rootdelayd         |  4 +-
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/features/runtime/data/bin/initrd-sh-functions b/features/runtime/data/bin/initrd-sh-functions
index a69eabee..be8d7182 100644
--- a/features/runtime/data/bin/initrd-sh-functions
+++ b/features/runtime/data/bin/initrd-sh-functions
@@ -126,17 +126,57 @@ write_atomic()
 	fi
 }
 
-_rootdelay_pause=/.initrd/rootdelay/pause
-_rootdelay_timestamp=/.initrd/rootdelay/deadline
+current_seconds()
+{
+	local __v=
+	__v="$("${TIMESTAMP:-timestamp}" boottime raw 2>/dev/null)" ||:
+	__v="${__v%.*}"
+	eval "$1=\"\$__v\""
+}
+
+_rootdelay_pause="${_rootdelay_pause:-/.initrd/rootdelay/pause}"
+_rootdelay_timestamp="${_rootdelay_timestamp:-/.initrd/rootdelay/deadline}"
 
 rootdelay_pause()
 {
-	mkdir -p "$_rootdelay_pause"
+	local now
+
+	mkdir -p -- "${_rootdelay_pause%/*}"
+	if ! mkdir "$_rootdelay_pause" 2>/dev/null; then
+		return 0
+	fi
+
+	current_seconds now
+	write_atomic "$_rootdelay_pause/start" printf '%s\n' "$now"
 }
 
 rootdelay_unpause()
 {
-	rm -rf "$_rootdelay_pause"
+	local pause_dir="$_rootdelay_pause.$$.$BASHPID"
+	local pause_start now paused_duration deadline
+
+	if ! mv "$_rootdelay_pause" "$pause_dir" 2>/dev/null; then
+		return 0
+	fi
+
+	if [ -f "$pause_dir/start" ]; then
+		readline pause_start "$pause_dir/start"
+
+		if [ -n "$pause_start" ] && [ -f "$_rootdelay_timestamp" ]; then
+			current_seconds now
+			paused_duration=$(( $now - $pause_start ))
+
+			if [ "$paused_duration" -gt 0 ]; then
+				readline deadline "$_rootdelay_timestamp"
+
+				if [ -n "$deadline" ] && [ "$deadline" -gt 0 ]; then
+					rootdelay_set_deadline "$(( $deadline + $paused_duration ))"
+				fi
+			fi
+		fi
+	fi
+
+	rm -rf "$pause_dir"
 }
 
 rootdelay_paused()
@@ -153,11 +193,16 @@ rootdelay_set_deadline()
 rootdelay_reset_timer()
 {
 	local now="${1-}"
+
 	if [ -z "$now" ]; then
-		now="$(timestamp boottime raw)"
-		now="${now%.*}"
+		current_seconds now
+	fi
+
+	rootdelay_set_deadline "$(( $now + ${ROOTDELAY:-0} ))"
+
+	if [ -f "$_rootdelay_pause/start" ]; then
+		write_atomic "$_rootdelay_pause/start" printf '%s\n' "$now"
 	fi
-	rootdelay_set_deadline "$(( $now + $ROOTDELAY ))"
 }
 
 initrd_features=/.initrd/features
diff --git a/features/runtime/data/sbin/rootdelayd b/features/runtime/data/sbin/rootdelayd
index 5fa21f07..4b11e5a4 100755
--- a/features/runtime/data/sbin/rootdelayd
+++ b/features/runtime/data/sbin/rootdelayd
@@ -71,9 +71,9 @@ while :; do
 		continue
 	fi
 
+	current_seconds now
+
 	first_iter=
-	now="$(timestamp boottime raw)"
-	now="${now%.*}"
 	consmsg="/.initrd/rootdelay/message"
 
 	if [ ! -f "$_rootdelay_timestamp" ]; then
-- 
2.56.0