From nobody Thu Dec 4 18:52:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMkC66qwmz6JnZF for ; Thu, 04 Dec 2025 18:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMkC64T61z3jK5 for ; Thu, 04 Dec 2025 18:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764874338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EoBztBwJGWe8QX/eUS5QNsakzjx4Y170Hsb2zoa9uqo=; b=otk8776q8FBaO5sp6VUPOYzmHjjFeYeAeR2ZNw79Bc08uH1kRIU1gKvPbXJYkR0cbr98/P WT66yXKYSAjlwr79a7T2HVvvK2NHQ2HDzFwJ896f1+T4mwmdz33TcDQ+6POEKWtIAxBFLY ZxwfEz90N3GsSiMV4IgwywELq3IvOajTkJotKvhXGE5bx8Ks69Kkbsf+fWsEcFWROc5lKc ecRqduiMGCyutWTeJ8ZlDvSMPNrTIR2mvlNfUAawBGJlEkioTXjslbfmMQdyaVFUe6Bwun K71OfiAonbVkKOlKs1p5WswJp55uo9eqhY+i1olzEdd+AAJOi12l3FV0WX3p5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764874338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EoBztBwJGWe8QX/eUS5QNsakzjx4Y170Hsb2zoa9uqo=; b=rnsd4RcRQGl1HQvSBLFsnrAmj13pxcrCK+Sqp7yIaYXI3f/t63zd44Z5yX5lVmvgjLcAgi dimY4qLLU/KTAMuAE3RnjkWrVaBfKAddyxlwM6ZTf1qV70sqFZQ02ufL2BCOS/YvQkzzud VRSVbVGd+2hqjpDubAA/2CzEYM2hbvd95tlUiFlH28+YUVamYHKn93KEFfYM0ARdXoFOI2 XOzlhTarUVzbDXoINgXFkmX1j4F+0ugxoWhtXY0H5l0C2Unnsr9Gkduvw3hxHjxmjskdKz D8+z4fF7TN41VUVdNhV5COh2izi+DVPWJqNs4Yt4keVJ4R5I/HCNLjUegjsRBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764874338; a=rsa-sha256; cv=none; b=hdM1Fg8/KGzf30SUeSYsDdqM90y8lksz72h3drnHBRWxzRlud6vGzcmoIqN7p9zGHZ2UDN 61EgLiD0qljR8P9qioBVPQW1J2h0hP5j7+GRjqLwdrx+A7sVIW3rp15o1sSZ4+YcIREYf5 4XgJtsdftnu3yE9RkWNlqye0MKK3jVdLmQBvHU3bX53FA18ECveTALQ/8Vn6JC1ME9d17G 8hqYJeFRL6+zHIkcgUoQR9ut4qdlbAMpGJ9xghOL4sD4Ccg3W1cVdIlO0hfRmZo4f3OdkQ TAWiiw6utkzpqYr0t3mREZXd0nkZ8tOmI2vm6sP0c3VnnEJvW9emrP9nCQDaTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMkC643txzcjY for ; Thu, 04 Dec 2025 18:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e42e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 18:52:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 27ff90cd3d8d - main - tests/carp: make a 0.2 second pause before configuring second jail List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 18:52:18 +0000 Message-Id: <6931d862.e42e.f5cefaa@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc commit 27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:41:19 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-04 18:52:01 +0000 tests/carp: make a 0.2 second pause before configuring second jail for all scenarios where both jails have same priority/advskew. There is a tiny chance that on both sides carp_master_down() will be executed in parallel and advertisements will also fly through the bridge(4) in parallel, thus both sides will switch to MASTER before receiving the announcement from peer. This makes the test to fail. So far this flakyness was observed for carp:vrrp_v4 only, but in theory it is possible for any of the patched scenarios. Note that this sleep does not prolong execution of the tests, as the first jail is already configured, and if we slept before configuring the second, we would sleep less in wait_for_carp(). --- tests/sys/netinet/carp.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index a9c99a7d701f..90ed9d6f9baf 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -90,6 +90,7 @@ basic_v4_body() jexec carp_basic_v4_two ifconfig ${epair_one}b 192.0.2.202/29 up jexec carp_basic_v4_two ifconfig ${epair_one}b add vhid 1 192.0.2.1/29 + sleep 0.2 jexec carp_basic_v4_three ifconfig ${epair_two}b 192.0.2.203/29 up jexec carp_basic_v4_three ifconfig ${epair_two}b add vhid 1 \ 192.0.2.1/29 @@ -137,6 +138,7 @@ vrrp_v4_body() jexec ${j}_two ifconfig ${epair_one}b 192.0.2.202/29 up jexec ${j}_two ifconfig ${epair_one}b add vhid 1 carpver 3 192.0.2.1/29 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b 192.0.2.203/29 up jexec ${j}_three ifconfig ${epair_two}b add vhid 1 carpver 3 \ 192.0.2.1/29 @@ -182,6 +184,7 @@ unicast_v4_body() jexec carp_uni_v4_two ifconfig ${epair_one}b add vhid 1 \ peer 198.51.100.224 192.0.2.1/32 + sleep 0.2 jexec carp_uni_v4_three sysctl net.inet.ip.forwarding=1 jexec carp_uni_v4_three ifconfig ${epair_two}b 198.51.100.224/25 up jexec carp_uni_v4_three route add 198.51.100.2 198.51.100.129 @@ -253,6 +256,7 @@ basic_v6_body() jexec carp_basic_v6_two ifconfig ${epair_one}b inet6 add vhid 1 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 2001:db8::1:3/64 up no_dad jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 add vhid 1 \ 2001:db8::0:1/64 @@ -303,6 +307,7 @@ vrrp_v6_body() jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 carpver 3 \ 2001:db8::0:1/64 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b inet6 2001:db8::1:3/64 up no_dad jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 carpver 3 \ 2001:db8::0:1/64 @@ -358,6 +363,7 @@ unicast_v6_body() peer6 2001:db8:2::2 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 2001:db8:2::2/64 \ no_dad up jexec carp_uni_v6_three route -6 add default 2001:db8:2::1 @@ -423,6 +429,7 @@ unicast_ll_v6_body() jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 \ peer6 ${ll_two} \ 2001:db8::0:1/64 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 \ peer6 ${ll_one} \ 2001:db8::0:1/64