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 1xMVlO-000000023wn-29Np for pgsql-bugs@arkaria.postgresql.org; Thu, 29 Oct 2026 19:26:15 +0000 Received: from localhost ([127.0.0.1]:37622 helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.98.2) (envelope-from ) id 1xMVlO-00000005tmj-09HR for pgsql-bugs@arkaria.postgresql.org; Thu, 29 Oct 2026 19:26:14 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]:41798) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xMVlN-00000005tma-2I7W for pgsql-bugs@lists.postgresql.org; Thu, 29 Oct 2026 19:26:13 +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 1xMVlJ-00000001Zn3-2bnI for pgsql-bugs@lists.postgresql.org; Thu, 29 Oct 2026 19:26:12 +0000 Received: from mail.zonezero.se (unknown [10.100.2.1]) by mail.zonezero.se (Postfix) with ESMTPS id EC8BE673; Thu, 29 Oct 2026 20:26:05 +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 A112B120111; Thu, 29 Oct 2026 20:26:04 +0100 (CET) Authentication-Results: ORIGINATING; auth=pass smtp.auth=admin@zonezero.se smtp.mailfrom=jesper@stjohn.se MIME-Version: 1.0 Date: Thu, 29 Oct 2026 20:26:04 +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: X-Sender: jesper@stjohn.se Content-Type: multipart/mixed; boundary="=_340b581ac93fe8859faa295a55089e8b" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=_340b581ac93fe8859faa295a55089e8b Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi! Here are 2 v2-patches as per your suggestion. I'm a bit unsure if the check in drop_lingering_replication_slot_atexit() function is enough to not break anything. Or too much. Suggestions welcome, could also make it into 1 patch if you prefer that. //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. --=_340b581ac93fe8859faa295a55089e8b Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=v2-0002-pg_basebackup-Drop-a-lingering-slot-if-the-backup.patch Content-Disposition: attachment; filename=v2-0002-pg_basebackup-Drop-a-lingering-slot-if-the-backup.patch; size=3964 RnJvbSBhNjYxOTI5OTRiNDJkMDlhMmE0MTM0YjVlNjU1ZDRmYTdjMTVhYTYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXNwZXIgU3QgSm9obiA8amVzcGVyQHN0am9obi5zZT4KRGF0 ZTogV2VkLCAyOCBPY3QgMjAyNiAxMToyMjoyNyArMDEwMApTdWJqZWN0OiBbUEFUQ0ggdjIgMi8y XSBwZ19iYXNlYmFja3VwOiBEcm9wIGEgbGluZ2VyaW5nIHNsb3QgaWYgdGhlIGJhY2t1cAogZmFp bHMgdG8gc3RhcnQKClJlZ2lzdGVyIGFuIGF0ZXhpdCBoYW5kbGVyLCBvbmNlIHRoZSBzbG90IGhh cyBiZWVuIGNyZWF0ZWQsIHRoYXQgZHJvcHMKaXQgaWYgcGdfYmFzZWJhY2t1cCBleGl0cyBiZWZv cmUgdGhlIGJhY2tncm91bmQgV0FMIHJlY2VpdmVyIGhhcyB0YWtlbgpvdmVyIHRoZSBjb25uZWN0 aW9uLgoKQWRkIHRlc3RzIHRvIDAxMF9wZ19iYXNlYmFja3VwLnBsIHRoYXQgdXNlIGEgYm9ndXMK LS1tYW5pZmVzdC1jaGVja3N1bXMgdmFsdWUgdG8gZmFpbCBCQVNFX0JBQ0tVUCBhZnRlciB0aGUg c2xvdCBoYXMgYmVlbgpjcmVhdGVkLCBhbmQgY2hlY2sgdGhhdCBvbmx5IHRoZSBuZXcgc2xvdCBp cyBkcm9wcGVkLgotLS0KIHNyYy9iaW4vcGdfYmFzZWJhY2t1cC9wZ19iYXNlYmFja3VwLmMgICAg ICAgIHwgMjMgKysrKysrKysrKysKIHNyYy9iaW4vcGdfYmFzZWJhY2t1cC90LzAxMF9wZ19iYXNl YmFja3VwLnBsIHwgNDIgKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNjUg aW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9wZ19iYXNl YmFja3VwLmMgYi9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvcGdfYmFzZWJhY2t1cC5jCmluZGV4IDE4 ZTM2NDUxMjkwLi44NjE0NGYwMWFhNCAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19iYXNlYmFja3Vw L3BnX2Jhc2ViYWNrdXAuYworKysgYi9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvcGdfYmFzZWJhY2t1 cC5jCkBAIC0zMTcsNiArMzE3LDIyIEBAIGtpbGxfYmdjaGlsZF9hdGV4aXQodm9pZCkKIH0KICNl bmRpZgogCisvKgorICogRHJvcCB0aGUgbGluZ2VyaW5nIHNsb3QgY3JlYXRlZCBieSBQcmVwYXJl TG9nU3RyZWFtZXIoKSBpZiB3ZSBmYWlsIGJlZm9yZSB0aGUKKyAqIGJhY2tncm91bmQgV0FMIHJl Y2VpdmVyIGhhcyB0YWtlbiBvdmVyIGl0cyBjb25uZWN0aW9uLiAgT25seSByZWdpc3RlcmVkCisg KiBvbmNlIHRoZSBzbG90IGV4aXN0cywgc28gYSBwcmUtZXhpc3Rpbmcgc2xvdCBvZiB0aGUgc2Ft ZSBuYW1lIHNob3VsZCBuZXZlcgorICogYmUgZHJvcHBlZC4KKyAqLworc3RhdGljIHZvaWQKK2Ry b3BfbGluZ2VyaW5nX3JlcGxpY2F0aW9uX3Nsb3RfYXRleGl0KHZvaWQpCit7CisJLyogQ2hlY2sg dGhhdCB3ZSBoYXZlIGEgZ29vZCBzdGF0ZSAqLworCWlmIChzdWNjZXNzIHx8IGluX2xvZ19zdHJl YW1lciB8fCBiZ2NoaWxkID4gMCkKKwkJcmV0dXJuOworCisJKHZvaWQpIERyb3BSZXBsaWNhdGlv blNsb3QoYmdjb25uLCByZXBsaWNhdGlvbl9zbG90KTsKK30KKwogLyoKICAqIFNwbGl0IGFyZ3Vt ZW50IGludG8gb2xkX2RpciBhbmQgbmV3X2RpciBhbmQgYXBwZW5kIHRvIHRhYmxlc3BhY2UgbWFw cGluZwogICogbGlzdC4KQEAgLTY0Nyw2ICs2NjMsMTMgQEAgUHJlcGFyZUxvZ1N0cmVhbWVyKHZv aWQpCiAJCQkJCQkJCSAgIGZhbHNlLCBmYWxzZSkpCiAJCQlleGl0KDEpOwogCisJCS8qCisJCSAq IE9ubHkgcmVnaXN0ZXIgYXRleGl0IGZ1bmN0aW9uIGlmIGNyZWF0ZV9zbG90IGlzIHRydWUuIFRl bXBvcmFyeQorCQkgKiBzbG90cyBnbyBhd2F5IHdpdGggY29ubmVjdGlvbgorCQkgKi8KKwkJaWYg KGNyZWF0ZV9zbG90KQorCQkJYXRleGl0KGRyb3BfbGluZ2VyaW5nX3JlcGxpY2F0aW9uX3Nsb3Rf YXRleGl0KTsKKwogCQlpZiAodmVyYm9zZSkKIAkJewogCQkJaWYgKHRlbXBfcmVwbGljYXRpb25f c2xvdCkKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC90LzAxMF9wZ19iYXNlYmFj a3VwLnBsIGIvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL3QvMDEwX3BnX2Jhc2ViYWNrdXAucGwKaW5k ZXggMjQ0MjEzMWUxNzkuLmI2YTMxNzAzMjYyIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2Jhc2Vi YWNrdXAvdC8wMTBfcGdfYmFzZWJhY2t1cC5wbAorKysgYi9zcmMvYmluL3BnX2Jhc2ViYWNrdXAv dC8wMTBfcGdfYmFzZWJhY2t1cC5wbApAQCAtODI4LDkgKzgyOCw1MSBAQCAkbm9kZS0+Y29tbWFu ZF9mYWlsc19saWtlKAogCXFyL3JlcGxpY2F0aW9uIHNsb3QgInNsb3QwIiBhbHJlYWR5IGV4aXN0 cy8sCiAJJ3BnX2Jhc2ViYWNrdXAgZmFpbHMgd2l0aCAtLWNyZWF0ZS1zbG90IC0tc2xvdCBhbmQg YSBwcmV2aW91c2x5IGV4aXN0aW5nIHNsb3QnCiApOworaXMoICRub2RlLT5zYWZlX3BzcWwoCisJ CSdwb3N0Z3JlcycsCisJCXF7U0VMRUNUIHNsb3RfbmFtZSBGUk9NIHBnX3JlcGxpY2F0aW9uX3Ns b3RzIFdIRVJFIHNsb3RfbmFtZSA9ICdzbG90MCd9CisJKSwKKwknc2xvdDAnLAorCSdwcmV2aW91 c2x5IGV4aXN0aW5nIHNsb3QgaXMgbm90IGRyb3BwZWQgd2hlbiAtLWNyZWF0ZS1zbG90IGZhaWxz Jyk7CisKKyMgVGhlIHNsb3QgaXMgY3JlYXRlZCBiZWZvcmUgQkFTRV9CQUNLVVAgaXMgc2VudCwg c28gYSBmYWlsdXJlIG9mCisjIEJBU0VfQkFDS1VQIGl0c2VsZiBtdXN0IG5vdCBsZWF2ZSBhIHNs b3QgY3JlYXRlZCBieSAtLWNyZWF0ZS1zbG90IGJlaGluZC4KKyRub2RlLT5jb21tYW5kX2ZhaWxz X2xpa2UoCisJWworCQlAcGdfYmFzZWJhY2t1cF9kZWZzLAorCQknLS1wZ2RhdGEnID0+ICIkdGVt cGRpci9iYWNrdXB4c19zbG90MiIsCisJCSctLWNyZWF0ZS1zbG90JywKKwkJJy0tc2xvdCcgPT4g J3Nsb3QyJywKKwkJJy0tbWFuaWZlc3QtY2hlY2tzdW1zJyA9PiAnYm9ndXMnCisJXSwKKwlxci91 bnJlY29nbml6ZWQgY2hlY2tzdW0gYWxnb3JpdGhtLywKKwkncGdfYmFzZWJhY2t1cCAtLWNyZWF0 ZS1zbG90IGZhaWxzIHdoZW4gQkFTRV9CQUNLVVAgZmFpbHMnKTsKK2lzKCAkbm9kZS0+c2FmZV9w c3FsKAorCQkncG9zdGdyZXMnLAorCQlxe1NFTEVDVCBjb3VudCgqKSBGUk9NIHBnX3JlcGxpY2F0 aW9uX3Nsb3RzIFdIRVJFIHNsb3RfbmFtZSA9ICdzbG90Mid9CisJKSwKKwknMCcsCisJJ3Nsb3Qg Y3JlYXRlZCBieSBmYWlsZWQgcGdfYmFzZWJhY2t1cCAtLWNyZWF0ZS1zbG90IGlzIGRyb3BwZWQn KTsKIAogJG5vZGUtPnNhZmVfcHNxbCgncG9zdGdyZXMnLAogCXF7U0VMRUNUICogRlJPTSBwZ19j cmVhdGVfcGh5c2ljYWxfcmVwbGljYXRpb25fc2xvdCgnc2xvdDEnKX0pOworCisjIFdpdGhvdXQg LS1jcmVhdGUtc2xvdCwgYSBmYWlsZWQgYmFja3VwIG11c3QgbGVhdmUgdGhlIGdpdmVuIHNsb3Qg YWxvbmUuCiskbm9kZS0+Y29tbWFuZF9mYWlsc19saWtlKAorCVsKKwkJQHBnX2Jhc2ViYWNrdXBf ZGVmcywKKwkJJy0tcGdkYXRhJyA9PiAiJHRlbXBkaXIvYmFja3VweHNfc2xvdDFfZmFpbCIsCisJ CSctLXNsb3QnID0+ICdzbG90MScsCisJCSctLW1hbmlmZXN0LWNoZWNrc3VtcycgPT4gJ2JvZ3Vz JworCV0sCisJcXIvdW5yZWNvZ25pemVkIGNoZWNrc3VtIGFsZ29yaXRobS8sCisJJ3BnX2Jhc2Vi YWNrdXAgLS1zbG90IGZhaWxzIHdoZW4gQkFTRV9CQUNLVVAgZmFpbHMnKTsKK2lzKCAkbm9kZS0+ c2FmZV9wc3FsKAorCQkncG9zdGdyZXMnLAorCQlxe1NFTEVDVCBzbG90X25hbWUgRlJPTSBwZ19y ZXBsaWNhdGlvbl9zbG90cyBXSEVSRSBzbG90X25hbWUgPSAnc2xvdDEnfQorCSksCisJJ3Nsb3Qx JywKKwknZXhpc3Rpbmcgc2xvdCBpcyBub3QgZHJvcHBlZCB3aGVuIHBnX2Jhc2ViYWNrdXAgLS1z bG90IGZhaWxzJyk7CiBteSAkbHNuID0gJG5vZGUtPnNhZmVfcHNxbCgncG9zdGdyZXMnLAogCXF7 U0VMRUNUIHJlc3RhcnRfbHNuIEZST00gcGdfcmVwbGljYXRpb25fc2xvdHMgV0hFUkUgc2xvdF9u YW1lID0gJ3Nsb3QxJ30KICk7Ci0tIAoyLjU2LjAKCg== --=_340b581ac93fe8859faa295a55089e8b Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=v2-0001-pg_basebackup-Create-the-WAL-streaming-slot-befor.patch Content-Disposition: attachment; filename=v2-0001-pg_basebackup-Create-the-WAL-streaming-slot-befor.patch; size=10103 RnJvbSBjN2RkYjk3Y2JkN2Y5MjNjZDk0MDdiMWQ1MTMxM2Y4NmZiZjU4N2RlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXNwZXIgU3QgSm9obiA8amVzcGVyQHN0am9obi5zZT4KRGF0 ZTogTW9uLCAxOSBPY3QgMjAyNiAxNTozNTo1OSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggdjIgMS8y XSBwZ19iYXNlYmFja3VwOiBDcmVhdGUgdGhlIFdBTCBzdHJlYW1pbmcgc2xvdCBiZWZvcmUKIHN0 YXJ0aW5nIHRoZSBiYWNrdXAKCldpdGggLS13YWwtbWV0aG9kPXN0cmVhbSwgcGdfYmFzZWJhY2t1 cCBjcmVhdGVkIGl0cyByZXBsaWNhdGlvbiBzbG90IG9ubHkKYWZ0ZXIgQkFTRV9CQUNLVVAgaGFk IHJldHVybmVkIHRoZSBiYWNrdXAncyBzdGFydCBwb3NpdGlvbi4gIEEgY2hlY2twb2ludApydW5u aW5nIGluIGJldHdlZW4gY291bGQgcmVtb3ZlIFdBTCBmcm9tIHRoYXQgcG9zaXRpb24gb253YXJk cywgYW5kIHRoZQpiYWNrdXAgdGhlbiBmYWlsZWQgd2l0aCAicmVxdWVzdGVkIFdBTCBzZWdtZW50 IC4uLiBoYXMgYWxyZWFkeSBiZWVuCnJlbW92ZWQiLgoKT3BlbiB0aGUgV0FMIHN0cmVhbWluZyBj b25uZWN0aW9uIGFuZCBjcmVhdGUgaXRzIHNsb3QgYmVmb3JlIHNlbmRpbmcKQkFTRV9CQUNLVVAs IHJhdGhlciB0aGFuIGFmdGVyIGl0IGhhcyByZXR1cm5lZCB0aGUgc3RhcnQgcG9zaXRpb24sIHNv IHRoZQpzbG90IHJlc2VydmVzIGFsbCB0aGUgV0FMIHRoZSBiYWNrdXAgbmVlZHMuICBBZGQgYSBU QVAgdGVzdCB0aGF0IHVzZXMgYW4KaW5qZWN0aW9uIHBvaW50IHRvIGhvbGQgc2xvdCBjcmVhdGlv biB3aGlsZSBXQUwgaXMgYWR2YW5jZWQgYW5kIGEKY2hlY2twb2ludCBpcyBydW4uCi0tLQogc3Jj L2Jpbi9wZ19iYXNlYmFja3VwL01ha2VmaWxlICAgICAgICAgICAgICAgIHwgIDQgKy0KIHNyYy9i aW4vcGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZCAgICAgICAgICAgICB8ICAyICsKIHNyYy9iaW4v cGdfYmFzZWJhY2t1cC9wZ19iYXNlYmFja3VwLmMgICAgICAgICB8IDk2ICsrKysrKysrKysrKy0t LS0tLS0KIC4uLi9wZ19iYXNlYmFja3VwL3QvMDEyX3dhbF9zbG90X3RpbWluZy5wbCAgICB8IDgy ICsrKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgMTQ5IGluc2VydGlvbnMoKyksIDM1 IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHNyYy9iaW4vcGdfYmFzZWJhY2t1cC90 LzAxMl93YWxfc2xvdF90aW1pbmcucGwKCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2Jhc2ViYWNr dXAvTWFrZWZpbGUgYi9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvTWFrZWZpbGUKaW5kZXggZGY5NGZj MjdkMDIuLjEyZmYzMmUzMjliIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvTWFr ZWZpbGUKKysrIGIvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL01ha2VmaWxlCkBAIC0xMiwxMyArMTIs MTUgQEAKIFBHRklMRURFU0MgPSAicGdfYmFzZWJhY2t1cC9wZ19yZWNlaXZld2FsL3BnX3JlY3Zs b2dpY2FsIC0gc3RyZWFtaW5nIFdBTCBhbmQgYmFja3VwIHJlY2VpdmVycyIKIFBHQVBQSUNPTj13 aW4zMgogCi1FWFRSQV9JTlNUQUxMPWNvbnRyaWIvdGVzdF9kZWNvZGluZworRVhUUkFfSU5TVEFM TD1jb250cmliL3Rlc3RfZGVjb2RpbmcgXAorCXNyYy90ZXN0L21vZHVsZXMvaW5qZWN0aW9uX3Bv aW50cwogCiBzdWJkaXIgPSBzcmMvYmluL3BnX2Jhc2ViYWNrdXAKIHRvcF9idWlsZGRpciA9IC4u Ly4uLy4uCiBpbmNsdWRlICQodG9wX2J1aWxkZGlyKS9zcmMvTWFrZWZpbGUuZ2xvYmFsCiAKICMg bWFrZSB0aGVzZSBhdmFpbGFibGUgdG8gVEFQIHRlc3Qgc2NyaXB0cworZXhwb3J0IGVuYWJsZV9p bmplY3Rpb25fcG9pbnRzCiBleHBvcnQgTFo0CiBleHBvcnQgVEFSCiAjIE5vdGUgdGhhdCBHWklQ IGNhbm5vdCBiZSB1c2VkIGRpcmVjdGx5IGFzIHRoaXMgZW52aXJvbm1lbnQgdmFyaWFibGUgaXMK ZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZCBiL3NyYy9iaW4v cGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZAppbmRleCBkNzBjZTU3ODZhMi4uYzEwYTU2NTEyYTAg MTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZAorKysgYi9zcmMv YmluL3BnX2Jhc2ViYWNrdXAvbWVzb24uYnVpbGQKQEAgLTk2LDEwICs5NiwxMiBAQCB0ZXN0cyAr PSB7CiAgICAgJ2Vudic6IHsnR1pJUF9QUk9HUkFNJzogZ3ppcC5mb3VuZCgpID8gZ3ppcC5mdWxs X3BhdGgoKSA6ICcnLAogICAgICAgICAgICAgJ1RBUic6IHRhci5mb3VuZCgpID8gdGFyLmZ1bGxf cGF0aCgpIDogJycsCiAgICAgICAgICAgICAnTFo0JzogcHJvZ3JhbV9sejQuZm91bmQoKSA/IHBy b2dyYW1fbHo0LmZ1bGxfcGF0aCgpIDogJycsCisgICAgICAgICAgICAnZW5hYmxlX2luamVjdGlv bl9wb2ludHMnOiBnZXRfb3B0aW9uKCdpbmplY3Rpb25fcG9pbnRzJykgPyAneWVzJyA6ICdubycs CiAgICAgfSwKICAgICAndGVzdHMnOiBbCiAgICAgICAndC8wMTBfcGdfYmFzZWJhY2t1cC5wbCcs CiAgICAgICAndC8wMTFfaW5fcGxhY2VfdGFibGVzcGFjZS5wbCcsCisgICAgICAndC8wMTJfd2Fs X3Nsb3RfdGltaW5nLnBsJywKICAgICAgICd0LzAyMF9wZ19yZWNlaXZld2FsLnBsJywKICAgICAg ICd0LzAzMF9wZ19yZWN2bG9naWNhbC5wbCcsCiAgICAgICAndC8wNDBfcGdfY3JlYXRlc3Vic2Ny aWJlci5wbCcsCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvcGdfYmFzZWJhY2t1 cC5jIGIvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL3BnX2Jhc2ViYWNrdXAuYwppbmRleCBjM2I4N2Ex OWU3Ni4uMThlMzY0NTEyOTAgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9wZ19i YXNlYmFja3VwLmMKKysrIGIvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL3BnX2Jhc2ViYWNrdXAuYwpA QCAtMTY1LDYgKzE2NSw5IEBAIHN0YXRpYyBib29sIGZvdW5kX2V4aXN0aW5nX3hsb2dkaXIgPSBm YWxzZTsKIHN0YXRpYyBib29sIG1hZGVfdGFibGVzcGFjZV9kaXJzID0gZmFsc2U7CiBzdGF0aWMg Ym9vbCBmb3VuZF90YWJsZXNwYWNlX2RpcnMgPSBmYWxzZTsKIAorLyogQ29ubmVjdGlvbiBmb3Ig dGhlIGJhY2tncm91bmQgV0FMIHJlY2VpdmVyLCBzZWUgUHJlcGFyZUxvZ1N0cmVhbWVyKCkgKi8K K3N0YXRpYyBQR2Nvbm4gKmJnY29ubiA9IE5VTEw7CisKIC8qIFByb2dyZXNzIGluZGljYXRvcnMg Ki8KIHN0YXRpYyB1aW50NjQgdG90YWxzaXplX2tiOwogc3RhdGljIHVpbnQ2NCB0b3RhbGRvbmU7 CkBAIC02MDcsNiArNjEwLDU1IEBAIExvZ1N0cmVhbWVyTWFpbihsb2dzdHJlYW1lcl9wYXJhbSAq cGFyYW0pCiAJcmV0dXJuIDA7CiB9CiAKKy8qCisgKiBPcGVuIHRoZSBjb25uZWN0aW9uIGZvciB0 aGUgYmFja2dyb3VuZCBXQUwgcmVjZWl2ZXIgYW5kIGNyZWF0ZSBpdHMKKyAqIHJlcGxpY2F0aW9u IHNsb3QsIGlmIG9uZSBpcyBuZWVkZWQuCisgKgorICogVGhpcyBtdXN0IGJlIGRvbmUgYmVmb3Jl IEJBU0VfQkFDS1VQIGlzIHNlbnQ6IHRoZSBzbG90IHJlc2VydmVzIFdBTCBmcm9tCisgKiBpdHMg Y3JlYXRpb24gb253YXJkcywgc28gY3JlYXRpbmcgaXQgZmlyc3QgZ3VhcmFudGVlcyB0aGF0IG5v IFdBTCBmcm9tIHRoZQorICogYmFja3VwJ3Mgc3RhcnQgcG9zaXRpb24gb253YXJkcyBjYW4gYmUg cmVtb3ZlZCBiZWZvcmUgdGhlIHJlY2VpdmVyIHN0YXJ0cworICogc3RyZWFtaW5nLiAgSWYgdGhl IHNsb3Qgd2VyZSBjcmVhdGVkIG9ubHkgYWZ0ZXIgQkFTRV9CQUNLVVAgaGFkIHJldHVybmVkCisg KiB0aGUgc3RhcnQgcG9zaXRpb24sIGEgY2hlY2twb2ludCBpbiBiZXR3ZWVuIGNvdWxkIHJlbW92 ZSBXQUwgdGhlIGJhY2t1cAorICogbmVlZHMuCisgKi8KK3N0YXRpYyB2b2lkCitQcmVwYXJlTG9n U3RyZWFtZXIodm9pZCkKK3sKKwkvKiBHZXQgYSBXQUwgc2VydmluZyBjb25uZWN0aW9uICovCisJ Ymdjb25uID0gR2V0Q29ubmVjdGlvbigpOworCWlmICghYmdjb25uKQorCQkvKiBFcnJvciBtZXNz YWdlIGFscmVhZHkgd3JpdHRlbiBpbiBHZXRDb25uZWN0aW9uKCkgKi8KKwkJZXhpdCgxKTsKKwor CS8qIFRlbXBvcmFyeSByZXBsaWNhdGlvbiBzbG90cyBhcmUgb25seSBzdXBwb3J0ZWQgaW4gMTAg YW5kIG5ld2VyICovCisJaWYgKFBRc2VydmVyVmVyc2lvbihjb25uKSA8IE1JTklNVU1fVkVSU0lP Tl9GT1JfVEVNUF9TTE9UUykKKwkJdGVtcF9yZXBsaWNhdGlvbl9zbG90ID0gZmFsc2U7CisKKwkv KgorCSAqIENyZWF0ZSByZXBsaWNhdGlvbiBzbG90IGlmIHJlcXVlc3RlZAorCSAqLworCWlmICh0 ZW1wX3JlcGxpY2F0aW9uX3Nsb3QgJiYgIXJlcGxpY2F0aW9uX3Nsb3QpCisJCXJlcGxpY2F0aW9u X3Nsb3QgPSBwc3ByaW50ZigicGdfYmFzZWJhY2t1cF8ldSIsCisJCQkJCQkJCQkodW5zaWduZWQg aW50KSBQUWJhY2tlbmRQSUQoYmdjb25uKSk7CisJaWYgKHRlbXBfcmVwbGljYXRpb25fc2xvdCB8 fCBjcmVhdGVfc2xvdCkKKwl7CisJCWlmICghQ3JlYXRlUmVwbGljYXRpb25TbG90KGJnY29ubiwg cmVwbGljYXRpb25fc2xvdCwgTlVMTCwKKwkJCQkJCQkJICAgdGVtcF9yZXBsaWNhdGlvbl9zbG90 LCB0cnVlLCB0cnVlLCBmYWxzZSwKKwkJCQkJCQkJICAgZmFsc2UsIGZhbHNlKSkKKwkJCWV4aXQo MSk7CisKKwkJaWYgKHZlcmJvc2UpCisJCXsKKwkJCWlmICh0ZW1wX3JlcGxpY2F0aW9uX3Nsb3Qp CisJCQkJcGdfbG9nX2luZm8oImNyZWF0ZWQgdGVtcG9yYXJ5IHJlcGxpY2F0aW9uIHNsb3QgXCIl c1wiIiwKKwkJCQkJCQlyZXBsaWNhdGlvbl9zbG90KTsKKwkJCWVsc2UKKwkJCQlwZ19sb2dfaW5m bygiY3JlYXRlZCByZXBsaWNhdGlvbiBzbG90IFwiJXNcIiIsCisJCQkJCQkJcmVwbGljYXRpb25f c2xvdCk7CisJCX0KKwl9Cit9CisKIC8qCiAgKiBJbml0aWF0ZSBiYWNrZ3JvdW5kIHByb2Nlc3Mg Zm9yIHJlY2VpdmluZyB4bG9nIGR1cmluZyB0aGUgYmFja3VwLgogICogVGhlIGJhY2tncm91bmQg c3RyZWFtIHdpbGwgdXNlIGl0cyBvd24gZGF0YWJhc2UgY29ubmVjdGlvbiBzbyB3ZSBjYW4KQEAg LTYyMCw3ICs2NzIsMTAgQEAgU3RhcnRMb2dTdHJlYW1lcihjaGFyICpzdGFydHBvcywgdWludDMy IHRpbWVsaW5lLCBjaGFyICpzeXNpZGVudGlmaWVyLAogCWxvZ3N0cmVhbWVyX3BhcmFtICpwYXJh bTsKIAljaGFyCQlzdGF0dXNkaXJbTUFYUEdQQVRIXTsKIAorCUFzc2VydChiZ2Nvbm4gIT0gTlVM TCk7CisKIAlwYXJhbSA9IHBnX21hbGxvYzBfb2JqZWN0KGxvZ3N0cmVhbWVyX3BhcmFtKTsKKwlw YXJhbS0+Ymdjb25uID0gYmdjb25uOwogCXBhcmFtLT50aW1lbGluZSA9IHRpbWVsaW5lOwogCXBh cmFtLT5zeXNpZGVudGlmaWVyID0gc3lzaWRlbnRpZmllcjsKIAlwYXJhbS0+d2FsX2NvbXByZXNz X2FsZ29yaXRobSA9IHdhbF9jb21wcmVzc19hbGdvcml0aG07CkBAIC02MzksNDYgKzY5NCwxMiBA QCBTdGFydExvZ1N0cmVhbWVyKGNoYXIgKnN0YXJ0cG9zLCB1aW50MzIgdGltZWxpbmUsIGNoYXIg KnN5c2lkZW50aWZpZXIsCiAJCXBnX2ZhdGFsKCJjb3VsZCBub3QgY3JlYXRlIHBpcGUgZm9yIGJh Y2tncm91bmQgcHJvY2VzczogJW0iKTsKICNlbmRpZgogCi0JLyogR2V0IGEgc2Vjb25kIGNvbm5l Y3Rpb24gKi8KLQlwYXJhbS0+Ymdjb25uID0gR2V0Q29ubmVjdGlvbigpOwotCWlmICghcGFyYW0t PmJnY29ubikKLQkJLyogRXJyb3IgbWVzc2FnZSBhbHJlYWR5IHdyaXR0ZW4gaW4gR2V0Q29ubmVj dGlvbigpICovCi0JCWV4aXQoMSk7Ci0KIAkvKiBJbiBwb3N0LTEwIGNsdXN0ZXIsIHBnX3hsb2cg aGFzIGJlZW4gcmVuYW1lZCB0byBwZ193YWwgKi8KIAlzbnByaW50ZihwYXJhbS0+eGxvZywgc2l6 ZW9mKHBhcmFtLT54bG9nKSwgIiVzLyVzIiwKIAkJCSBiYXNlZGlyLAogCQkJIFBRc2VydmVyVmVy c2lvbihjb25uKSA8IE1JTklNVU1fVkVSU0lPTl9GT1JfUEdfV0FMID8KIAkJCSAicGdfeGxvZyIg OiAicGdfd2FsIik7CiAKLQkvKiBUZW1wb3JhcnkgcmVwbGljYXRpb24gc2xvdHMgYXJlIG9ubHkg c3VwcG9ydGVkIGluIDEwIGFuZCBuZXdlciAqLwotCWlmIChQUXNlcnZlclZlcnNpb24oY29ubikg PCBNSU5JTVVNX1ZFUlNJT05fRk9SX1RFTVBfU0xPVFMpCi0JCXRlbXBfcmVwbGljYXRpb25fc2xv dCA9IGZhbHNlOwotCi0JLyoKLQkgKiBDcmVhdGUgcmVwbGljYXRpb24gc2xvdCBpZiByZXF1ZXN0 ZWQKLQkgKi8KLQlpZiAodGVtcF9yZXBsaWNhdGlvbl9zbG90ICYmICFyZXBsaWNhdGlvbl9zbG90 KQotCQlyZXBsaWNhdGlvbl9zbG90ID0gcHNwcmludGYoInBnX2Jhc2ViYWNrdXBfJXUiLAotCQkJ CQkJCQkJKHVuc2lnbmVkIGludCkgUFFiYWNrZW5kUElEKHBhcmFtLT5iZ2Nvbm4pKTsKLQlpZiAo dGVtcF9yZXBsaWNhdGlvbl9zbG90IHx8IGNyZWF0ZV9zbG90KQotCXsKLQkJaWYgKCFDcmVhdGVS ZXBsaWNhdGlvblNsb3QocGFyYW0tPmJnY29ubiwgcmVwbGljYXRpb25fc2xvdCwgTlVMTCwKLQkJ CQkJCQkJICAgdGVtcF9yZXBsaWNhdGlvbl9zbG90LCB0cnVlLCB0cnVlLCBmYWxzZSwKLQkJCQkJ CQkJICAgZmFsc2UsIGZhbHNlKSkKLQkJCWV4aXQoMSk7Ci0KLQkJaWYgKHZlcmJvc2UpCi0JCXsK LQkJCWlmICh0ZW1wX3JlcGxpY2F0aW9uX3Nsb3QpCi0JCQkJcGdfbG9nX2luZm8oImNyZWF0ZWQg dGVtcG9yYXJ5IHJlcGxpY2F0aW9uIHNsb3QgXCIlc1wiIiwKLQkJCQkJCQlyZXBsaWNhdGlvbl9z bG90KTsKLQkJCWVsc2UKLQkJCQlwZ19sb2dfaW5mbygiY3JlYXRlZCByZXBsaWNhdGlvbiBzbG90 IFwiJXNcIiIsCi0JCQkJCQkJcmVwbGljYXRpb25fc2xvdCk7Ci0JCX0KLQl9Ci0KIAlpZiAoZm9y bWF0ID09ICdwJykKIAl7CiAJCS8qCkBAIC0xOTcwLDYgKzE5OTEsMTMgQEAgQmFzZUJhY2t1cChj aGFyICpjb21wcmVzc2lvbl9hbGdvcml0aG0sIGNoYXIgKmNvbXByZXNzaW9uX2RldGFpbCwKIAkJ CQkJCQkJCSAgY29tcHJlc3Npb25fZGV0YWlsKTsKIAl9CiAKKwkvKgorCSAqIElmIHN0cmVhbWlu ZyBXQUwsIGNyZWF0ZSB0aGUgcmVwbGljYXRpb24gc2xvdCBiZWZvcmUgc3RhcnRpbmcgdGhlCisJ ICogYmFja3VwLCBzbyB0aGF0IGl0IHByb3RlY3RzIGFsbCB0aGUgV0FMIHRoZSBiYWNrdXAgbmVl ZHMuCisJICovCisJaWYgKGluY2x1ZGV3YWwgPT0gU1RSRUFNX1dBTCkKKwkJUHJlcGFyZUxvZ1N0 cmVhbWVyKCk7CisKIAlpZiAodmVyYm9zZSkKIAkJcGdfbG9nX2luZm8oImluaXRpYXRpbmcgYmFz ZSBiYWNrdXAsIHdhaXRpbmcgZm9yIGNoZWNrcG9pbnQgdG8gY29tcGxldGUiKTsKIApkaWZmIC0t Z2l0IGEvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL3QvMDEyX3dhbF9zbG90X3RpbWluZy5wbCBiL3Ny Yy9iaW4vcGdfYmFzZWJhY2t1cC90LzAxMl93YWxfc2xvdF90aW1pbmcucGwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjBkZTVlMjQwNThiCi0tLSAvZGV2L251bGwKKysr IGIvc3JjL2Jpbi9wZ19iYXNlYmFja3VwL3QvMDEyX3dhbF9zbG90X3RpbWluZy5wbApAQCAtMCww ICsxLDgyIEBACisjIENvcHlyaWdodCAoYykgMjAyNiwgUG9zdGdyZVNRTCBHbG9iYWwgRGV2ZWxv cG1lbnQgR3JvdXAKKworIyBDaGVjayB0aGF0IHBnX2Jhc2ViYWNrdXAncyByZXBsaWNhdGlvbiBz bG90IHJlc2VydmVzIFdBTCBmcm9tIGJlZm9yZSB0aGUKKyMgYmFja3VwJ3Mgc3RhcnQgcG9zaXRp b24uICBJZiB0aGUgc2xvdCB3ZXJlIGNyZWF0ZWQgb25seSBhZnRlciBCQVNFX0JBQ0tVUAorIyBo YWQgcmV0dXJuZWQgdGhlIHN0YXJ0IHBvc2l0aW9uLCBhIGNoZWNrcG9pbnQgcnVubmluZyBpbiBi ZXR3ZWVuIGNvdWxkCisjIHJlbW92ZSB0aGUgV0FMIHRoZSBiYWNrdXAgbmVlZHMsIGFuZCBzdHJl YW1pbmcgaXQgd291bGQgZmFpbC4KKyMKKyMgV2UgaG9sZCB0aGUgc2xvdCBjcmVhdGlvbiB3aXRo IGFuIGluamVjdGlvbiBwb2ludCwgZm9yY2UgV0FMIHBhc3Qgc2V2ZXJhbAorIyBzZWdtZW50cyBh bmQgY2hlY2twb2ludCwgdGhlbiBsZXQgdGhlIHNsb3QgY3JlYXRpb24gY29udGludWUuCisKK3Vz ZSBzdHJpY3Q7Cit1c2Ugd2FybmluZ3MgRkFUQUwgPT4gJ2FsbCc7Cit1c2UgUG9zdGdyZVNRTDo6 VGVzdDo6Q2x1c3RlcjsKK3VzZSBQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczsKK3VzZSBUZXN0OjpN b3JlOworCitpZiAoJEVOVntlbmFibGVfaW5qZWN0aW9uX3BvaW50c30gbmUgJ3llcycpCit7CisJ cGxhbiBza2lwX2FsbCA9PiAnSW5qZWN0aW9uIHBvaW50cyBub3Qgc3VwcG9ydGVkIGJ5IHRoaXMg YnVpbGQnOworfQorCitteSAkdGVtcGRpciA9IFBvc3RncmVTUUw6OlRlc3Q6OlV0aWxzOjp0ZW1w ZGlyOworCitteSAkbm9kZSA9IFBvc3RncmVTUUw6OlRlc3Q6OkNsdXN0ZXItPm5ldygnbWFpbicp OworJG5vZGUtPmluaXQoYWxsb3dzX3N0cmVhbWluZyA9PiAxKTsKKyRub2RlLT5hcHBlbmRfY29u ZigKKwkncG9zdGdyZXNxbC5jb25mJywgcXsKK3dhbF9rZWVwX3NpemUgPSAwCitjaGVja3BvaW50 X3RpbWVvdXQgPSAxaAorfSk7Ciskbm9kZS0+c3RhcnQ7CisKK2lmICghJG5vZGUtPmNoZWNrX2V4 dGVuc2lvbignaW5qZWN0aW9uX3BvaW50cycpKQoreworCXBsYW4gc2tpcF9hbGwgPT4gJ0V4dGVu c2lvbiBpbmplY3Rpb25fcG9pbnRzIG5vdCBpbnN0YWxsZWQnOworfQorCiskbm9kZS0+c2FmZV9w c3FsKCdwb3N0Z3JlcycsICdDUkVBVEUgRVhURU5TSU9OIGluamVjdGlvbl9wb2ludHMnKTsKKyRu b2RlLT5zYWZlX3BzcWwoJ3Bvc3RncmVzJywKKwkiU0VMRUNUIGluamVjdGlvbl9wb2ludHNfYXR0 YWNoKCdyZXBsaWNhdGlvbi1zbG90LWNyZWF0ZS1iZWdpbicsICd3YWl0JykiCispOworCitteSAk YmFja3VwZGlyID0gIiR0ZW1wZGlyL2JhY2t1cCI7CitteSAoJHN0ZG91dCwgJHN0ZGVycik7Citt eSAkaCA9IElQQzo6UnVuOjpzdGFydCgKKwlbCisJCSdwZ19iYXNlYmFja3VwJywgJy0tbm8tc3lu YycsCisJCSctLWNoZWNrcG9pbnQnID0+ICdmYXN0JywKKwkJJy0tcGdkYXRhJyA9PiAkYmFja3Vw ZGlyLAorCQknLS13YWwtbWV0aG9kJyA9PiAnc3RyZWFtJywKKwkJJy0tZGJuYW1lJyA9PiAkbm9k ZS0+Y29ubnN0cigncG9zdGdyZXMnKSwKKwldLAorCSc+JyA9PiBcJHN0ZG91dCwKKwknMj4nID0+ IFwkc3RkZXJyKTsKKworIyBXYWl0IHVudGlsIHRoZSB3YWxzZW5kZXIgaXMgYWJvdXQgdG8gY3Jl YXRlIHBnX2Jhc2ViYWNrdXAncyBzbG90LgorJG5vZGUtPndhaXRfZm9yX2V2ZW50KCd3YWxzZW5k ZXInLCAncmVwbGljYXRpb24tc2xvdC1jcmVhdGUtYmVnaW4nKTsKKworIyBNb3ZlIFdBTCBmb3J3 YXJkIGJ5IHNldmVyYWwgc2VnbWVudHMgYW5kIGNoZWNrcG9pbnQsIHNvIHRoYXQgZXZlcnkgc2Vn bWVudAorIyBub3QgcHJvdGVjdGVkIGJ5IGEgc2xvdCBvciB3YWxfa2VlcF9zaXplIGlzIHJlbW92 ZWQgb3IgcmVjeWNsZWQuCiskbm9kZS0+YWR2YW5jZV93YWwoMyk7Ciskbm9kZS0+c2FmZV9wc3Fs KCdwb3N0Z3JlcycsICdDSEVDS1BPSU5UJyk7CisKKyRub2RlLT5zYWZlX3BzcWwoJ3Bvc3RncmVz JywKKwkiU0VMRUNUIGluamVjdGlvbl9wb2ludHNfZGV0YWNoKCdyZXBsaWNhdGlvbi1zbG90LWNy ZWF0ZS1iZWdpbicpIik7Ciskbm9kZS0+c2FmZV9wc3FsKCdwb3N0Z3JlcycsCisJIlNFTEVDVCBp bmplY3Rpb25fcG9pbnRzX3dha2V1cCgncmVwbGljYXRpb24tc2xvdC1jcmVhdGUtYmVnaW4nKSIp OworCitteSAkb2sgPSAkaC0+ZmluaXNoOworb2soJG9rLCAncGdfYmFzZWJhY2t1cCBzdWNjZWVk cyB3aXRoIFdBTCBhY3Rpdml0eSBkdXJpbmcgc2xvdCBjcmVhdGlvbicpCisgIG9yIGRpYWcoInBn X2Jhc2ViYWNrdXAgc3RkZXJyOlxuJHN0ZGVyciIpOwordW5saWtlKAorCSRzdGRlcnIsCisJcXIv aGFzIGFscmVhZHkgYmVlbiByZW1vdmVkLywKKwknbm8gV0FMIG5lZWRlZCBieSB0aGUgYmFja3Vw IHdhcyByZW1vdmVkJyk7CisKKyMgcGdfdmVyaWZ5YmFja3VwIGFsc28gcGFyc2VzIHRoZSBXQUwg dGhlIGJhY2t1cCBuZWVkcywgc28gdGhpcyBmYWlscyBpZgorIyBhbnkgb2YgaXQgaXMgbWlzc2lu Zy4KKyRub2RlLT5jb21tYW5kX29rKFsgJ3BnX3ZlcmlmeWJhY2t1cCcsICRiYWNrdXBkaXIgXSwK KwknYmFja3VwIHdpdGggc3RyZWFtZWQgV0FMIHZlcmlmaWVzJyk7CisKK2RvbmVfdGVzdGluZygp OwotLSAKMi41Ni4wCgo= --=_340b581ac93fe8859faa295a55089e8b--