Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nka15-0006hS-1s for pgsql-hackers@arkaria.postgresql.org; Fri, 29 Apr 2022 23:27:15 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1nka12-0001wC-Nl for pgsql-hackers@arkaria.postgresql.org; Fri, 29 Apr 2022 23:27:12 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nka12-0001uz-EG for pgsql-hackers@lists.postgresql.org; Fri, 29 Apr 2022 23:27:12 +0000 Received: from sss.pgh.pa.us ([66.207.139.130]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nka0v-0001BF-Es for pgsql-hackers@postgresql.org; Fri, 29 Apr 2022 23:27:11 +0000 Received: from sss1.sss.pgh.pa.us (localhost [127.0.0.1]) by sss.pgh.pa.us (8.15.2/8.15.2) with ESMTP id 23TNQxbL465686; Fri, 29 Apr 2022 19:26:59 -0400 From: Tom Lane To: Andres Freund cc: Robert Haas , pgsql-hackers@postgresql.org, Thomas Munro Subject: Re: failures in t/031_recovery_conflict.pl on CI In-reply-to: <20220429200809.uuuseakmhb57sppk@alap3.anarazel.de> References: <20220409045515.35ypjzddp25v72ou@alap3.anarazel.de> <20220409050501.frejv2i46m54keem@alap3.anarazel.de> <20220409220054.fqn5arvbeesmxdg5@alap3.anarazel.de> <20220409231002.mddrr7mtca7p55v5@alap3.anarazel.de> <20220409233107.v7okovwr46xsizfk@alap3.anarazel.de> <5111.1649547266@sss.pgh.pa.us> <20220412184913.3wrt4olkdiqvicsj@alap3.anarazel.de> <907760.1649790322@sss.pgh.pa.us> <20220413002626.udl7lll7f3o7nre7@alap3.anarazel.de> <20220429200809.uuuseakmhb57sppk@alap3.anarazel.de> Comments: In-reply-to Andres Freund message dated "Fri, 29 Apr 2022 13:08:09 -0700" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <465684.1651274819.1@sss.pgh.pa.us> Content-Transfer-Encoding: quoted-printable Date: Fri, 29 Apr 2022 19:26:59 -0400 Message-ID: <465685.1651274819@sss.pgh.pa.us> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk Andres Freund writes: > Questions: > - I'm planning to backpatch the test as 031_recovery_conflict.pl, even t= hough > preceding numbers are unused. It seems way more problematic to use a > different number in the backbranches than have gaps? +1 > - The test uses pump_until() and wait_for_log(), which don't exist in th= e > backbranches. For now I've just inlined the implementation, but I gues= s we > could also backpatch their introduction? I'd backpatch --- seems unlikely this will be the last need for 'em. > pgindent uses some crazy formatting nearby: > SendRecoveryConflictWithBufferPin( > PROCSIG_RECOVERY_CONFLICT_STAR= TUP_DEADLOCK); I do not believe that that line break is pgindent's fault. If you just fold it into one line it should stay that way. regards, tom lane