Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gXUFN-0006LW-Mc for pgsql-hackers@arkaria.postgresql.org; Thu, 13 Dec 2018 16:54:01 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1gXUFM-0007IC-5W for pgsql-hackers@arkaria.postgresql.org; Thu, 13 Dec 2018 16:54:00 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gXUFL-0007I5-Un for pgsql-hackers@lists.postgresql.org; Thu, 13 Dec 2018 16:53:59 +0000 Received: from mail.thelabyrinth.net ([45.56.70.56]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gXUFJ-0003lc-EZ for pgsql-hackers@postgresql.org; Thu, 13 Dec 2018 16:53:59 +0000 Received: from Davids-iMac.local (c-73-39-99-224.hsd1.de.comcast.net [73.39.99.224]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dsteele) by mail.thelabyrinth.net (Postfix) with ESMTPSA id D240D5467C; Thu, 13 Dec 2018 16:53:54 +0000 (UTC) To: Pg Hackers From: David Steele Subject: Change pgarch_readyXlog() to return .history files first Openpgp: preference=signencrypt Autocrypt: addr=david@pgmasters.net; prefer-encrypt=mutual; keydata= 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 Cc: Michael Paquier Message-ID: <929068cf-69e1-bba2-9dc0-e05986aed471@pgmasters.net> Date: Thu, 13 Dec 2018 11:53:53 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.3.3 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------E7C6763ED78A4AB693E5232F" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------E7C6763ED78A4AB693E5232F Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Hackers, The alphabetical ordering of pgarch_readyXlog() means that on promotion 000000010000000100000001.partial will be archived before 00000002.history. This appears harmless, but the .history files are what other potential primaries use to decide what timeline they should pick. The additional latency of compressing/transferring the much larger partial file means that archiving of the .history file is delayed and greatly increases the chance that another primary will promote to the same timeline. Teach pgarch_readyXlog() to return .history files first (and in order) to reduce the window where this can happen. This won't prevent all conflicts, but it is a simple change and should greatly reduce real-world occurrences. I also think we should consider back-patching this change. It's hard to imagine that archive commands would have trouble with this reordering and the current ordering causes real pain in HA clusters. Regards, -- -David david@pgmasters.net --------------E7C6763ED78A4AB693E5232F Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="history-files-first-v1.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="history-files-first-v1.patch" RnJvbSAyMjc5Njk3Y2U4MjhlODI1MDY2MDY1ZTNlNDBjOTkyNjYzMzUyM2FkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBTdGVlbGUgPGRhdmlkQHBnbWFzdGVycy5u ZXQ+CkRhdGU6IFRodSwgMTMgRGVjIDIwMTggMTE6MDA6MzcgLTA1MDAKU3ViamVjdDogW1BB VENIXSBDaGFuZ2UgcGdhcmNoX3JlYWR5WGxvZygpIHRvIHJldHVybiAuaGlzdG9yeSBmaWxl cyBmaXJzdAoKVGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiBwZ2FyY2hfcmVhZHlYbG9n KCkgbWVhbnMgdGhhdCBvbiBwcm9tb3Rpb24gCjAwMDAwMDAxMDAwMDAwMDEwMDAwMDAwMS5w YXJ0aWFsIHdpbGwgYmUgYXJjaGl2ZWQgYmVmb3JlIDAwMDAwMDAyLmhpc3RvcnkuCgpUaGlz IGFwcGVhcnMgaGFybWxlc3MsIGJ1dCB0aGUgLmhpc3RvcnkgZmlsZXMgYXJlIHdoYXQgb3Ro ZXIgcG90ZW50aWFsIHByaW1hcmllcyAKdXNlIHRvIGRlY2lkZSB3aGF0IHRpbWVsaW5lIHRo ZXkgc2hvdWxkIHBpY2suICBUaGUgYWRkaXRpb25hbCBsYXRlbmN5IG9mIApjb21wcmVzc2lu Zy90cmFuc2ZlcnJpbmcgdGhlIG11Y2ggbGFyZ2VyIHBhcnRpYWwgZmlsZSBtZWFucyB0aGF0 IGFyY2hpdmluZyBvZiAKdGhlIC5oaXN0b3J5IGZpbGUgaXMgZGVsYXllZCBhbmQgZ3JlYXRs eSBpbmNyZWFzZXMgdGhlIGNoYW5jZSB0aGF0IGFub3RoZXIgCnByaW1hcnkgd2lsbCBwcm9t b3RlIHRvIHRoZSBzYW1lIHRpbWVsaW5lLgoKVGVhY2ggcGdhcmNoX3JlYWR5WGxvZygpIHRv IHJldHVybiAuaGlzdG9yeSBmaWxlcyBmaXJzdCAoYW5kIGluIG9yZGVyKSB0byByZWR1Y2Ug CnRoZSB3aW5kb3cgd2hlcmUgdGhpcyBjYW4gaGFwcGVuLiAgVGhpcyB3b24ndCBwcmV2ZW50 IGFsbCBjb25mbGljdHMsIGJ1dCBpdCBpcyBhIApzaW1wbGUgY2hhbmdlIGFuZCBzaG91bGQg Z3JlYXRseSByZWR1Y2UgcmVhbC13b3JsZCBvY2N1cnJlbmNlcy4KLS0tCiBzcmMvYmFja2Vu ZC9wb3N0bWFzdGVyL3BnYXJjaC5jIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3BnYXJjaC5jIGIvc3JjL2Jh Y2tlbmQvcG9zdG1hc3Rlci9wZ2FyY2guYwppbmRleCAwZGNmNjA5ZjE5Li41ZGJhYjZhM2Q3 IDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3BnYXJjaC5jCisrKyBiL3Ny Yy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcGdhcmNoLmMKQEAgLTcwNCwxMSArNzA0LDExIEBAIHBn YXJjaF9hcmNoaXZlWGxvZyhjaGFyICp4bG9nKQogICogMikgYmVjYXVzZSB0aGUgb2xkZXN0 IG9uZXMgd2lsbCBzb29uZXIgYmVjb21lIGNhbmRpZGF0ZXMgZm9yCiAgKiByZWN5Y2xpbmcg YXQgdGltZSBvZiBjaGVja3BvaW50CiAgKgotICogTk9URTogdGhlICJvbGRlc3QiIGNvbXBh cmlzb24gd2lsbCBwcmVzZW50bHkgY29uc2lkZXIgYWxsIHNlZ21lbnRzIG9mCi0gKiBhIHRp bWVsaW5lIHdpdGggYSBzbWFsbGVyIElEIHRvIGJlIG9sZGVyIHRoYW4gYWxsIHNlZ21lbnRz IG9mIGEgdGltZWxpbmUKLSAqIHdpdGggYSBsYXJnZXIgSUQ7IHRoZSBuZXQgcmVzdWx0IGJl aW5nIHRoYXQgcGFzdCB0aW1lbGluZXMgYXJlIGdpdmVuCi0gKiBoaWdoZXIgcHJpb3JpdHkg Zm9yIGFyY2hpdmluZy4gIFRoaXMgc2VlbXMgb2theSwgb3IgYXQgbGVhc3Qgbm90Ci0gKiBv YnZpb3VzbHkgd29ydGggY2hhbmdpbmcuCisgKiBOT1RFOiB0aGUgIm9sZGVzdCIgY29tcGFy aXNvbiB3aWxsIGNvbnNpZGVyIGFueSAuaGlzdG9yeSBmaWxlIHRvIGJlIG9sZGVyCisgKiB0 aGFuIGFueSBvdGhlciBmaWxlIGV4Y2VwdCBhbm90aGVyIC5oaXN0b3J5IGZpbGUuICBTZWdt ZW50cyBvbiBhIHRpbWVsaW5lCisgKiB3aXRoIGEgc21hbGxlciBJRCB3aWxsIGJlIG9sZGVy IHRoYW4gYWxsIHNlZ21lbnRzIG9uIGEgdGltZWxpbmUgd2l0aCBhIGxhcmdlcgorICogSUQ7 IHRoZSBuZXQgcmVzdWx0IGJlaW5nIHRoYXQgcGFzdCB0aW1lbGluZXMgYXJlIGdpdmVuIGhp Z2hlciBwcmlvcml0eSBmb3IKKyAqIGFyY2hpdmluZy4gIFRoaXMgc2VlbXMgb2theSwgb3Ig YXQgbGVhc3Qgbm90IG9idmlvdXNseSB3b3J0aCBjaGFuZ2luZy4KICAqLwogc3RhdGljIGJv b2wKIHBnYXJjaF9yZWFkeVhsb2coY2hhciAqeGxvZykKQEAgLTcyNCw2ICs3MjQsNyBAQCBw Z2FyY2hfcmVhZHlYbG9nKGNoYXIgKnhsb2cpCiAJRElSCQkgICAqcmxkaXI7CiAJc3RydWN0 IGRpcmVudCAqcmxkZTsKIAlib29sCQlmb3VuZCA9IGZhbHNlOworCWJvb2wJCWhpc3RvcnlG b3VuZCA9IGZhbHNlOwogCiAJc25wcmludGYoWExvZ0FyY2hpdmVTdGF0dXNEaXIsIE1BWFBH UEFUSCwgWExPR0RJUiAiL2FyY2hpdmVfc3RhdHVzIik7CiAJcmxkaXIgPSBBbGxvY2F0ZURp cihYTG9nQXJjaGl2ZVN0YXR1c0Rpcik7CkBAIC03MzcsMTIgKzczOCwyNyBAQCBwZ2FyY2hf cmVhZHlYbG9nKGNoYXIgKnhsb2cpCiAJCQlzdHJzcG4ocmxkZS0+ZF9uYW1lLCBWQUxJRF9Y Rk5fQ0hBUlMpID49IGJhc2VuYW1lbGVuICYmCiAJCQlzdHJjbXAocmxkZS0+ZF9uYW1lICsg YmFzZW5hbWVsZW4sICIucmVhZHkiKSA9PSAwKQogCQl7Ci0JCQlpZiAoIWZvdW5kKQorCQkJ LyogSXMgdGhpcyBhIGhpc3RvcnkgZmlsZT8gKi8KKwkJCWJvb2wgaGlzdG9yeSA9IGJhc2Vu YW1lbGVuID49IHNpemVvZigiLmhpc3RvcnkiKSAmJgorCQkJCXN0cmNtcChybGRlLT5kX25h bWUgKyAoYmFzZW5hbWVsZW4gLSBzaXplb2YoIi5oaXN0b3J5IikgKyAxKSwKKwkJCQkJICAg Ii5oaXN0b3J5LnJlYWR5IikgPT0gMDsKKworCQkJLyoKKwkJCSAqIElmIHRoaXMgaXMgdGhl IGZpcnN0IGZpbGUgb3IgdGhlIGZpcnN0IGhpc3RvcnkgZmlsZSwgY29weSBpdAorCQkJICov CisJCQlpZiAoIWZvdW5kIHx8IGhpc3RvcnkgJiYgIWhpc3RvcnlGb3VuZCkKIAkJCXsKIAkJ CQlzdHJjcHkobmV3eGxvZywgcmxkZS0+ZF9uYW1lKTsKIAkJCQlmb3VuZCA9IHRydWU7CisJ CQkJaGlzdG9yeUZvdW5kID0gaGlzdG9yeTsKIAkJCX0KLQkJCWVsc2UKKwkJCS8qCisJCQkg KiBFbHNlIGNvbXBhcmUgYW5kIHNlZSBpZiB0aGlzIGZpbGUgaXMgYWxwYWJldGljYWxseSBs ZXNzIHRoYW4KKwkJCSAqIHdoYXQgd2UgYWxyZWFkeSBoYXZlLiAgSWYgc28sIGNvcHkgaXQu ICBIaXN0b3J5IGZpbGVzIGFsd2F5cyBnZXQKKwkJCSAqIHRoaXMgY29tcGFyaXNvbiBidXQg b3RoZXIgZmlsZXMgb25seSBkbyB3aGVuIG5vIGhpc3RvcnkgZmlsZSBoYXMKKwkJCSAqIGJl ZW4gZm91bmQgeWV0LgorCQkJICovCisJCQllbHNlIGlmIChoaXN0b3J5IHx8ICFoaXN0b3J5 ICYmICFoaXN0b3J5Rm91bmQpCiAJCQl7CiAJCQkJaWYgKHN0cmNtcChybGRlLT5kX25hbWUs IG5ld3hsb2cpIDwgMCkKIAkJCQkJc3RyY3B5KG5ld3hsb2csIHJsZGUtPmRfbmFtZSk7Ci0t IAoyLjE3LjIgKEFwcGxlIEdpdC0xMTMpCg== --------------E7C6763ED78A4AB693E5232F--