From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0E4E1E0E14 for ; Thu, 5 Mar 2026 01:16:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772673401; cv=none; b=r2QbYGHxBO/LcA2sjge+iknYq2+xI6cw2ZtCg8XraJeqayPcF+tO2pBmunlPlEFw2tDF2m7qFzBxPsF4wvo720fzcQq23yw+LOog012KT21neWST/iBshOauIfjrp4D0ZMr4GEVdF4ghlClTebCwrrqSf7wwZsFdfr8JmigyGxk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772673401; c=relaxed/simple; bh=UccY8KkQmmzRVJjPmUNw0+5cfcnWQd4PGNhkKpKIa64=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=XzvJ7XFdZgy/XLGEx9cqXwwD4NJ5ZBOVcVNf+Easz2QAnuHVMs0WUmwtPklO/mVnFP2sbVifDOvSGp+U8bN6q4CvHDVKMKM6/NLwIJkgrP21LE2k3LnKXb+dxy0oXejmL6Rfn3DAbYQAWlLaqAqsSM9+NshfoGh6dQfh/S7xY+k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VYw5IrzF; arc=none smtp.client-ip=209.85.222.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VYw5IrzF" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-8cbae8f69cbso765997685a.0 for ; Wed, 04 Mar 2026 17:16:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772673398; x=1773278198; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=YGZZpQUs2JU6feqN07JnIijdY7YhuFyGOr34QG2qB8A=; b=VYw5IrzFEeMZLPUxGbmyXCzJpuVoc29ukNwloF7Q7kzmF9wwZVQfmlVJvvQzoky1Qr 0CNebY/AyqkIJF2zX49Td5xeNIxwCpHxxc/jHteYNc0JmCabEip/fux3e1MrQujEVBMQ JYSjQYhBNr0Fcnb6ibXk7eS7wt/nohcNajnfQB+CZ1+6zQqKFd/cHWgSz2ta4ObDZ704 a5dshgSmZ9c6nnIs9JGhjKlG+GqoJ4dgUYhQQ+kyiqxXselgHILsON3NIWZwogZv9z7V k+1w6KjjjNsdhNqiG5vGX19Zu8lQ7THAZEd5pPX7450lq63POyMRlkp1d8qyzjyzEyZ9 6dog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772673398; x=1773278198; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YGZZpQUs2JU6feqN07JnIijdY7YhuFyGOr34QG2qB8A=; b=RuTAz9dNNsUbz3LJpGLRG91H/3JEBwNSDDja32garaVlxEziQIg6+R0MOCFn83S9yw 1OhUFcMVGv2pcqPYs51xhgRHmaO7gFUIydXEy4TcfozNZYkk6tksmHr7C2Qb/r8nOvgK SoAp73P+aptJa+tPXC02vrWZd7ukXum/d07IqIBT6bncGue5t65zxecgidIbi52YneBo 7k0A6UR8fPoKXE2RPhIs69EP3PFjkdThXaCGRwZXlTVdpUPciG/4L+/3IVL9fpVwHxke 4RH0+dSvuRmwKcCuvdV6SzmuZ7TipIxKzy5bTrWKyaCVdct1sUlB7AwUnyM/JbcyzC8s T+Mg== X-Gm-Message-State: AOJu0YyC+FZvj3nVG32H7BVZVzMYynUV8UCUfYVsbCA2dMbimXnQkrd+ JNqtluHNKZSv0JSC7dniUKYv0ajkBW99Cj39eJf9JJhN0v2CdVrHzmT5qR0Sk1uJ X-Gm-Gg: ATEYQzwP+0Np1oRBNklJ+KYbvmHPSZfA4bKp7jcVT3C2hxXSP7LywtLtJow54o2M/ur g9Oj7Hk3Q0Onh/U6Xt90RXaP1crhJGT/qnbHFNwGpslvm9/voocqPrdKnQh6VG6GVllXWqQmfCB SITHh4CDu/iIWdjZbnVk6wm5I2wQQNzerXVFcSiBucmOCCwwSMuRr8eUFpyUDzyOnsfcuK3kObb cM70nyEhcp+RS+6liyuWTE34H2ZS1RHCzZesdbP90a1IEctloUGGQW3sUf7hMAhsihFqiCFLZrE u0PRfMM19PwIRlUxLNpdryWB99m73UE4WxfFQo0IlmWCxR5x2ElXL0X8sEU3gKUJ4wXJIyShyL9 AHmYeEdjr9dP17ux1CetoskrvO3IyyJV7Lfk277PUQIn2GBtEvjPh+WzX6zC4UEw222oHue2C33 CDctWAUpL8NgM5kgFJahjHRp8= X-Received: by 2002:a05:620a:28c6:b0:8ca:3715:eea5 with SMTP id af79cd13be357-8cd6343ac58mr74293785a.14.1772673398455; Wed, 04 Mar 2026 17:16:38 -0800 (PST) Received: from [127.0.0.1] ([51.8.152.229]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cbbf652bb6sm1889467685a.4.2026.03.04.17.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 17:16:37 -0800 (PST) Message-Id: <27d55600071d3479ffe2447ad36a5715d7eb2521.1772673378.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Paul Tarjan via GitGitGadget" Date: Thu, 05 Mar 2026 01:16:17 +0000 Subject: [PATCH v10 11/12] fsmonitor: add tests for Linux Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Patrick Steinhardt , Paul Tarjan , Paul Tarjan , Paul Tarjan From: Paul Tarjan Add a smoke test that verifies the filesystem actually delivers inotify events to the daemon. On some configurations (e.g., overlayfs with older kernels), inotify watches succeed but events are never delivered. The daemon cookie wait will time out, but every subsequent test would fail. Skip the entire test file early when this is detected. Add a test that exercises rapid nested directory creation to verify the daemon correctly handles the EEXIST race between recursive scan and queued inotify events. When IN_MASK_CREATE is available and a directory watch is added during recursive registration, the kernel may also deliver a queued IN_CREATE event for the same directory. The second inotify_add_watch() returns EEXIST, which must be treated as harmless. An earlier version of the listener crashed in this scenario. Reduce --start-timeout from the default 60 seconds to 10 seconds so that tests fail promptly when the daemon cannot start. Harden the test helpers to work in environments without procps (e.g., Fedora CI): fall back to reading /proc/$pid/stat for the process group ID when ps is unavailable, guard stop_git() against an empty pgid, and redirect stderr from kill to /dev/null to avoid noise when processes have already exited. Use set -m to enable job control in the submodule-pull test so that the background git pull gets its own process group, preventing the shell wait from blocking on the daemon. setsid() in the previous commit detaches the daemon itself, but the intermediate git pull process still needs its own process group for the test shell to manage it correctly. Signed-off-by: Paul Tarjan --- t/t7527-builtin-fsmonitor.sh | 89 +++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 7 deletions(-) diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh index 409cd0cd12..774da5ac60 100755 --- a/t/t7527-builtin-fsmonitor.sh +++ b/t/t7527-builtin-fsmonitor.sh @@ -10,9 +10,58 @@ then test_done fi +# Verify that the filesystem delivers events to the daemon. +# On some configurations (e.g., overlayfs with older kernels), +# inotify watches succeed but events are never delivered. The +# cookie wait will time out and the daemon logs a trace message. +# +# Use "timeout" (if available) to guard each step against hangs. +maybe_timeout () { + if type timeout >/dev/null 2>&1 + then + timeout "$@" + else + shift + "$@" + fi +} +verify_fsmonitor_works () { + git init test_fsmonitor_smoke || return 1 + + GIT_TRACE_FSMONITOR="$PWD/smoke.trace" && + export GIT_TRACE_FSMONITOR && + maybe_timeout 30 \ + git -C test_fsmonitor_smoke fsmonitor--daemon start \ + --start-timeout=10 + ret=$? + unset GIT_TRACE_FSMONITOR + if test $ret -ne 0 + then + rm -rf test_fsmonitor_smoke smoke.trace + return 1 + fi + + maybe_timeout 10 \ + test-tool -C test_fsmonitor_smoke fsmonitor-client query \ + --token 0 >/dev/null 2>&1 + maybe_timeout 5 \ + git -C test_fsmonitor_smoke fsmonitor--daemon stop 2>/dev/null + ! grep -q "cookie_wait timed out" "$PWD/smoke.trace" 2>/dev/null + ret=$? + rm -rf test_fsmonitor_smoke smoke.trace + return $ret +} + +if ! verify_fsmonitor_works +then + skip_all="filesystem does not deliver fsmonitor events (container/overlayfs?)" + test_done +fi + stop_daemon_delete_repo () { r=$1 && - test_might_fail git -C $r fsmonitor--daemon stop && + test_might_fail maybe_timeout 30 \ + git -C $r fsmonitor--daemon stop 2>/dev/null rm -rf $1 } @@ -67,7 +116,7 @@ start_daemon () { export GIT_TEST_FSMONITOR_TOKEN fi && - git $r fsmonitor--daemon start && + git $r fsmonitor--daemon start --start-timeout=10 && git $r fsmonitor--daemon status ) } @@ -520,6 +569,28 @@ test_expect_success 'directory changes to a file' ' grep "^event: dir1$" .git/trace ' +test_expect_success 'rapid nested directory creation' ' + test_when_finished "git fsmonitor--daemon stop; rm -rf rapid" && + + start_daemon --tf "$PWD/.git/trace" && + + # Rapidly create nested directories to exercise race conditions + # where directory watches may be added concurrently during + # event processing and recursive scanning. + for i in $(test_seq 1 20) + do + mkdir -p "rapid/nested/dir$i/subdir/deep" || return 1 + done && + + # Give the daemon time to process all events + sleep 1 && + + test-tool fsmonitor-client query --token 0 && + + # Verify daemon is still running (did not crash) + git fsmonitor--daemon status +' + # The next few test cases exercise the token-resync code. When filesystem # drops events (because of filesystem velocity or because the daemon isn't # polling fast enough), we need to discard the cached data (relative to the @@ -910,7 +981,10 @@ test_expect_success "submodule absorbgitdirs implicitly starts daemon" ' start_git_in_background () { git "$@" & git_pid=$! - git_pgid=$(ps -o pgid= -p $git_pid) + git_pgid=$(ps -o pgid= -p $git_pid 2>/dev/null || + awk '{print $5}' /proc/$git_pid/stat 2>/dev/null) && + git_pgid="${git_pgid## }" && + git_pgid="${git_pgid%% }" nr_tries_left=10 while true do @@ -921,15 +995,16 @@ start_git_in_background () { fi sleep 1 nr_tries_left=$(($nr_tries_left - 1)) - done >/dev/null 2>&1 & + done >/dev/null 2>&1 3>&- 4>&- 5>&- 6>&- 7>&- & watchdog_pid=$! wait $git_pid } stop_git () { - while kill -0 -- -$git_pgid + test -n "$git_pgid" || return 0 + while kill -0 -- -$git_pgid 2>/dev/null do - kill -- -$git_pgid + kill -- -$git_pgid 2>/dev/null sleep 1 done } @@ -944,7 +1019,7 @@ stop_watchdog () { test_expect_success !MINGW "submodule implicitly starts daemon by pull" ' test_atexit "stop_watchdog" && - test_when_finished "stop_git; rm -rf cloned super sub" && + test_when_finished "set +m; stop_git; rm -rf cloned super sub" && create_super super && create_sub sub && -- gitgitgadget