Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xQPJG-000000004dh-45RY for pgsql-bugs@arkaria.postgresql.org; Mon, 09 Nov 2026 13:21:19 +0000 Received: from localhost ([127.0.0.1]:59626 helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.98.2) (envelope-from ) id 1xQPJF-00000001EGN-2ZTM for pgsql-bugs@arkaria.postgresql.org; Mon, 09 Nov 2026 13:21:17 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]:43200) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xQPHb-00000001Cau-2Zlx for pgsql-bugs@lists.postgresql.org; Mon, 09 Nov 2026 13:19:36 +0000 Received: from mail.zonezero.se ([46.246.30.157]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xQPHY-0000000022O-3ZkW for pgsql-bugs@lists.postgresql.org; Mon, 09 Nov 2026 13:19:35 +0000 Received: from mail.zonezero.se (unknown [10.100.2.1]) by mail.zonezero.se (Postfix) with ESMTPS id BF16F941; Mon, 9 Nov 2026 14:19:29 +0100 (CET) Received: from webmail.zonezero.se (localhost.localdomain [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.zonezero.se (Postfix) with ESMTPSA id 3D527120356; Mon, 9 Nov 2026 14:19:29 +0100 (CET) Authentication-Results: ORIGINATING; auth=pass smtp.auth=admin@zonezero.se smtp.mailfrom=jesper@stjohn.se MIME-Version: 1.0 Date: Mon, 09 Nov 2026 14:19:29 +0100 From: Jesper St John To: Kirill Reshke Cc: pgsql-bugs@lists.postgresql.org Subject: Re: Timing issue in pg_basebackup In-Reply-To: References: <4417791388e8f1df20f64013e944be8e@stjohn.se> Message-ID: <80143a07e6732576c9f815a3058fa31d@stjohn.se> X-Sender: jesper@stjohn.se Content-Type: multipart/mixed; boundary="=_d3923359594cdd054b225e7d6c1eeb98" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=_d3923359594cdd054b225e7d6c1eeb98 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Added this patch to the CF app. Made it into one and rebased it. //Jesper On 2026-10-22 07:44, Kirill Reshke wrote: > On Wed, 21 Oct 2026 at 22:16, Jesper St John wrote: >> >> On 2026-10-20 23:11, Kirill Reshke wrote: > >> > >> >> I've included a patch that moves the replication slot handing to run >> >> before the backup part as a separate function. >> >> >> >> Some possible caveats already: >> >> * Since moving the slot creation, we might run in to trouble if for >> >> example, --checkpoint=spread is used since the slot is open for >> >> longer. >> >> * If any error arises in the backup part, now there will be a >> >> lingering >> >> slot when previously no slot was created. >> > >> > lingering slots looks like a real regression here. can we remove them >> > when basebackup client disconnects? >> >> A lingering slot could also happen today - only with this patch >> there's >> a higher risk of it happening. > > Higher risk of lingering slots is also a regression. But looks like > this risk is anyway close to zero. > >> Would some cleanup code in a function and use it with atexit() work? > > Something like this should do, can be made a separate patch thought > >> > >> > NIT: comment in PrepareLogStreamer loses its meaning after code motion: >> > >> > + /* Get a second connection */ >> > + bgconn = GetConnection(); >> > >> >> I've moved the code to its own function - the comment were there >> already. >> > > Yep, the point is It looks very out-of-context here. Like, the first > line of the function says we're taking a second connection. Second to > what (to basebackup)? Maybe rephrase here as 'Get a wal-serving > connection' or something. --=_d3923359594cdd054b225e7d6c1eeb98 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=v3-0001-pg_basebackup-Create-the-WAL-streaming-slot-befor.patch Content-Disposition: attachment; filename=v3-0001-pg_basebackup-Create-the-WAL-streaming-slot-befor.patch; size=13392 RnJvbSBmYzk1ZGQwNjdmMzE2OTEzYThlMGY3NWRjYTYzYzRkY2YzYmRlMGEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXNwZXIgU3QgSm9obiA8amVzcGVyQHN0am9obi5zZT4KRGF0 ZTogTW9uLCAxOSBPY3QgMjAyNiAxNTozNTo1OSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggdjNdIHBn X2Jhc2ViYWNrdXA6IENyZWF0ZSB0aGUgV0FMIHN0cmVhbWluZyBzbG90IGJlZm9yZQogc3RhcnRp bmcgdGhlIGJhY2t1cAoKV2l0aCAtLXdhbC1tZXRob2Q9c3RyZWFtLCBwZ19iYXNlYmFja3VwIGNy ZWF0ZWQgaXRzIHJlcGxpY2F0aW9uIHNsb3Qgb25seQphZnRlciBCQVNFX0JBQ0tVUCBoYWQgcmV0 dXJuZWQgdGhlIGJhY2t1cCdzIHN0YXJ0IHBvc2l0aW9uLiAgQSBjaGVja3BvaW50CnJ1bm5pbmcg aW4gYmV0d2VlbiBjb3VsZCByZW1vdmUgV0FMIGZyb20gdGhhdCBwb3NpdGlvbiBvbndhcmRzLCBh bmQgdGhlCmJhY2t1cCB0aGVuIGZhaWxlZCB3aXRoICJyZXF1ZXN0ZWQgV0FMIHNlZ21lbnQgLi4u IGhhcyBhbHJlYWR5IGJlZW4KcmVtb3ZlZCIuCgpPcGVuIHRoZSBXQUwgc3RyZWFtaW5nIGNvbm5l Y3Rpb24gYW5kIGNyZWF0ZSBpdHMgc2xvdCBiZWZvcmUgc2VuZGluZwpCQVNFX0JBQ0tVUCwgcmF0 aGVyIHRoYW4gYWZ0ZXIgaXQgaGFzIHJldHVybmVkIHRoZSBzdGFydCBwb3NpdGlvbiwgc28gdGhl CnNsb3QgcmVzZXJ2ZXMgYWxsIHRoZSBXQUwgdGhlIGJhY2t1cCBuZWVkcy4gIEFkZCBhIG5ldyBU QVAgdGVzdCB0aGF0IHVzZXMKYW4gaW5qZWN0aW9uIHBvaW50IHRvIGhvbGQgc2xvdCBjcmVhdGlv biB3aGlsZSBXQUwgaXMgYWR2YW5jZWQgYW5kIGEKY2hlY2twb2ludCBpcyBydW4uCgpSZWdpc3Rl ciBhbiBhdGV4aXQgaGFuZGxlciwgb25jZSB0aGUgc2xvdCBoYXMgYmVlbiBjcmVhdGVkLCB0aGF0 IGRyb3BzCml0IGlmIHBnX2Jhc2ViYWNrdXAgZXhpdHMgYmVmb3JlIHRoZSBiYWNrZ3JvdW5kIFdB TCByZWNlaXZlciBoYXMgdGFrZW4Kb3ZlciB0aGUgY29ubmVjdGlvbi4KCkFkZCB0ZXN0cyB0byBl eGlzdGluZyAwMTBfcGdfYmFzZWJhY2t1cC5wbCB0aGF0IHVzZSBhIGJvZ3VzCi0tbWFuaWZlc3Qt Y2hlY2tzdW1zIHZhbHVlIHRvIGZhaWwgQkFTRV9CQUNLVVAgYWZ0ZXIgdGhlIHNsb3QgaGFzIGJl ZW4KY3JlYXRlZCwgYW5kIGNoZWNrIHRoYXQgb25seSB0aGUgbmV3IHNsb3QgaXMgZHJvcHBlZC4K LS0tCiBzcmMvYmluL3BnX2Jhc2ViYWNrdXAvTWFrZWZpbGUgICAgICAgICAgICAgICAgfCAgIDQg Ky0KIHNyYy9iaW4vcGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZCAgICAgICAgICAgICB8ICAgMiAr CiBzcmMvYmluL3BnX2Jhc2ViYWNrdXAvcGdfYmFzZWJhY2t1cC5jICAgICAgICAgfCAxMTkgKysr KysrKysrKysrKy0tLS0tCiBzcmMvYmluL3BnX2Jhc2ViYWNrdXAvdC8wMTBfcGdfYmFzZWJhY2t1 cC5wbCAgfCAgNDIgKysrKysrKwogLi4uL3BnX2Jhc2ViYWNrdXAvdC8wMTNfd2FsX3Nsb3RfdGlt aW5nLnBsICAgIHwgIDgyICsrKysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCAyMTQgaW5zZXJ0 aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjL2Jpbi9wZ19i YXNlYmFja3VwL3QvMDEzX3dhbF9zbG90X3RpbWluZy5wbAoKZGlmZiAtLWdpdCBhL3NyYy9iaW4v cGdfYmFzZWJhY2t1cC9NYWtlZmlsZSBiL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9NYWtlZmlsZQpp bmRleCBkZjk0ZmMyN2QwMi4uMTJmZjMyZTMyOWIgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfYmFz ZWJhY2t1cC9NYWtlZmlsZQorKysgYi9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvTWFrZWZpbGUKQEAg LTEyLDEzICsxMiwxNSBAQAogUEdGSUxFREVTQyA9ICJwZ19iYXNlYmFja3VwL3BnX3JlY2VpdmV3 YWwvcGdfcmVjdmxvZ2ljYWwgLSBzdHJlYW1pbmcgV0FMIGFuZCBiYWNrdXAgcmVjZWl2ZXJzIgog UEdBUFBJQ09OPXdpbjMyCiAKLUVYVFJBX0lOU1RBTEw9Y29udHJpYi90ZXN0X2RlY29kaW5nCitF WFRSQV9JTlNUQUxMPWNvbnRyaWIvdGVzdF9kZWNvZGluZyBcCisJc3JjL3Rlc3QvbW9kdWxlcy9p bmplY3Rpb25fcG9pbnRzCiAKIHN1YmRpciA9IHNyYy9iaW4vcGdfYmFzZWJhY2t1cAogdG9wX2J1 aWxkZGlyID0gLi4vLi4vLi4KIGluY2x1ZGUgJCh0b3BfYnVpbGRkaXIpL3NyYy9NYWtlZmlsZS5n bG9iYWwKIAogIyBtYWtlIHRoZXNlIGF2YWlsYWJsZSB0byBUQVAgdGVzdCBzY3JpcHRzCitleHBv cnQgZW5hYmxlX2luamVjdGlvbl9wb2ludHMKIGV4cG9ydCBMWjQKIGV4cG9ydCBUQVIKICMgTm90 ZSB0aGF0IEdaSVAgY2Fubm90IGJlIHVzZWQgZGlyZWN0bHkgYXMgdGhpcyBlbnZpcm9ubWVudCB2 YXJpYWJsZSBpcwpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL21lc29uLmJ1aWxk IGIvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL21lc29uLmJ1aWxkCmluZGV4IDJkM2IyMmZmMDZlLi40 MzkwNWVkOWZjMyAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL21lc29uLmJ1aWxk CisrKyBiL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZApAQCAtOTYsMTEgKzk2LDEz IEBAIHRlc3RzICs9IHsKICAgICAnZW52JzogeydHWklQX1BST0dSQU0nOiBnemlwLmZvdW5kKCkg PyBnemlwLmZ1bGxfcGF0aCgpIDogJycsCiAgICAgICAgICAgICAnVEFSJzogdGFyLmZvdW5kKCkg PyB0YXIuZnVsbF9wYXRoKCkgOiAnJywKICAgICAgICAgICAgICdMWjQnOiBwcm9ncmFtX2x6NC5m b3VuZCgpID8gcHJvZ3JhbV9sejQuZnVsbF9wYXRoKCkgOiAnJywKKyAgICAgICAgICAgICdlbmFi bGVfaW5qZWN0aW9uX3BvaW50cyc6IGdldF9vcHRpb24oJ2luamVjdGlvbl9wb2ludHMnKSA/ICd5 ZXMnIDogJ25vJywKICAgICB9LAogICAgICd0ZXN0cyc6IFsKICAgICAgICd0LzAxMF9wZ19iYXNl YmFja3VwLnBsJywKICAgICAgICd0LzAxMV9pbl9wbGFjZV90YWJsZXNwYWNlLnBsJywKICAgICAg ICd0LzAxMl9pbmNyZW1lbnRhbF9wcm9ncmVzcy5wbCcsCisgICAgICAndC8wMTNfd2FsX3Nsb3Rf dGltaW5nLnBsJywKICAgICAgICd0LzAyMF9wZ19yZWNlaXZld2FsLnBsJywKICAgICAgICd0LzAz MF9wZ19yZWN2bG9naWNhbC5wbCcsCiAgICAgICAndC8wNDBfcGdfY3JlYXRlc3Vic2NyaWJlci5w bCcsCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvcGdfYmFzZWJhY2t1cC5jIGIv c3JjL2Jpbi9wZ19iYXNlYmFja3VwL3BnX2Jhc2ViYWNrdXAuYwppbmRleCBjM2I4N2ExOWU3Ni4u ODYxNDRmMDFhYTQgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9wZ19iYXNlYmFj a3VwLmMKKysrIGIvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL3BnX2Jhc2ViYWNrdXAuYwpAQCAtMTY1 LDYgKzE2NSw5IEBAIHN0YXRpYyBib29sIGZvdW5kX2V4aXN0aW5nX3hsb2dkaXIgPSBmYWxzZTsK IHN0YXRpYyBib29sIG1hZGVfdGFibGVzcGFjZV9kaXJzID0gZmFsc2U7CiBzdGF0aWMgYm9vbCBm b3VuZF90YWJsZXNwYWNlX2RpcnMgPSBmYWxzZTsKIAorLyogQ29ubmVjdGlvbiBmb3IgdGhlIGJh Y2tncm91bmQgV0FMIHJlY2VpdmVyLCBzZWUgUHJlcGFyZUxvZ1N0cmVhbWVyKCkgKi8KK3N0YXRp YyBQR2Nvbm4gKmJnY29ubiA9IE5VTEw7CisKIC8qIFByb2dyZXNzIGluZGljYXRvcnMgKi8KIHN0 YXRpYyB1aW50NjQgdG90YWxzaXplX2tiOwogc3RhdGljIHVpbnQ2NCB0b3RhbGRvbmU7CkBAIC0z MTQsNiArMzE3LDIyIEBAIGtpbGxfYmdjaGlsZF9hdGV4aXQodm9pZCkKIH0KICNlbmRpZgogCisv KgorICogRHJvcCB0aGUgbGluZ2VyaW5nIHNsb3QgY3JlYXRlZCBieSBQcmVwYXJlTG9nU3RyZWFt ZXIoKSBpZiB3ZSBmYWlsIGJlZm9yZSB0aGUKKyAqIGJhY2tncm91bmQgV0FMIHJlY2VpdmVyIGhh cyB0YWtlbiBvdmVyIGl0cyBjb25uZWN0aW9uLiAgT25seSByZWdpc3RlcmVkCisgKiBvbmNlIHRo ZSBzbG90IGV4aXN0cywgc28gYSBwcmUtZXhpc3Rpbmcgc2xvdCBvZiB0aGUgc2FtZSBuYW1lIHNo b3VsZCBuZXZlcgorICogYmUgZHJvcHBlZC4KKyAqLworc3RhdGljIHZvaWQKK2Ryb3BfbGluZ2Vy aW5nX3JlcGxpY2F0aW9uX3Nsb3RfYXRleGl0KHZvaWQpCit7CisJLyogQ2hlY2sgdGhhdCB3ZSBo YXZlIGEgZ29vZCBzdGF0ZSAqLworCWlmIChzdWNjZXNzIHx8IGluX2xvZ19zdHJlYW1lciB8fCBi Z2NoaWxkID4gMCkKKwkJcmV0dXJuOworCisJKHZvaWQpIERyb3BSZXBsaWNhdGlvblNsb3QoYmdj b25uLCByZXBsaWNhdGlvbl9zbG90KTsKK30KKwogLyoKICAqIFNwbGl0IGFyZ3VtZW50IGludG8g b2xkX2RpciBhbmQgbmV3X2RpciBhbmQgYXBwZW5kIHRvIHRhYmxlc3BhY2UgbWFwcGluZwogICog bGlzdC4KQEAgLTYwNyw2ICs2MjYsNjIgQEAgTG9nU3RyZWFtZXJNYWluKGxvZ3N0cmVhbWVyX3Bh cmFtICpwYXJhbSkKIAlyZXR1cm4gMDsKIH0KIAorLyoKKyAqIE9wZW4gdGhlIGNvbm5lY3Rpb24g Zm9yIHRoZSBiYWNrZ3JvdW5kIFdBTCByZWNlaXZlciBhbmQgY3JlYXRlIGl0cworICogcmVwbGlj YXRpb24gc2xvdCwgaWYgb25lIGlzIG5lZWRlZC4KKyAqCisgKiBUaGlzIG11c3QgYmUgZG9uZSBi ZWZvcmUgQkFTRV9CQUNLVVAgaXMgc2VudDogdGhlIHNsb3QgcmVzZXJ2ZXMgV0FMIGZyb20KKyAq IGl0cyBjcmVhdGlvbiBvbndhcmRzLCBzbyBjcmVhdGluZyBpdCBmaXJzdCBndWFyYW50ZWVzIHRo YXQgbm8gV0FMIGZyb20gdGhlCisgKiBiYWNrdXAncyBzdGFydCBwb3NpdGlvbiBvbndhcmRzIGNh biBiZSByZW1vdmVkIGJlZm9yZSB0aGUgcmVjZWl2ZXIgc3RhcnRzCisgKiBzdHJlYW1pbmcuICBJ ZiB0aGUgc2xvdCB3ZXJlIGNyZWF0ZWQgb25seSBhZnRlciBCQVNFX0JBQ0tVUCBoYWQgcmV0dXJu ZWQKKyAqIHRoZSBzdGFydCBwb3NpdGlvbiwgYSBjaGVja3BvaW50IGluIGJldHdlZW4gY291bGQg cmVtb3ZlIFdBTCB0aGUgYmFja3VwCisgKiBuZWVkcy4KKyAqLworc3RhdGljIHZvaWQKK1ByZXBh cmVMb2dTdHJlYW1lcih2b2lkKQoreworCS8qIEdldCBhIFdBTCBzZXJ2aW5nIGNvbm5lY3Rpb24g Ki8KKwliZ2Nvbm4gPSBHZXRDb25uZWN0aW9uKCk7CisJaWYgKCFiZ2Nvbm4pCisJCS8qIEVycm9y IG1lc3NhZ2UgYWxyZWFkeSB3cml0dGVuIGluIEdldENvbm5lY3Rpb24oKSAqLworCQlleGl0KDEp OworCisJLyogVGVtcG9yYXJ5IHJlcGxpY2F0aW9uIHNsb3RzIGFyZSBvbmx5IHN1cHBvcnRlZCBp biAxMCBhbmQgbmV3ZXIgKi8KKwlpZiAoUFFzZXJ2ZXJWZXJzaW9uKGNvbm4pIDwgTUlOSU1VTV9W RVJTSU9OX0ZPUl9URU1QX1NMT1RTKQorCQl0ZW1wX3JlcGxpY2F0aW9uX3Nsb3QgPSBmYWxzZTsK KworCS8qCisJICogQ3JlYXRlIHJlcGxpY2F0aW9uIHNsb3QgaWYgcmVxdWVzdGVkCisJICovCisJ aWYgKHRlbXBfcmVwbGljYXRpb25fc2xvdCAmJiAhcmVwbGljYXRpb25fc2xvdCkKKwkJcmVwbGlj YXRpb25fc2xvdCA9IHBzcHJpbnRmKCJwZ19iYXNlYmFja3VwXyV1IiwKKwkJCQkJCQkJCSh1bnNp Z25lZCBpbnQpIFBRYmFja2VuZFBJRChiZ2Nvbm4pKTsKKwlpZiAodGVtcF9yZXBsaWNhdGlvbl9z bG90IHx8IGNyZWF0ZV9zbG90KQorCXsKKwkJaWYgKCFDcmVhdGVSZXBsaWNhdGlvblNsb3QoYmdj b25uLCByZXBsaWNhdGlvbl9zbG90LCBOVUxMLAorCQkJCQkJCQkgICB0ZW1wX3JlcGxpY2F0aW9u X3Nsb3QsIHRydWUsIHRydWUsIGZhbHNlLAorCQkJCQkJCQkgICBmYWxzZSwgZmFsc2UpKQorCQkJ ZXhpdCgxKTsKKworCQkvKgorCQkgKiBPbmx5IHJlZ2lzdGVyIGF0ZXhpdCBmdW5jdGlvbiBpZiBj cmVhdGVfc2xvdCBpcyB0cnVlLiBUZW1wb3JhcnkKKwkJICogc2xvdHMgZ28gYXdheSB3aXRoIGNv bm5lY3Rpb24KKwkJICovCisJCWlmIChjcmVhdGVfc2xvdCkKKwkJCWF0ZXhpdChkcm9wX2xpbmdl cmluZ19yZXBsaWNhdGlvbl9zbG90X2F0ZXhpdCk7CisKKwkJaWYgKHZlcmJvc2UpCisJCXsKKwkJ CWlmICh0ZW1wX3JlcGxpY2F0aW9uX3Nsb3QpCisJCQkJcGdfbG9nX2luZm8oImNyZWF0ZWQgdGVt cG9yYXJ5IHJlcGxpY2F0aW9uIHNsb3QgXCIlc1wiIiwKKwkJCQkJCQlyZXBsaWNhdGlvbl9zbG90 KTsKKwkJCWVsc2UKKwkJCQlwZ19sb2dfaW5mbygiY3JlYXRlZCByZXBsaWNhdGlvbiBzbG90IFwi JXNcIiIsCisJCQkJCQkJcmVwbGljYXRpb25fc2xvdCk7CisJCX0KKwl9Cit9CisKIC8qCiAgKiBJ bml0aWF0ZSBiYWNrZ3JvdW5kIHByb2Nlc3MgZm9yIHJlY2VpdmluZyB4bG9nIGR1cmluZyB0aGUg YmFja3VwLgogICogVGhlIGJhY2tncm91bmQgc3RyZWFtIHdpbGwgdXNlIGl0cyBvd24gZGF0YWJh c2UgY29ubmVjdGlvbiBzbyB3ZSBjYW4KQEAgLTYyMCw3ICs2OTUsMTAgQEAgU3RhcnRMb2dTdHJl YW1lcihjaGFyICpzdGFydHBvcywgdWludDMyIHRpbWVsaW5lLCBjaGFyICpzeXNpZGVudGlmaWVy LAogCWxvZ3N0cmVhbWVyX3BhcmFtICpwYXJhbTsKIAljaGFyCQlzdGF0dXNkaXJbTUFYUEdQQVRI XTsKIAorCUFzc2VydChiZ2Nvbm4gIT0gTlVMTCk7CisKIAlwYXJhbSA9IHBnX21hbGxvYzBfb2Jq ZWN0KGxvZ3N0cmVhbWVyX3BhcmFtKTsKKwlwYXJhbS0+Ymdjb25uID0gYmdjb25uOwogCXBhcmFt LT50aW1lbGluZSA9IHRpbWVsaW5lOwogCXBhcmFtLT5zeXNpZGVudGlmaWVyID0gc3lzaWRlbnRp ZmllcjsKIAlwYXJhbS0+d2FsX2NvbXByZXNzX2FsZ29yaXRobSA9IHdhbF9jb21wcmVzc19hbGdv cml0aG07CkBAIC02MzksNDYgKzcxNywxMiBAQCBTdGFydExvZ1N0cmVhbWVyKGNoYXIgKnN0YXJ0 cG9zLCB1aW50MzIgdGltZWxpbmUsIGNoYXIgKnN5c2lkZW50aWZpZXIsCiAJCXBnX2ZhdGFsKCJj b3VsZCBub3QgY3JlYXRlIHBpcGUgZm9yIGJhY2tncm91bmQgcHJvY2VzczogJW0iKTsKICNlbmRp ZgogCi0JLyogR2V0IGEgc2Vjb25kIGNvbm5lY3Rpb24gKi8KLQlwYXJhbS0+Ymdjb25uID0gR2V0 Q29ubmVjdGlvbigpOwotCWlmICghcGFyYW0tPmJnY29ubikKLQkJLyogRXJyb3IgbWVzc2FnZSBh bHJlYWR5IHdyaXR0ZW4gaW4gR2V0Q29ubmVjdGlvbigpICovCi0JCWV4aXQoMSk7Ci0KIAkvKiBJ biBwb3N0LTEwIGNsdXN0ZXIsIHBnX3hsb2cgaGFzIGJlZW4gcmVuYW1lZCB0byBwZ193YWwgKi8K IAlzbnByaW50ZihwYXJhbS0+eGxvZywgc2l6ZW9mKHBhcmFtLT54bG9nKSwgIiVzLyVzIiwKIAkJ CSBiYXNlZGlyLAogCQkJIFBRc2VydmVyVmVyc2lvbihjb25uKSA8IE1JTklNVU1fVkVSU0lPTl9G T1JfUEdfV0FMID8KIAkJCSAicGdfeGxvZyIgOiAicGdfd2FsIik7CiAKLQkvKiBUZW1wb3Jhcnkg cmVwbGljYXRpb24gc2xvdHMgYXJlIG9ubHkgc3VwcG9ydGVkIGluIDEwIGFuZCBuZXdlciAqLwot CWlmIChQUXNlcnZlclZlcnNpb24oY29ubikgPCBNSU5JTVVNX1ZFUlNJT05fRk9SX1RFTVBfU0xP VFMpCi0JCXRlbXBfcmVwbGljYXRpb25fc2xvdCA9IGZhbHNlOwotCi0JLyoKLQkgKiBDcmVhdGUg cmVwbGljYXRpb24gc2xvdCBpZiByZXF1ZXN0ZWQKLQkgKi8KLQlpZiAodGVtcF9yZXBsaWNhdGlv bl9zbG90ICYmICFyZXBsaWNhdGlvbl9zbG90KQotCQlyZXBsaWNhdGlvbl9zbG90ID0gcHNwcmlu dGYoInBnX2Jhc2ViYWNrdXBfJXUiLAotCQkJCQkJCQkJKHVuc2lnbmVkIGludCkgUFFiYWNrZW5k UElEKHBhcmFtLT5iZ2Nvbm4pKTsKLQlpZiAodGVtcF9yZXBsaWNhdGlvbl9zbG90IHx8IGNyZWF0 ZV9zbG90KQotCXsKLQkJaWYgKCFDcmVhdGVSZXBsaWNhdGlvblNsb3QocGFyYW0tPmJnY29ubiwg cmVwbGljYXRpb25fc2xvdCwgTlVMTCwKLQkJCQkJCQkJICAgdGVtcF9yZXBsaWNhdGlvbl9zbG90 LCB0cnVlLCB0cnVlLCBmYWxzZSwKLQkJCQkJCQkJICAgZmFsc2UsIGZhbHNlKSkKLQkJCWV4aXQo MSk7Ci0KLQkJaWYgKHZlcmJvc2UpCi0JCXsKLQkJCWlmICh0ZW1wX3JlcGxpY2F0aW9uX3Nsb3Qp Ci0JCQkJcGdfbG9nX2luZm8oImNyZWF0ZWQgdGVtcG9yYXJ5IHJlcGxpY2F0aW9uIHNsb3QgXCIl c1wiIiwKLQkJCQkJCQlyZXBsaWNhdGlvbl9zbG90KTsKLQkJCWVsc2UKLQkJCQlwZ19sb2dfaW5m bygiY3JlYXRlZCByZXBsaWNhdGlvbiBzbG90IFwiJXNcIiIsCi0JCQkJCQkJcmVwbGljYXRpb25f c2xvdCk7Ci0JCX0KLQl9Ci0KIAlpZiAoZm9ybWF0ID09ICdwJykKIAl7CiAJCS8qCkBAIC0xOTcw LDYgKzIwMTQsMTMgQEAgQmFzZUJhY2t1cChjaGFyICpjb21wcmVzc2lvbl9hbGdvcml0aG0sIGNo YXIgKmNvbXByZXNzaW9uX2RldGFpbCwKIAkJCQkJCQkJCSAgY29tcHJlc3Npb25fZGV0YWlsKTsK IAl9CiAKKwkvKgorCSAqIElmIHN0cmVhbWluZyBXQUwsIGNyZWF0ZSB0aGUgcmVwbGljYXRpb24g c2xvdCBiZWZvcmUgc3RhcnRpbmcgdGhlCisJICogYmFja3VwLCBzbyB0aGF0IGl0IHByb3RlY3Rz IGFsbCB0aGUgV0FMIHRoZSBiYWNrdXAgbmVlZHMuCisJICovCisJaWYgKGluY2x1ZGV3YWwgPT0g U1RSRUFNX1dBTCkKKwkJUHJlcGFyZUxvZ1N0cmVhbWVyKCk7CisKIAlpZiAodmVyYm9zZSkKIAkJ cGdfbG9nX2luZm8oImluaXRpYXRpbmcgYmFzZSBiYWNrdXAsIHdhaXRpbmcgZm9yIGNoZWNrcG9p bnQgdG8gY29tcGxldGUiKTsKIApkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL3Qv MDEwX3BnX2Jhc2ViYWNrdXAucGwgYi9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvdC8wMTBfcGdfYmFz ZWJhY2t1cC5wbAppbmRleCAyM2E3NTdiMWM4Ni4uYTVjMDVhZWMxYmYgMTAwNjQ0Ci0tLSBhL3Ny Yy9iaW4vcGdfYmFzZWJhY2t1cC90LzAxMF9wZ19iYXNlYmFja3VwLnBsCisrKyBiL3NyYy9iaW4v cGdfYmFzZWJhY2t1cC90LzAxMF9wZ19iYXNlYmFja3VwLnBsCkBAIC04MjksOSArODI5LDUxIEBA ICRub2RlLT5jb21tYW5kX2ZhaWxzX2xpa2UoCiAJcXIvcmVwbGljYXRpb24gc2xvdCAic2xvdDAi IGFscmVhZHkgZXhpc3RzLywKIAkncGdfYmFzZWJhY2t1cCBmYWlscyB3aXRoIC0tY3JlYXRlLXNs b3QgLS1zbG90IGFuZCBhIHByZXZpb3VzbHkgZXhpc3Rpbmcgc2xvdCcKICk7CitpcyggJG5vZGUt PnNhZmVfcHNxbCgKKwkJJ3Bvc3RncmVzJywKKwkJcXtTRUxFQ1Qgc2xvdF9uYW1lIEZST00gcGdf cmVwbGljYXRpb25fc2xvdHMgV0hFUkUgc2xvdF9uYW1lID0gJ3Nsb3QwJ30KKwkpLAorCSdzbG90 MCcsCisJJ3ByZXZpb3VzbHkgZXhpc3Rpbmcgc2xvdCBpcyBub3QgZHJvcHBlZCB3aGVuIC0tY3Jl YXRlLXNsb3QgZmFpbHMnKTsKKworIyBUaGUgc2xvdCBpcyBjcmVhdGVkIGJlZm9yZSBCQVNFX0JB Q0tVUCBpcyBzZW50LCBzbyBhIGZhaWx1cmUgb2YKKyMgQkFTRV9CQUNLVVAgaXRzZWxmIG11c3Qg bm90IGxlYXZlIGEgc2xvdCBjcmVhdGVkIGJ5IC0tY3JlYXRlLXNsb3QgYmVoaW5kLgorJG5vZGUt PmNvbW1hbmRfZmFpbHNfbGlrZSgKKwlbCisJCUBwZ19iYXNlYmFja3VwX2RlZnMsCisJCSctLXBn ZGF0YScgPT4gIiR0ZW1wZGlyL2JhY2t1cHhzX3Nsb3QyIiwKKwkJJy0tY3JlYXRlLXNsb3QnLAor CQknLS1zbG90JyA9PiAnc2xvdDInLAorCQknLS1tYW5pZmVzdC1jaGVja3N1bXMnID0+ICdib2d1 cycKKwldLAorCXFyL3VucmVjb2duaXplZCBjaGVja3N1bSBhbGdvcml0aG0vLAorCSdwZ19iYXNl YmFja3VwIC0tY3JlYXRlLXNsb3QgZmFpbHMgd2hlbiBCQVNFX0JBQ0tVUCBmYWlscycpOworaXMo ICRub2RlLT5zYWZlX3BzcWwoCisJCSdwb3N0Z3JlcycsCisJCXF7U0VMRUNUIGNvdW50KCopIEZS T00gcGdfcmVwbGljYXRpb25fc2xvdHMgV0hFUkUgc2xvdF9uYW1lID0gJ3Nsb3QyJ30KKwkpLAor CScwJywKKwknc2xvdCBjcmVhdGVkIGJ5IGZhaWxlZCBwZ19iYXNlYmFja3VwIC0tY3JlYXRlLXNs b3QgaXMgZHJvcHBlZCcpOwogCiAkbm9kZS0+c2FmZV9wc3FsKCdwb3N0Z3JlcycsCiAJcXtTRUxF Q1QgKiBGUk9NIHBnX2NyZWF0ZV9waHlzaWNhbF9yZXBsaWNhdGlvbl9zbG90KCdzbG90MScpfSk7 CisKKyMgV2l0aG91dCAtLWNyZWF0ZS1zbG90LCBhIGZhaWxlZCBiYWNrdXAgbXVzdCBsZWF2ZSB0 aGUgZ2l2ZW4gc2xvdCBhbG9uZS4KKyRub2RlLT5jb21tYW5kX2ZhaWxzX2xpa2UoCisJWworCQlA cGdfYmFzZWJhY2t1cF9kZWZzLAorCQknLS1wZ2RhdGEnID0+ICIkdGVtcGRpci9iYWNrdXB4c19z bG90MV9mYWlsIiwKKwkJJy0tc2xvdCcgPT4gJ3Nsb3QxJywKKwkJJy0tbWFuaWZlc3QtY2hlY2tz dW1zJyA9PiAnYm9ndXMnCisJXSwKKwlxci91bnJlY29nbml6ZWQgY2hlY2tzdW0gYWxnb3JpdGht LywKKwkncGdfYmFzZWJhY2t1cCAtLXNsb3QgZmFpbHMgd2hlbiBCQVNFX0JBQ0tVUCBmYWlscycp OworaXMoICRub2RlLT5zYWZlX3BzcWwoCisJCSdwb3N0Z3JlcycsCisJCXF7U0VMRUNUIHNsb3Rf bmFtZSBGUk9NIHBnX3JlcGxpY2F0aW9uX3Nsb3RzIFdIRVJFIHNsb3RfbmFtZSA9ICdzbG90MSd9 CisJKSwKKwknc2xvdDEnLAorCSdleGlzdGluZyBzbG90IGlzIG5vdCBkcm9wcGVkIHdoZW4gcGdf YmFzZWJhY2t1cCAtLXNsb3QgZmFpbHMnKTsKIG15ICRsc24gPSAkbm9kZS0+c2FmZV9wc3FsKCdw b3N0Z3JlcycsCiAJcXtTRUxFQ1QgcmVzdGFydF9sc24gRlJPTSBwZ19yZXBsaWNhdGlvbl9zbG90 cyBXSEVSRSBzbG90X25hbWUgPSAnc2xvdDEnfQogKTsKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdf YmFzZWJhY2t1cC90LzAxM193YWxfc2xvdF90aW1pbmcucGwgYi9zcmMvYmluL3BnX2Jhc2ViYWNr dXAvdC8wMTNfd2FsX3Nsb3RfdGltaW5nLnBsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwLi4wZGU1ZTI0MDU4YgotLS0gL2Rldi9udWxsCisrKyBiL3NyYy9iaW4vcGdfYmFz ZWJhY2t1cC90LzAxM193YWxfc2xvdF90aW1pbmcucGwKQEAgLTAsMCArMSw4MiBAQAorIyBDb3B5 cmlnaHQgKGMpIDIwMjYsIFBvc3RncmVTUUwgR2xvYmFsIERldmVsb3BtZW50IEdyb3VwCisKKyMg Q2hlY2sgdGhhdCBwZ19iYXNlYmFja3VwJ3MgcmVwbGljYXRpb24gc2xvdCByZXNlcnZlcyBXQUwg ZnJvbSBiZWZvcmUgdGhlCisjIGJhY2t1cCdzIHN0YXJ0IHBvc2l0aW9uLiAgSWYgdGhlIHNsb3Qg d2VyZSBjcmVhdGVkIG9ubHkgYWZ0ZXIgQkFTRV9CQUNLVVAKKyMgaGFkIHJldHVybmVkIHRoZSBz dGFydCBwb3NpdGlvbiwgYSBjaGVja3BvaW50IHJ1bm5pbmcgaW4gYmV0d2VlbiBjb3VsZAorIyBy ZW1vdmUgdGhlIFdBTCB0aGUgYmFja3VwIG5lZWRzLCBhbmQgc3RyZWFtaW5nIGl0IHdvdWxkIGZh aWwuCisjCisjIFdlIGhvbGQgdGhlIHNsb3QgY3JlYXRpb24gd2l0aCBhbiBpbmplY3Rpb24gcG9p bnQsIGZvcmNlIFdBTCBwYXN0IHNldmVyYWwKKyMgc2VnbWVudHMgYW5kIGNoZWNrcG9pbnQsIHRo ZW4gbGV0IHRoZSBzbG90IGNyZWF0aW9uIGNvbnRpbnVlLgorCit1c2Ugc3RyaWN0OwordXNlIHdh cm5pbmdzIEZBVEFMID0+ICdhbGwnOwordXNlIFBvc3RncmVTUUw6OlRlc3Q6OkNsdXN0ZXI7Cit1 c2UgUG9zdGdyZVNRTDo6VGVzdDo6VXRpbHM7Cit1c2UgVGVzdDo6TW9yZTsKKworaWYgKCRFTlZ7 ZW5hYmxlX2luamVjdGlvbl9wb2ludHN9IG5lICd5ZXMnKQoreworCXBsYW4gc2tpcF9hbGwgPT4g J0luamVjdGlvbiBwb2ludHMgbm90IHN1cHBvcnRlZCBieSB0aGlzIGJ1aWxkJzsKK30KKworbXkg JHRlbXBkaXIgPSBQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczo6dGVtcGRpcjsKKworbXkgJG5vZGUg PSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ21haW4nKTsKKyRub2RlLT5pbml0KGFs bG93c19zdHJlYW1pbmcgPT4gMSk7Ciskbm9kZS0+YXBwZW5kX2NvbmYoCisJJ3Bvc3RncmVzcWwu Y29uZicsIHF7Cit3YWxfa2VlcF9zaXplID0gMAorY2hlY2twb2ludF90aW1lb3V0ID0gMWgKK30p OworJG5vZGUtPnN0YXJ0OworCitpZiAoISRub2RlLT5jaGVja19leHRlbnNpb24oJ2luamVjdGlv bl9wb2ludHMnKSkKK3sKKwlwbGFuIHNraXBfYWxsID0+ICdFeHRlbnNpb24gaW5qZWN0aW9uX3Bv aW50cyBub3QgaW5zdGFsbGVkJzsKK30KKworJG5vZGUtPnNhZmVfcHNxbCgncG9zdGdyZXMnLCAn Q1JFQVRFIEVYVEVOU0lPTiBpbmplY3Rpb25fcG9pbnRzJyk7Ciskbm9kZS0+c2FmZV9wc3FsKCdw b3N0Z3JlcycsCisJIlNFTEVDVCBpbmplY3Rpb25fcG9pbnRzX2F0dGFjaCgncmVwbGljYXRpb24t c2xvdC1jcmVhdGUtYmVnaW4nLCAnd2FpdCcpIgorKTsKKworbXkgJGJhY2t1cGRpciA9ICIkdGVt cGRpci9iYWNrdXAiOworbXkgKCRzdGRvdXQsICRzdGRlcnIpOworbXkgJGggPSBJUEM6OlJ1bjo6 c3RhcnQoCisJWworCQkncGdfYmFzZWJhY2t1cCcsICctLW5vLXN5bmMnLAorCQknLS1jaGVja3Bv aW50JyA9PiAnZmFzdCcsCisJCSctLXBnZGF0YScgPT4gJGJhY2t1cGRpciwKKwkJJy0td2FsLW1l dGhvZCcgPT4gJ3N0cmVhbScsCisJCSctLWRibmFtZScgPT4gJG5vZGUtPmNvbm5zdHIoJ3Bvc3Rn cmVzJyksCisJXSwKKwknPicgPT4gXCRzdGRvdXQsCisJJzI+JyA9PiBcJHN0ZGVycik7CisKKyMg V2FpdCB1bnRpbCB0aGUgd2Fsc2VuZGVyIGlzIGFib3V0IHRvIGNyZWF0ZSBwZ19iYXNlYmFja3Vw J3Mgc2xvdC4KKyRub2RlLT53YWl0X2Zvcl9ldmVudCgnd2Fsc2VuZGVyJywgJ3JlcGxpY2F0aW9u LXNsb3QtY3JlYXRlLWJlZ2luJyk7CisKKyMgTW92ZSBXQUwgZm9yd2FyZCBieSBzZXZlcmFsIHNl Z21lbnRzIGFuZCBjaGVja3BvaW50LCBzbyB0aGF0IGV2ZXJ5IHNlZ21lbnQKKyMgbm90IHByb3Rl Y3RlZCBieSBhIHNsb3Qgb3Igd2FsX2tlZXBfc2l6ZSBpcyByZW1vdmVkIG9yIHJlY3ljbGVkLgor JG5vZGUtPmFkdmFuY2Vfd2FsKDMpOworJG5vZGUtPnNhZmVfcHNxbCgncG9zdGdyZXMnLCAnQ0hF Q0tQT0lOVCcpOworCiskbm9kZS0+c2FmZV9wc3FsKCdwb3N0Z3JlcycsCisJIlNFTEVDVCBpbmpl Y3Rpb25fcG9pbnRzX2RldGFjaCgncmVwbGljYXRpb24tc2xvdC1jcmVhdGUtYmVnaW4nKSIpOwor JG5vZGUtPnNhZmVfcHNxbCgncG9zdGdyZXMnLAorCSJTRUxFQ1QgaW5qZWN0aW9uX3BvaW50c193 YWtldXAoJ3JlcGxpY2F0aW9uLXNsb3QtY3JlYXRlLWJlZ2luJykiKTsKKworbXkgJG9rID0gJGgt PmZpbmlzaDsKK29rKCRvaywgJ3BnX2Jhc2ViYWNrdXAgc3VjY2VlZHMgd2l0aCBXQUwgYWN0aXZp dHkgZHVyaW5nIHNsb3QgY3JlYXRpb24nKQorICBvciBkaWFnKCJwZ19iYXNlYmFja3VwIHN0ZGVy cjpcbiRzdGRlcnIiKTsKK3VubGlrZSgKKwkkc3RkZXJyLAorCXFyL2hhcyBhbHJlYWR5IGJlZW4g cmVtb3ZlZC8sCisJJ25vIFdBTCBuZWVkZWQgYnkgdGhlIGJhY2t1cCB3YXMgcmVtb3ZlZCcpOwor CisjIHBnX3ZlcmlmeWJhY2t1cCBhbHNvIHBhcnNlcyB0aGUgV0FMIHRoZSBiYWNrdXAgbmVlZHMs IHNvIHRoaXMgZmFpbHMgaWYKKyMgYW55IG9mIGl0IGlzIG1pc3NpbmcuCiskbm9kZS0+Y29tbWFu ZF9vayhbICdwZ192ZXJpZnliYWNrdXAnLCAkYmFja3VwZGlyIF0sCisJJ2JhY2t1cCB3aXRoIHN0 cmVhbWVkIFdBTCB2ZXJpZmllcycpOworCitkb25lX3Rlc3RpbmcoKTsKLS0gCjIuNTYuMAoK --=_d3923359594cdd054b225e7d6c1eeb98--