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 1mIlbX-0005IY-2B for pgsql-committers@arkaria.postgresql.org; Wed, 25 Aug 2021 05:37:39 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mIlbV-000653-Of for pgsql-committers@arkaria.postgresql.org; Wed, 25 Aug 2021 05:37:37 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mIlbV-00064u-In for pgsql-committers@lists.postgresql.org; Wed, 25 Aug 2021 05:37:37 +0000 Received: from sfr-1.cri.mines-paristech.fr ([77.158.180.225] helo=smtp.cri.ensmp.fr) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mIlbQ-0007nR-BI for pgsql-committers@lists.postgresql.org; Wed, 25 Aug 2021 05:37:36 +0000 Received: from pseudo (unknown [77.237.123.26]) by smtp.cri.ensmp.fr (Postfix) with ESMTPSA id 0D69FC001C; Wed, 25 Aug 2021 07:39:45 +0200 (CEST) Date: Wed, 25 Aug 2021 07:37:22 +0200 (CEST) From: Fabien COELHO X-X-Sender: fabien@pseudo To: Tom Lane cc: Peter Eisentraut , Daniel Gustafsson , pgsql-committers@lists.postgresql.org Subject: Re: pgsql: psql: Add test for query canceling In-Reply-To: <350197.1629824350@sss.pgh.pa.us> Message-ID: References: <5F16EBAA-30D3-4C0D-840C-C2FF2739E370@yesql.se> <1957503.1629485278@sss.pgh.pa.us> <9f46b102-da4d-8312-54f0-1f3bc10b453c@enterprisedb.com> <350197.1629824350@sss.pgh.pa.us> User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="2056645051-1470851270-1629869849=:2232211" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --2056645051-1470851270-1629869849=:2232211 Content-Type: text/plain; charset=US-ASCII; format=flowed > That looks pretty solid to me, and I can confirm that it passes > on wrasse's host. The only nit I can find to pick is that this: > > + usleep(10_000) until -s "$tempdir/psql.pid" or ($count++ > 180 * 100 and die 'pid file did not appear'); > > basically assumes that psql.pid will be written atomically. > It'd be marginally safer to wait till psql.pid can be seen to > contain a newline. I don't think that would be too hard to do, > if you put the slurp_file call inside the wait loop and inspect > its result. I finally came around to have a look at the patch. For the issue raised above, I can see that the file could be created but not yet written, but as the patch waits for the file to be non zero, ISTM that the probability of a torn write of a single integer by echo is so remote that we could let it as that? Attached a version with the slurping in the loop anyway. -- Fabien. --2056645051-1470851270-1629869849=:2232211 Content-Type: text/x-diff; name=0001-Make-psql-cancel-test-more-timing-robust-2.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=0001-Make-psql-cancel-test-more-timing-robust-2.patch ZGlmZiAtLWdpdCBhL3NyYy9iaW4vcHNxbC90LzAyMF9jYW5jZWwucGwgYi9z cmMvYmluL3BzcWwvdC8wMjBfY2FuY2VsLnBsDQppbmRleCA3NzEzZmZmOGU0 Li41NDVjZTU3ZWFkIDEwMDY0NA0KLS0tIGEvc3JjL2Jpbi9wc3FsL3QvMDIw X2NhbmNlbC5wbA0KKysrIGIvc3JjL2Jpbi9wc3FsL3QvMDIwX2NhbmNlbC5w bA0KQEAgLTcsNiArNyw3IEBAIHVzZSB3YXJuaW5nczsNCiB1c2UgUG9zdGdy ZXNOb2RlOw0KIHVzZSBUZXN0TGliOw0KIHVzZSBUZXN0OjpNb3JlIHRlc3Rz ID0+IDI7DQordXNlIFRpbWU6OkhpUmVzIHF3KHVzbGVlcCk7DQogDQogbXkg JHRlbXBkaXIgPSBUZXN0TGliOjp0ZW1wZGlyOw0KIA0KQEAgLTI4LDE5ICsy OSwzNSBAQCBTS0lQOiB7DQogCW15ICgkc3RkaW4sICRzdGRvdXQsICRzdGRl cnIpOw0KIA0KIAkjIFRlc3Qgd2hldGhlciBzaGVsbCBzdXBwb3J0cyAkUFBJ RC4gIEl0J3MgcGFydCBvZiBQT1NJWCwgYnV0IHNvbWUNCi0JIyBwcmUtL25v bi1QT1NJWCBzaGVsbHMgZG9uJ3Qgc3VwcG9ydCBpdCAoZS5nLiwgTmV0QlNE LCBTb2xhcmlzKS4NCisJIyBwcmUtL25vbi1QT1NJWCBzaGVsbHMgZG9uJ3Qg c3VwcG9ydCBpdCAoZS5nLiwgTmV0QlNEKS4NCiAJJHN0ZGluID0gIlxcISBl Y2hvIFwkUFBJRCI7DQogCUlQQzo6UnVuOjpydW4oWydwc3FsJywgJy1YJywg Jy12JywgJ09OX0VSUk9SX1NUT1A9MSddLCAnPCcsIFwkc3RkaW4sICc+Jywg XCRzdGRvdXQsICcyPicsIFwkc3RkZXJyKTsNCiAJJHN0ZG91dCA9fiAvXlxk KyQvIG9yIHNraXAgInNoZWxsIGFwcGFyZW50bHkgZG9lcyBub3Qgc3VwcG9y dCBcJFBQSUQiLCAyOw0KIA0KLQlsb2NhbCAkU0lHe0FMUk19ID0gc3ViIHsN Ci0JCW15ICRwc3FsX3BpZCA9IFRlc3RMaWI6OnNsdXJwX2ZpbGUoIiR0ZW1w ZGlyL3BzcWwucGlkIik7DQotCQlraWxsICdJTlQnLCAkcHNxbF9waWQ7DQot CX07DQotCWFsYXJtIDE7DQotDQotCSRzdGRpbiA9ICJcXCEgZWNobyBcJFBQ SUQgPiR0ZW1wZGlyL3BzcWwucGlkXG5zZWxlY3QgcGdfc2xlZXAoMyk7IjsN Ci0JbXkgJHJlc3VsdCA9IElQQzo6UnVuOjpydW4oWydwc3FsJywgJy1YJywg Jy12JywgJ09OX0VSUk9SX1NUT1A9MSddLCAnPCcsIFwkc3RkaW4sICc+Jywg XCRzdGRvdXQsICcyPicsIFwkc3RkZXJyKTsNCisJIyBOb3cgc3RhcnQgdGhl IHJlYWwgdGVzdA0KKwlteSAkaCA9IElQQzo6UnVuOjpzdGFydChbJ3BzcWwn LCAnLVgnLCAnLXYnLCAnT05fRVJST1JfU1RPUD0xJ10sIFwkc3RkaW4sIFwk c3Rkb3V0LCBcJHN0ZGVycik7DQorDQorCSMgR2V0IHRoZSBQSUQNCisJJHN0 ZG91dCA9ICcnOw0KKwkkc3RkZXJyID0gJyc7DQorCSRzdGRpbiA9ICJcXCEg ZWNobyBcJFBQSUQgPiR0ZW1wZGlyL3BzcWwucGlkXG4iOw0KKwlwdW1wICRo IHdoaWxlIGxlbmd0aCAkc3RkaW47DQorCW15ICRjb3VudDsNCisJbXkgJHBz cWxfcGlkOw0KKwl1c2xlZXAoMTBfMDAwKQ0KKwkgIHVudGlsICgtcyAiJHRl bXBkaXIvcHNxbC5waWQiIGFuZCAoJHBzcWxfcGlkID0gVGVzdExpYjo6c2x1 cnBfZmlsZSgiJHRlbXBkaXIvcHNxbC5waWQiKSkgPX4gL15cZCtcbi9zKQ0K KwkJIG9yICgkY291bnQrKyA+IDE4MCAqIDEwMCBhbmQgZGllICdwaWQgZmls ZSBkaWQgbm90IGFwcGVhcicpOw0KKw0KKwkjIFNlbmQgc2xlZXAgY29tbWFu ZCBhbmQgd2FpdCB1bnRpbCB0aGUgc2VydmVyIGhhcyByZWdpc3RlcmVkIGl0 DQorCSRzdGRpbiA9ICJzZWxlY3QgcGdfc2xlZXAoMTgwKTtcbiI7DQorCXB1 bXAgJGggd2hpbGUgbGVuZ3RoICRzdGRpbjsNCisJJG5vZGUtPnBvbGxfcXVl cnlfdW50aWwoJ3Bvc3RncmVzJywgcXtTRUxFQ1QgKFNFTEVDVCBjb3VudCgq KSBGUk9NIHBnX3N0YXRfYWN0aXZpdHkgV0hFUkUgcXVlcnkgfiAncGdfc2xl ZXAnKSA+IDA7fSkNCisJICBvciBkaWUgInRpbWVkIG91dCI7DQorDQorCSMg U2VuZCBjYW5jZWwgcmVxdWVzdA0KKwlraWxsICdJTlQnLCAkcHNxbF9waWQ7 DQorDQorCW15ICRyZXN1bHQgPSBmaW5pc2ggJGg7DQogDQogCW9rKCEkcmVz dWx0LCAncXVlcnkgZmFpbGVkIGFzIGV4cGVjdGVkJyk7DQogCWxpa2UoJHN0 ZGVyciwgcXIvY2FuY2VsaW5nIHN0YXRlbWVudCBkdWUgdG8gdXNlciByZXF1 ZXN0LywgJ3F1ZXJ5IHdhcyBjYW5jZWxlZCcpOw0K --2056645051-1470851270-1629869849=:2232211--