From nobody Sat May 09 18:52:41 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 4gCZqY38s8z6cMHG for ; Sat, 09 May 2026 18:52:41 +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 4gCZqY0g55z3VZ6 for ; Sat, 09 May 2026 18:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352761; 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=gwFgJYgRMmuObm1AxCvBuqXveflQLJdcQID+ExH3M1I=; b=rStQdQOjx8PajGMjENyrfpfbVhUGZfjfRq3WMO1UXlO/ZEDoXMo3ZYFfDrcQtbwctzL8M4 JOKjjHuB8mWMDEq2Dgt237Hnz/87wuQhPFvJD5j2t7TmQQADSjMN8nWa6o98mGK0KiMGiR +2aJc3bkSRK6hoSjCX9XJ4eDmnUVThYACBaa7lXqGWnT+XtWVF060t6x0FBuC6nFuL+2A6 7Dc+cTt+9CvU1o586/PdlywaU/QqsMtXTw4QUd2jG3VfjMOH44Y/AUafjuup866jj5S3g9 UW+RqsKleI04kEI8jPY2xSz9csleQMy8neWSlxmaGppRjCrJbMowb3YgpkdX0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778352761; a=rsa-sha256; cv=none; b=nfwpp2kkcrgSDh9SUu+rZNjR8usg8Blf7NG0ieS43yGVcWD8sfc4k52aegoHK5Jej79TGR soOdtQaOQ/MrrsC6ye8KODF/7WeMvUPI8IiLha6BtMW8bhshtvbATGDR/jt/Kb/PdskPEE 32blCidH/nl0G05W8xfs2xv+uw1A/PVMlKDqkMjcxggJ3FzqVqMRT9kL1Yus7iy7vtgdQA DHuqY1bNEVud3VaSugKj8jU18mLTn/kP7rM68lynyXzhMtW18tVAf/V4lNsrw7VsV2psN4 V8W83nUJDRhe1nvP7S44g/ydyAe1h1POQIEilIu8gckjcy9fg7F1noZBbl32Uw== 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=1778352761; 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=gwFgJYgRMmuObm1AxCvBuqXveflQLJdcQID+ExH3M1I=; b=wBuvrfk7pocDt5jzb5lzfzT5RzbzITfj7g9+vGtZYD7b1SsEZP762xkS7ShYGWQRlpRvHt f4oIfGHXflO9XXqK4rs3X/aYDt2u+CILydiMI4BzcWRpdrcMFRUSCLfLuMbXU2jlypzZVv UPoxC2NSij5s6xRPlxVLtBD1ByJgtNuCb0uaGIwA5BIWNSa3vUwb8J2bfArarEktYudC5E orq2p3EPfjoQoT0dHEtwU/27QyfpMJenxtjDv1QajH7i+eKtkRrZUxhtGMpHtJ4PfygudC WZGMM7M7FmQWOasvXljZDyl/2a4sc2AOJxz37qqapxtCGHob0KaTlk68yVAOcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqY03s4z19yj for ; Sat, 09 May 2026 18:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4632d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 18:52:41 +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: ad2fff6d6a4d - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ad2fff6d6a4d74b6bb9008e447eafc567e8660e0 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 18:52:41 +0000 Message-Id: <69ff8279.4632d.49abbea9@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ad2fff6d6a4d74b6bb9008e447eafc567e8660e0 commit ad2fff6d6a4d74b6bb9008e447eafc567e8660e0 Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:41:19 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-09 18:51:12 +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) --- 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