From nobody Sun May 10 06:27:15 2026 X-Original-To: dev-commits-src-all@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 4gCtF44dhrz6bJCH for ; Sun, 10 May 2026 06:27:20 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCtF4354gz4GmW for ; Sun, 10 May 2026 06:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=scmeMR6u+ELrBOF2dajfIK1azZ2Q23ZzMohdUUUvQLs=; b=xzpYfMikuZH4DaFUtkO2j+xnU5ELON2h1Sldc2SH6K5aedlkC06//9hTxJD8p4iAZBbzL5 RtIsnOmZKrYm/8j7sp9hg6mk8hINEZoVz+NP7mHDjZPalToiiXLLtDYCSbqaitY5GmmI64 tmN0caqE5lY/QS+hUajYtyJj+6N3f5FyI/yZlyhy7ug8zjwrvVTKbysCrsdQ/k7VtcITpG rAPAmFXWFjKFoUqShBfeN6EVXzszkCA1Bc935c+pPRCMjnzZT3xjLJPO65P3UPpi0Y5zFz yu4N7APS8OmryWV1KoCVxu2tg2eKWppHEMOmkuq6tSPIq5i9N6W/PPqPRSprmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778394440; a=rsa-sha256; cv=none; b=XXhdLkPYqYSfM6b9YXs8v+lpqi4iulr+ShaxPE9U36smMX0z8QX9wufZqIs5LtUpN8QZa9 osUfY6DgqN/n8AG0TDwPF/nXtuZjhOX5wEN7c8FeMhnEPHqRb8GyR+GxvaeLuz7HRifcjj NxKfsvXXZgmHNQ4iJCH5VevOhispPioNVZ86+9ieB/HePbiqlaTl7/IDiYe+I9CKCRAPCa /hz59DBkjx2cvby3p4EPVWyDPbSP14nn90GXQFIyewyOUBRH+s1K4jN3LoZHrk7spGqtDL iCLiw09qKx8kOgT0aM0z4UtfU7jR2WE/rqalpcj+iR1lGfjeZJ+htGJGQsx7gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=scmeMR6u+ELrBOF2dajfIK1azZ2Q23ZzMohdUUUvQLs=; b=gle//DeXs5I5dqEFOLZLArd4JCioucZYKlREnn2JlfasVYchMPQWX9tkPnSzHzuaJgKLwj RMGRP0veHjv5Vdh84Jfy3OFbvDtjvPAxgIsdz5hGI/B35mHkk0EZISg+UssHzl5Dvh64r4 AuE7D3uX4ZsEHawKPL5fWs9boK6JdxlI5FGUw3ZC48Tz0t7IITIUykS70W6tQaPOlCEc6c l+ckKzbjwYbI/MR9/fM7InJde0sqqd+r4k6GZHrORNH1zKAALi4eRRlXwk84V2voupKxBf k6wce5RvjRqo31d2WU5bDx4yRufV48hBFMpXg8EEGwiQbOAe1vyxvSHLvzK/og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCtF42WhTz3F7 for ; Sun, 10 May 2026 06:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18dbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 06:27:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: 1f8eae9a7a45 - stable/14 - tests/carp: make a 0.2 second pause before configuring second jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f8eae9a7a45f3e816b112ae3e7cf19ece1a5b98 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 06:27:15 +0000 Message-Id: <6a002543.18dbe.1ef88af1@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1f8eae9a7a45f3e816b112ae3e7cf19ece1a5b98 commit 1f8eae9a7a45f3e816b112ae3e7cf19ece1a5b98 Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:41:19 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-10 06:25:56 +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(). (cherry picked from commit 27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc) (cherry picked from commit ad2fff6d6a4d74b6bb9008e447eafc567e8660e0) --- tests/sys/netinet/carp.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 4d58bcf03c12..4fc682f14449 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 @@ -135,6 +136,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 @@ -206,6 +208,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 @@ -261,6 +264,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 @@ -326,6 +330,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