From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (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 F242E393DFC for ; Mon, 6 Apr 2026 17:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775498120; cv=none; b=UMqKgzxOja6iJlSYelfYbW6baOrU+SGmtsf0NGUx8ie9OHVizFU5QNj2x7DEm3HWuQizCqAhHsRAKL2kEqFxAE6EujXXmQXseTkUxWBluxlq3bfD06Khyjha6bBzjCgzX6zMRYwH9MEojElD3fLoPKpxQzvDc1tnnj3wzgzczh0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775498120; c=relaxed/simple; bh=UccY8KkQmmzRVJjPmUNw0+5cfcnWQd4PGNhkKpKIa64=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=HK40sINGO99gLZ8K+nLEPwoYQWWNvIMw+aBi2iHYAJfEk9gHTxCnnZLqUKvaAReWEFEn/PxTWOYK1f5u9YMSdtJyc3HxsgaQ2zWSM5pvNcxx9pxxKJGGNb2iR+vuHoON8ab8Xt/kuBT+z4QkSfDp0ZGiOcg/oUuK7N5ijpJEhXk= 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=BUCYtcaA; arc=none smtp.client-ip=74.125.82.182 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="BUCYtcaA" Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-2c15849aa2cso5269331eec.0 for ; Mon, 06 Apr 2026 10:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775498118; x=1776102918; 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=BUCYtcaARIH4+PO/A+u4OTwnTjLfZz9ihTX+fQnnXe+PTRRKUv8pdFpk6zAzP/r3+I dZVzWm5H8lR42k+Lv8+IqqwqoRG1ZMt6ChanpixacEeGlEEprtBUZI9y6uwMS9255SvB 5Inj8jxtKxSVQXL0R6ZiMQS18u6gtL7jRXSS0sp5IxP/Q+ucF/Q8F2IcybPez/FoBOZM 3U12NsvKgmlaQa0SJMfLpwwbKZCIpCNa3pF/o6IFzCbRJNilVWr2hCX+Q+58twSxKEzT geXLyUiWKxz6lqqruVozK94l45qrsVj7lLePupsP/mDvUFhlm2+dsq2SQ0XaLgjmMrMZ nfFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775498118; x=1776102918; 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=HO7LpazlXQaOoFM0L9lcci3HoRZFp5VyVI+F13zfU2OOx5QhOu0IPPRRcXDZ4PJhpN j7Yvo0lHFGXfT4+UdaIGnacxLKaee/yDTE9UCV9myWIqIRcsqfgKlQKaIkYujKqqnhdV 9HEa8OmpH7bwqjNCsU5joHPCZIBL3ZjOwnlgAJc60iOZyGKAmMz4YrMSxmzaqBojCJOC cee11eAxklLKaG9tdL4tZrIbaldMeQvOtYU/O5I3oIBBilSdQBynAXxpkRl9bpm1BaaX hBlHfI2Z1yL+WJI1qb8jHglfjZRRAm0kSLLKTt1iCk02XK7AoTwXbTs6zI2DXxmpyjx1 8eHA== X-Gm-Message-State: AOJu0Yzbxy7h6e2A71kOKNpNwZdcOS/lLZSHt4kguuo46TBgr0cLI0xG /uNltTsKMZHeBdDWxgTvVk+ttf0jiFmg6//WMjKj36I8bKPJZBZwu1GrtqdfAg== X-Gm-Gg: AeBDiesmUIXfCZFKvy44NRb3raz76gNLUaQn8EbAwkl8Fu7XRFhLFFD4y9r+1BzYEfa ANQTmPG9KSTjdwZ8nEDNLap0fQWI+pKCb7SJhHLUTMAGJv1OYSFZ0SsiJw3m4lJY3YFsPNmsWgK ZHjpNbzUebFju5I5CkBPaKPjFSuibP1R39wilHyoykdRWSHcUBrrykPRtKk8Cp2W1zFWyaoK00B Y1xhO9NLW2XGdHhFf0P7/s5+NdFdGC2fdKyXXoHCPvDqjNbzueCx3gBamH/2WafZHOIgNtR1RxQ UxQhU9SxWzZoahPEOogkYmHGGGWvSfObU1s9AjDp+E1FR7A4KBtXqGNkPS3eGewM2WahJRAiIx8 2Yg/t/GANhQXuJz9a7PKfWMnrp6i+ZuVKRlkodfhsAksdpIjXY4gG0c08K0gypiv0sxz6/+YUc5 gNJemvoAFt96BltRxie5bqHzAlKdAi1VCeFsOWhA== X-Received: by 2002:a05:7301:9bcc:b0:2c8:fe46:eeb6 with SMTP id 5a478bee46e88-2cbfb99005bmr6912120eec.16.1775498117428; Mon, 06 Apr 2026 10:55:17 -0700 (PDT) Received: from [127.0.0.1] ([57.151.128.242]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2cf2be19f85sm5924794eec.30.2026.04.06.10.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 10:55:16 -0700 (PDT) Message-Id: <9a8647884e4106b13da8e9b628969244a57370d4.1775498098.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Paul Tarjan via GitGitGadget" Date: Mon, 06 Apr 2026 17:54:57 +0000 Subject: [PATCH v13 12/13] 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