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.94.2) (envelope-from ) id 1sKgqe-00BcpT-VI for pgsql-hackers@arkaria.postgresql.org; Fri, 21 Jun 2024 16:10:49 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1sKgqd-004SyO-D0 for pgsql-hackers@arkaria.postgresql.org; Fri, 21 Jun 2024 16:10:47 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sKgqc-004Sxn-Oq for pgsql-hackers@lists.postgresql.org; Fri, 21 Jun 2024 16:10:47 +0000 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1sKgqX-002RFa-T5 for pgsql-hackers@postgresql.org; Fri, 21 Jun 2024 16:10:44 +0000 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a6f1c4800easo250813166b.3 for ; Fri, 21 Jun 2024 09:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb.com; s=google; t=1718986240; x=1719591040; darn=postgresql.org; h=in-reply-to:content-language:references:to:from:subject:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=yKctmp4W1z2ec4f1aCMOMXJiXiT7CIm8f4Kk8HO/NPA=; b=NCfl/kX2Jf7H5S7oNuncQGgbPAsTzAlC/W0EQghQB4CqVVC9gLFy5Px6mCgCNMjJHZ j+mZiIYzQa4t+KIGf3kfaqJzA4iEXdZugUkEbQnCLO3+UL/JzXGV1CTaT68jddOjkTTO ZIv3KrEzTN2FNG4FX3T4SXDukmU1InAQ/GzIfUkxT5lLxvkbu7RGcP5T8Z9+LowJF2si m3GiIRXf2uK2mdSntjZQQPSicEm592fYalnfytBMaVEOd+aotUPJsdsUWeZ9h24nJ0F6 b/mIR3wjJBkrxGlV5jcYMxErAyugpRdKMzsoeNHgEAVXENSeRfrkcdjBEVeyJrUVyXBK kUBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718986240; x=1719591040; h=in-reply-to:content-language:references:to:from:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=yKctmp4W1z2ec4f1aCMOMXJiXiT7CIm8f4Kk8HO/NPA=; b=ZfIZMdyYhWOdf3FwK1+3D+iD//SmwfsimSG+pgNzSl4N61SbuzmwCjIPwYuBS9bwy8 BEloI4vl9HF8/3zIoXfylSbVNSBSrVyXKXbgIAq+G+Q3XI2uz9/WJUbTqceG7X/tP7rO hxFMGz2nnN39hSV8Fkdg8HRVAUtNmzOlyDMo5a+C/XQlaUsz2eX4xkJAyJ+GbZzHV3Yx 0B/OLOFLeBU1MgxSxYZXcYiXo2iXlH6yhUHyAeMeKMWklixz16c6v7O57q1FBL117S14 J9TkobgYsnwcdeJB0kEkD48QtJGBbX4b+AorWMwSpiW/229RiDdiEAJJpHrgAiayGiht bR3Q== X-Forwarded-Encrypted: i=1; AJvYcCXT7CdJsAqkAHbdgxbnIoLOEPupD9JXvYZ730Dfmbht6v1Ic2OeJp0s03TWay5ZmeEj8qFT5jfVLIwjkSjni0T6f3RU7D0EoLKdIAt7 X-Gm-Message-State: AOJu0YztyqdSVzXf7Hzj/Wn5F0zQgrjR3krCAXWeHFYpK/cnzsmideWU 8IhJVPBTheQ+k80VMjS+blNDrIJQOMdA4qEWcGdHNtfvfd0sM6K6RvmrmQI02Q== X-Google-Smtp-Source: AGHT+IHj0slvEYNma9F3njX1J8uPK7K+bpgVpYt0SzmfGCJFXt3wj+dI6vZKvrb290T/HQ1r8P7D5Q== X-Received: by 2002:a17:907:d507:b0:a6f:48b2:aac5 with SMTP id a640c23a62f3a-a6fab60bae4mr573018966b.15.1718986239585; Fri, 21 Jun 2024 09:10:39 -0700 (PDT) Received: from [10.137.0.18] (ip-86-49-229-30.bb.vodafone.cz. [86.49.229.30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6fcf56096csm99147366b.149.2024.06.21.09.10.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Jun 2024 09:10:38 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------bwhAuqRPebFLDVfJZngcpjAs" Message-ID: Date: Fri, 21 Jun 2024 18:10:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: pg_combinebackup --clone doesn't work From: Tomas Vondra To: Peter Eisentraut , pgsql-hackers References: <48da4a1f-ccd9-4988-9622-24f37b1de2b4@eisentraut.org> <9498bcb1-ee7b-484f-b2fb-3d22c48cb4c5@enterprisedb.com> Content-Language: en-US In-Reply-To: <9498bcb1-ee7b-484f-b2fb-3d22c48cb4c5@enterprisedb.com> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------bwhAuqRPebFLDVfJZngcpjAs Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 6/21/24 00:07, Tomas Vondra wrote: > Here's a fix adding the missing headers to pg_combinebackup, and fixing > some compile-time issues in the ifdef-ed block. > > I've done some basic manual testing today - I plan to test this a bit > more tomorrow, and I'll also look at integrating this into the existing > tests. > Here's a bit more complete / cleaned patch, adding the testing changes in separate parts. 0001 adds the missing headers / fixes the now-accessible code a bit 0002 adds the --copy option for consistency with pg_upgrade 0003 adds the PG_TEST_PG_COMBINEBACKUP_MODE, so that we can override the copy method for tests 0004 tweaks two of the Cirrus CI tasks to use --clone/--copy-file-range I believe 0001-0003 are likely non-controversial, although if someone could take a look at the Perl in 0003 that'd be nice. Also, 0002 seems nice not only because of consistency with pg_upgrade, but it also makes 0003 easier as we don't need to special-case the default mode etc. I'm not sure about 0004 - I initially did this mostly to check we have the right headers on other platforms, but not sure we want to actually do this. Or maybe we want to test a different combination (e.g. also test the --clone on Linux)? regards -- Tomas Vondra EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --------------bwhAuqRPebFLDVfJZngcpjAs Content-Type: text/x-patch; charset=UTF-8; name="0001-Add-headers-needed-by-pg_combinebackup-clone.patch" Content-Disposition: attachment; filename="0001-Add-headers-needed-by-pg_combinebackup-clone.patch" Content-Transfer-Encoding: base64 RnJvbSA5NDA4MjYyNGRiNWQ3NjA4ZjNmYjdhNWI5MzIyZWU5MGRjNWNmY2I1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBWb25kcmEgPHRvbWFzQDJuZHF1YWRyYW50 LmNvbT4KRGF0ZTogVGh1LCAyMCBKdW4gMjAyNCAyMzo1MDoyMiArMDIwMApTdWJqZWN0OiBb UEFUQ0ggMS80XSBBZGQgaGVhZGVycyBuZWVkZWQgYnkgcGdfY29tYmluZWJhY2t1cCAtLWNs b25lCgpUaGUgY29kZSBmb3IgY2xvbmluZyBmaWxlcyBleGlzdGVkLCBidXQgd2FzIGluYWNj ZXNzaWJsZSBhcyBpdCByZWxpZWQgb24KY29uc3RhbnRzIGZyb20gbWlzc2luZyBoZWFkZXJz LiBUaGUgY29uc2VxdWVuY2UgaXMgdGhhdCBvbiBMaW51eCAtLWNsb25lCmFsd2F5cyBmYWls ZWQgd2l0aAoKICAgIGVycm9yOiBmaWxlIGNsb25pbmcgbm90IHN1cHBvcnRlZCBvbiB0aGlz IHBsYXRmb3JtCgpGaXhlZCBieSBpbmNsdWRpbmcgdGhlIG1pc3NpbmcgaGVhZGVycyB0byBy ZWxldmFudCBwbGFjZXMuIFRoaXMgcmV2ZWFsZWQKYSBjb3VwbGUgY29tcGlsZSBlcnJvcnMg aW4gY29weV9maWxlX2Nsb25lKCksIHNvIGZpeCB0aG9zZSB0b28uCgpSZXBvcnRlZC1ieTog UGV0ZXIgRWlzZW50cmF1dApEaXNjdXNzaW9uOiBodHRwczovL3Bvc3Rnci5lcy9tLzQ4ZGE0 YTFmLWNjZDktNDk4OC05NjIyLTI0ZjM3YjFkZTJiNCU0MGVpc2VudHJhdXQub3JnCi0tLQog c3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL2NvcHlfZmlsZS5jICAgICAgICB8IDEyICsrKysr KysrKysrLQogc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3BnX2NvbWJpbmViYWNrdXAuYyB8 ICA4ICsrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvY29weV9m aWxlLmMgYi9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvY29weV9maWxlLmMKaW5kZXggMDhj M2I4NzU0MjAuLjhiNTBlOTM3MzQ2IDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2NvbWJpbmVi YWNrdXAvY29weV9maWxlLmMKKysrIGIvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL2NvcHlf ZmlsZS5jCkBAIC0xMyw2ICsxMywxMCBAQAogI2lmZGVmIEhBVkVfQ09QWUZJTEVfSAogI2lu Y2x1ZGUgPGNvcHlmaWxlLmg+CiAjZW5kaWYKKyNpZmRlZiBfX2xpbnV4X18KKyNpbmNsdWRl IDxzeXMvaW9jdGwuaD4KKyNpbmNsdWRlIDxsaW51eC9mcy5oPgorI2VuZGlmCiAjaW5jbHVk ZSA8ZmNudGwuaD4KICNpbmNsdWRlIDxsaW1pdHMuaD4KICNpbmNsdWRlIDxzeXMvc3RhdC5o PgpAQCAtMjE0LDYgKzIxOCw5IEBAIGNvcHlfZmlsZV9jbG9uZShjb25zdCBjaGFyICpzcmMs IGNvbnN0IGNoYXIgKmRlc3QsCiAJCXBnX2ZhdGFsKCJlcnJvciB3aGlsZSBjbG9uaW5nIGZp bGUgXCIlc1wiIHRvIFwiJXNcIjogJW0iLCBzcmMsIGRlc3QpOwogI2VsaWYgZGVmaW5lZChf X2xpbnV4X18pICYmIGRlZmluZWQoRklDTE9ORSkKIAl7CisJCWludAkJCXNyY19mZDsKKwkJ aW50CQkJZGVzdF9mZDsKKwogCQlpZiAoKHNyY19mZCA9IG9wZW4oc3JjLCBPX1JET05MWSB8 IFBHX0JJTkFSWSwgMCkpIDwgMCkKIAkJCXBnX2ZhdGFsKCJjb3VsZCBub3Qgb3BlbiBmaWxl IFwiJXNcIjogJW0iLCBzcmMpOwogCkBAIC0yMjgsOCArMjM1LDExIEBAIGNvcHlfZmlsZV9j bG9uZShjb25zdCBjaGFyICpzcmMsIGNvbnN0IGNoYXIgKmRlc3QsCiAJCQl1bmxpbmsoZGVz dCk7CiAKIAkJCXBnX2ZhdGFsKCJlcnJvciB3aGlsZSBjbG9uaW5nIGZpbGUgXCIlc1wiIHRv IFwiJXNcIjogJXMiLAotCQkJCQkgc3JjLCBkZXN0KTsKKwkJCQkJIHNyYywgZGVzdCwgc3Ry ZXJyb3Ioc2F2ZV9lcnJubykpOwogCQl9CisKKwkJY2xvc2Uoc3JjX2ZkKTsKKwkJY2xvc2Uo ZGVzdF9mZCk7CiAJfQogI2Vsc2UKIAlwZ19mYXRhbCgiZmlsZSBjbG9uaW5nIG5vdCBzdXBw b3J0ZWQgb24gdGhpcyBwbGF0Zm9ybSIpOwpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19jb21i aW5lYmFja3VwL3BnX2NvbWJpbmViYWNrdXAuYyBiL3NyYy9iaW4vcGdfY29tYmluZWJhY2t1 cC9wZ19jb21iaW5lYmFja3VwLmMKaW5kZXggMDFkN2ZiOThlNzkuLmY2N2NjZjc2ZWEyIDEw MDY0NAotLS0gYS9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvcGdfY29tYmluZWJhY2t1cC5j CisrKyBiL3NyYy9iaW4vcGdfY29tYmluZWJhY2t1cC9wZ19jb21iaW5lYmFja3VwLmMKQEAg LTE2LDYgKzE2LDE0IEBACiAjaW5jbHVkZSA8ZmNudGwuaD4KICNpbmNsdWRlIDxsaW1pdHMu aD4KIAorI2lmZGVmIEhBVkVfQ09QWUZJTEVfSAorI2luY2x1ZGUgPGNvcHlmaWxlLmg+Cisj ZW5kaWYKKyNpZmRlZiBfX2xpbnV4X18KKyNpbmNsdWRlIDxzeXMvaW9jdGwuaD4KKyNpbmNs dWRlIDxsaW51eC9mcy5oPgorI2VuZGlmCisKICNpbmNsdWRlICJiYWNrdXBfbGFiZWwuaCIK ICNpbmNsdWRlICJjb21tb24vYmxrcmVmdGFibGUuaCIKICNpbmNsdWRlICJjb21tb24vY2hl Y2tzdW1faGVscGVyLmgiCi0tIAoyLjQ1LjIKCg== --------------bwhAuqRPebFLDVfJZngcpjAs Content-Type: text/x-patch; charset=UTF-8; name="0002-Introduce-pg_combinebackup-copy-option.patch" Content-Disposition: attachment; filename="0002-Introduce-pg_combinebackup-copy-option.patch" Content-Transfer-Encoding: base64 RnJvbSA5M2VjYmU2MTE5MzYyNzkxMjdjZWJjNWRkZmVmYjZlYmYxZjQ3MzBmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBWb25kcmEgPHRvbWFzQDJuZHF1YWRyYW50 LmNvbT4KRGF0ZTogRnJpLCAyMSBKdW4gMjAyNCAxNDozNjowNCArMDIwMApTdWJqZWN0OiBb UEFUQ0ggMi80XSBJbnRyb2R1Y2UgcGdfY29tYmluZWJhY2t1cCAtLWNvcHkgb3B0aW9uCgpU aGUgLS1jb3B5IG9wdGlvbiBzaW1wbHkgYWxsb3dzIHBpY2tpbmcgdGhlIGRlZmF1bHQgbW9k ZSB0byBjb3B5IGRhdGEsCmFuZCBkb2VzIG5vdCBjaGFuZ2UgdGhlIGJlaGF2aW9yLiBUaGlz IG1ha2VzIHBnX2NvbWJpbmViYWNrdXAgb3B0aW9ucwptb3JlIGNvbnNpc3RlbnQgd2l0aCBw Z191cGdyYWRlLgoKUmVwb3J0ZWQtYnk6IFBldGVyIEVpc2VudHJhdXQKRGlzY3Vzc2lvbjog aHR0cHM6Ly9wb3N0Z3IuZXMvbS80OGRhNGExZi1jY2Q5LTQ5ODgtOTYyMi0yNGYzN2IxZGUy YjQlNDBlaXNlbnRyYXV0Lm9yZwotLS0KIGRvYy9zcmMvc2dtbC9yZWYvcGdfY29tYmluZWJh Y2t1cC5zZ21sICAgICAgfCAxMCArKysrKysrKysrCiBzcmMvYmluL3BnX2NvbWJpbmViYWNr dXAvcGdfY29tYmluZWJhY2t1cC5jIHwgIDcgKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAx NiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL3NyYy9z Z21sL3JlZi9wZ19jb21iaW5lYmFja3VwLnNnbWwgYi9kb2Mvc3JjL3NnbWwvcmVmL3BnX2Nv bWJpbmViYWNrdXAuc2dtbAppbmRleCAzNzUzMDdkNTdiZC4uMDkxOTgyZjYyYWQgMTAwNjQ0 Ci0tLSBhL2RvYy9zcmMvc2dtbC9yZWYvcGdfY29tYmluZWJhY2t1cC5zZ21sCisrKyBiL2Rv Yy9zcmMvc2dtbC9yZWYvcGdfY29tYmluZWJhY2t1cC5zZ21sCkBAIC0xNjIsNiArMTYyLDE2 IEBAIFBvc3RncmVTUUwgZG9jdW1lbnRhdGlvbgogICAgICAgPC9saXN0aXRlbT4KICAgICAg PC92YXJsaXN0ZW50cnk+CiAKKyAgICAgPHZhcmxpc3RlbnRyeT4KKyAgICAgIDx0ZXJtPjxv cHRpb24+LS1jb3B5PC9vcHRpb24+PC90ZXJtPgorICAgICAgPGxpc3RpdGVtPgorICAgICAg IDxwYXJhPgorICAgICAgICBQZXJmb3JtIHJlZ3VsYXIgZmlsZSBjb3B5LiAgVGhpcyBpcyB0 aGUgZGVmYXVsdC4gIChTZWUgYWxzbworICAgICAgICA8b3B0aW9uPi0tY29weS1maWxlLXJh bmdlPC9vcHRpb24+IGFuZCA8b3B0aW9uPi0tY2xvbmU8L29wdGlvbj4uKQorICAgICAgIDwv cGFyYT4KKyAgICAgIDwvbGlzdGl0ZW0+CisgICAgIDwvdmFybGlzdGVudHJ5PgorCiAgICAg IDx2YXJsaXN0ZW50cnk+CiAgICAgICA8dGVybT48b3B0aW9uPi0tY29weS1maWxlLXJhbmdl PC9vcHRpb24+PC90ZXJtPgogICAgICAgPGxpc3RpdGVtPgpkaWZmIC0tZ2l0IGEvc3JjL2Jp bi9wZ19jb21iaW5lYmFja3VwL3BnX2NvbWJpbmViYWNrdXAuYyBiL3NyYy9iaW4vcGdfY29t YmluZWJhY2t1cC9wZ19jb21iaW5lYmFja3VwLmMKaW5kZXggZjY3Y2NmNzZlYTIuLjZkZGY1 YjUzNGIxIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvcGdfY29tYmlu ZWJhY2t1cC5jCisrKyBiL3NyYy9iaW4vcGdfY29tYmluZWJhY2t1cC9wZ19jb21iaW5lYmFj a3VwLmMKQEAgLTEzOSw3ICsxMzksOCBAQCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10p CiAJCXsibm8tbWFuaWZlc3QiLCBub19hcmd1bWVudCwgTlVMTCwgMn0sCiAJCXsic3luYy1t ZXRob2QiLCByZXF1aXJlZF9hcmd1bWVudCwgTlVMTCwgM30sCiAJCXsiY2xvbmUiLCBub19h cmd1bWVudCwgTlVMTCwgNH0sCi0JCXsiY29weS1maWxlLXJhbmdlIiwgbm9fYXJndW1lbnQs IE5VTEwsIDV9LAorCQl7ImNvcHkiLCBub19hcmd1bWVudCwgTlVMTCwgNX0sCisJCXsiY29w eS1maWxlLXJhbmdlIiwgbm9fYXJndW1lbnQsIE5VTEwsIDZ9LAogCQl7TlVMTCwgMCwgTlVM TCwgMH0KIAl9OwogCkBAIC0yMDksNiArMjEwLDkgQEAgbWFpbihpbnQgYXJnYywgY2hhciAq YXJndltdKQogCQkJCW9wdC5jb3B5X21ldGhvZCA9IENPUFlfTUVUSE9EX0NMT05FOwogCQkJ CWJyZWFrOwogCQkJY2FzZSA1OgorCQkJCW9wdC5jb3B5X21ldGhvZCA9IENPUFlfTUVUSE9E X0NPUFk7CisJCQkJYnJlYWs7CisJCQljYXNlIDY6CiAJCQkJb3B0LmNvcHlfbWV0aG9kID0g Q09QWV9NRVRIT0RfQ09QWV9GSUxFX1JBTkdFOwogCQkJCWJyZWFrOwogCQkJZGVmYXVsdDoK QEAgLTc2Myw2ICs3NjcsNyBAQCBoZWxwKGNvbnN0IGNoYXIgKnByb2duYW1lKQogCXByaW50 ZihfKCIgIC1ULCAtLXRhYmxlc3BhY2UtbWFwcGluZz1PTERESVI9TkVXRElSXG4iCiAJCQkg IiAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWxvY2F0ZSB0YWJsZXNwYWNlIGluIE9M RERJUiB0byBORVdESVJcbiIpKTsKIAlwcmludGYoXygiICAgICAgLS1jbG9uZSAgICAgICAg ICAgICAgIGNsb25lIChyZWZsaW5rKSBpbnN0ZWFkIG9mIGNvcHlpbmcgZmlsZXNcbiIpKTsK KwlwcmludGYoXygiICAgICAgLS1jb3B5ICAgICAgICAgICAgICAgIGNvcHkgZmlsZXMgKGRl ZmF1bHQpXG4iKSk7CiAJcHJpbnRmKF8oIiAgICAgIC0tY29weS1maWxlLXJhbmdlICAgICBj b3B5IHVzaW5nIGNvcHlfZmlsZV9yYW5nZSgpIHN5c2NhbGxcbiIpKTsKIAlwcmludGYoXygi ICAgICAgLS1tYW5pZmVzdC1jaGVja3N1bXM9U0hBezIyNCwyNTYsMzg0LDUxMn18Q1JDMzJD fE5PTkVcbiIKIAkJCSAiICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZSBhbGdvcml0 aG0gZm9yIG1hbmlmZXN0IGNoZWNrc3Vtc1xuIikpOwotLSAKMi40NS4yCgo= --------------bwhAuqRPebFLDVfJZngcpjAs Content-Type: text/x-patch; charset=UTF-8; name="0003-Add-PG_TEST_PG_COMBINEBACKUP_MODE.patch" Content-Disposition: attachment; filename="0003-Add-PG_TEST_PG_COMBINEBACKUP_MODE.patch" Content-Transfer-Encoding: base64 RnJvbSAwYjNhOWFmZTI1ZDg4MzdjMGRjZjVhMDNiODU2YzhkYjFmNGMyNmNkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBWb25kcmEgPHRvbWFzQDJuZHF1YWRyYW50 LmNvbT4KRGF0ZTogRnJpLCAyMSBKdW4gMjAyNCAxNDoxNjoxNiArMDIwMApTdWJqZWN0OiBb UEFUQ0ggMy80XSBBZGQgUEdfVEVTVF9QR19DT01CSU5FQkFDS1VQX01PREUKClRoaXMgaW50 cm9kdWNlcyBhbiBlbnZpcm9ubWVudCB2YXJpYWJsZSBQR19URVNUX1BHX0NPTUJJTkVCQUNL VVBfTU9ERQp0aGF0IGRldGVybWluZXMgY29weSBtb2RlIHVzZWQgYnkgcGdfY29tYmluZWJh Y2t1cCBpbiBUQVAgdGVzdHMuIFRoaXMKZGVmYXVsdHMgdG8gIi0tY29weSIgYnV0IG1heSBi ZSBzZXQgdG8gIi0tY2xvbmUiIC8gIi0tY29weS1maWxlLXJhbmdlIgp0byB1c2UgdGhlIGFs dGVybmF0aXZlIHN0YXRlZ2llcy4KClJlcG9ydGVkLWJ5OiBQZXRlciBFaXNlbnRyYXV0CkRp c2N1c3Npb246IGh0dHBzOi8vcG9zdGdyLmVzL20vNDhkYTRhMWYtY2NkOS00OTg4LTk2MjIt MjRmMzdiMWRlMmI0JTQwZWlzZW50cmF1dC5vcmcKLS0tCiAuLi4vcGdfY29tYmluZWJhY2t1 cC90LzAwMl9jb21wYXJlX2JhY2t1cHMucGwgfCAgOCArKysrKy0KIHNyYy9iaW4vcGdfY29t YmluZWJhY2t1cC90LzAwM190aW1lbGluZS5wbCAgICB8ICA4ICsrKysrLQogc3JjL2Jpbi9w Z19jb21iaW5lYmFja3VwL3QvMDA0X21hbmlmZXN0LnBsICAgIHwgIDkgKysrKystLQogc3Jj L2Jpbi9wZ19jb21iaW5lYmFja3VwL3QvMDA1X2ludGVncml0eS5wbCAgIHwgMjUgKysrKysr KysrKystLS0tLS0tLQogLi4uL3BnX2NvbWJpbmViYWNrdXAvdC8wMDZfZGJfZmlsZV9jb3B5 LnBsICAgIHwgIDggKysrKystCiBzcmMvdGVzdC9wZXJsL1Bvc3RncmVTUUwvVGVzdC9DbHVz dGVyLnBtICAgICAgfCAgNSArKysrCiA2IGZpbGVzIGNoYW5nZWQsIDQ4IGluc2VydGlvbnMo KyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfY29tYmluZWJh Y2t1cC90LzAwMl9jb21wYXJlX2JhY2t1cHMucGwgYi9zcmMvYmluL3BnX2NvbWJpbmViYWNr dXAvdC8wMDJfY29tcGFyZV9iYWNrdXBzLnBsCmluZGV4IGYwMzI5NTllZjVjLi42M2EwMjU1 ZGUxNSAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3QvMDAyX2NvbXBh cmVfYmFja3Vwcy5wbAorKysgYi9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvdC8wMDJfY29t cGFyZV9iYWNrdXBzLnBsCkBAIC05LDYgKzksMTEgQEAgdXNlIFRlc3Q6Ok1vcmU7CiAKIG15 ICR0ZW1wZGlyID0gUG9zdGdyZVNRTDo6VGVzdDo6VXRpbHM6OnRlbXBkaXJfc2hvcnQoKTsK IAorIyBDYW4gYmUgY2hhbmdlZCB0byB0ZXN0IHRoZSBvdGhlciBtb2Rlcy4KK215ICRtb2Rl ID0gJEVOVntQR19URVNUX1BHX0NPTUJJTkVCQUNLVVBfTU9ERX0gfHwgJy0tY29weSc7CisK K25vdGUgInRlc3RpbmcgdXNpbmcgbW9kZSAkbW9kZSI7CisKICMgU2V0IHVwIGEgbmV3IGRh dGFiYXNlIGluc3RhbmNlLgogbXkgJHByaW1hcnkgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVz dGVyLT5uZXcoJ3ByaW1hcnknKTsKICRwcmltYXJ5LT5pbml0KGhhc19hcmNoaXZpbmcgPT4g MSwgYWxsb3dzX3N0cmVhbWluZyA9PiAxKTsKQEAgLTEzNCw3ICsxMzksOCBAQCAkcGl0cjIt PmluaXRfZnJvbV9iYWNrdXAoCiAJc3RhbmRieSA9PiAxLAogCWhhc19yZXN0b3JpbmcgPT4g MSwKIAljb21iaW5lX3dpdGhfcHJpb3IgPT4gWydiYWNrdXAxJ10sCi0JdGFibGVzcGFjZV9t YXAgPT4geyAkdHNiYWNrdXAycGF0aCA9PiAkdHNwaXRyMnBhdGggfSk7CisJdGFibGVzcGFj ZV9tYXAgPT4geyAkdHNiYWNrdXAycGF0aCA9PiAkdHNwaXRyMnBhdGggfSwKKwljb21iaW5l X21vZGUgPT4gJG1vZGUpOwogJHBpdHIyLT5hcHBlbmRfY29uZigKIAkncG9zdGdyZXNxbC5j b25mJywgcXF7CiByZWNvdmVyeV90YXJnZXRfbHNuID0gJyRsc24nCmRpZmYgLS1naXQgYS9z cmMvYmluL3BnX2NvbWJpbmViYWNrdXAvdC8wMDNfdGltZWxpbmUucGwgYi9zcmMvYmluL3Bn X2NvbWJpbmViYWNrdXAvdC8wMDNfdGltZWxpbmUucGwKaW5kZXggNTJlYjY0MmEzOTIuLjgz YWI2NzRhMjQ0IDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvdC8wMDNf dGltZWxpbmUucGwKKysrIGIvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3QvMDAzX3RpbWVs aW5lLnBsCkBAIC0xMCw2ICsxMCwxMSBAQCB1c2UgUG9zdGdyZVNRTDo6VGVzdDo6Q2x1c3Rl cjsKIHVzZSBQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczsKIHVzZSBUZXN0OjpNb3JlOwogCisj IENhbiBiZSBjaGFuZ2VkIHRvIHRlc3QgdGhlIG90aGVyIG1vZGVzLgorbXkgJG1vZGUgPSAk RU5We1BHX1RFU1RfUEdfQ09NQklORUJBQ0tVUF9NT0RFfSB8fCAnLS1jb3B5JzsKKworbm90 ZSAidGVzdGluZyB1c2luZyBtb2RlICRtb2RlIjsKKwogIyBTZXQgdXAgYSBuZXcgZGF0YWJh c2UgaW5zdGFuY2UuCiBteSAkbm9kZTEgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5u ZXcoJ25vZGUxJyk7CiAkbm9kZTEtPmluaXQoaGFzX2FyY2hpdmluZyA9PiAxLCBhbGxvd3Nf c3RyZWFtaW5nID0+IDEpOwpAQCAtNjgsNyArNzMsOCBAQCAkbm9kZTItPmNvbW1hbmRfb2so CiAjIFJlc3RvcmUgdGhlIGluY3JlbWVudGFsIGJhY2t1cCBhbmQgdXNlIGl0IHRvIGNyZWF0 ZSBhIG5ldyBub2RlLgogbXkgJG5vZGUzID0gUG9zdGdyZVNRTDo6VGVzdDo6Q2x1c3Rlci0+ bmV3KCdub2RlMycpOwogJG5vZGUzLT5pbml0X2Zyb21fYmFja3VwKCRub2RlMSwgJ2JhY2t1 cDMnLAotCWNvbWJpbmVfd2l0aF9wcmlvciA9PiBbICdiYWNrdXAxJywgJ2JhY2t1cDInIF0p OworCWNvbWJpbmVfd2l0aF9wcmlvciA9PiBbICdiYWNrdXAxJywgJ2JhY2t1cDInIF0sCisJ Y29tYmluZV9tb2RlID0+ICRtb2RlKTsKICRub2RlMy0+c3RhcnQoKTsKIAogIyBMZXQncyBp bnNlcnQgb25lIG1vcmUgcm93LgpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19jb21iaW5lYmFj a3VwL3QvMDA0X21hbmlmZXN0LnBsIGIvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3QvMDA0 X21hbmlmZXN0LnBsCmluZGV4IDBkZjlmZWQ3M2E4Li42ZDQ3NTE2M2FiOSAxMDA2NDQKLS0t IGEvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3QvMDA0X21hbmlmZXN0LnBsCisrKyBiL3Ny Yy9iaW4vcGdfY29tYmluZWJhY2t1cC90LzAwNF9tYW5pZmVzdC5wbApAQCAtMTIsNiArMTIs MTEgQEAgdXNlIFBvc3RncmVTUUw6OlRlc3Q6OkNsdXN0ZXI7CiB1c2UgUG9zdGdyZVNRTDo6 VGVzdDo6VXRpbHM7CiB1c2UgVGVzdDo6TW9yZTsKIAorIyBDYW4gYmUgY2hhbmdlZCB0byB0 ZXN0IHRoZSBvdGhlciBtb2Rlcy4KK215ICRtb2RlID0gJEVOVntQR19URVNUX1BHX0NPTUJJ TkVCQUNLVVBfTU9ERX0gfHwgJy0tY29weSc7CisKK25vdGUgInRlc3RpbmcgdXNpbmcgbW9k ZSAkbW9kZSI7CisKICMgU2V0IHVwIGEgbmV3IGRhdGFiYXNlIGluc3RhbmNlLgogbXkgJG5v ZGUgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ25vZGUnKTsKICRub2RlLT5p bml0KGhhc19hcmNoaXZpbmcgPT4gMSwgYWxsb3dzX3N0cmVhbWluZyA9PiAxKTsKQEAgLTUz LDkgKzU4LDkgQEAgc3ViIGNvbWJpbmVfYW5kX3Rlc3Rfb25lX2JhY2t1cAogY29tYmluZV9h bmRfdGVzdF9vbmVfYmFja3VwKCdub21hbmlmZXN0JywKIAlxci9jb3VsZCBub3Qgb3BlbiBm aWxlLipiYWNrdXBfbWFuaWZlc3QvLAogCSctLW5vLW1hbmlmZXN0Jyk7Ci1jb21iaW5lX2Fu ZF90ZXN0X29uZV9iYWNrdXAoJ2NzdW1fbm9uZScsIHVuZGVmLCAnLS1tYW5pZmVzdC1jaGVj a3N1bXM9Tk9ORScpOworY29tYmluZV9hbmRfdGVzdF9vbmVfYmFja3VwKCdjc3VtX25vbmUn LCB1bmRlZiwgJy0tbWFuaWZlc3QtY2hlY2tzdW1zPU5PTkUnLCAkbW9kZSk7CiBjb21iaW5l X2FuZF90ZXN0X29uZV9iYWNrdXAoJ2NzdW1fc2hhMjI0JywKLQl1bmRlZiwgJy0tbWFuaWZl c3QtY2hlY2tzdW1zPVNIQTIyNCcpOworCXVuZGVmLCAnLS1tYW5pZmVzdC1jaGVja3N1bXM9 U0hBMjI0JywgJG1vZGUpOwogCiAjIFZlcmlmeSB0aGF0IFNIQTIyNCBpcyBtZW50aW9uZWQg aW4gdGhlIFNIQTIyNCBtYW5pZmVzdCBsb3RzIG9mIHRpbWVzLgogbXkgJHNoYTIyNF9tYW5p ZmVzdCA9CmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvdC8wMDVfaW50 ZWdyaXR5LnBsIGIvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3QvMDA1X2ludGVncml0eS5w bAppbmRleCA2MzZjM2NjMWIxNC4uM2NhZWQxM2Y2ZWQgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4v cGdfY29tYmluZWJhY2t1cC90LzAwNV9pbnRlZ3JpdHkucGwKKysrIGIvc3JjL2Jpbi9wZ19j b21iaW5lYmFja3VwL3QvMDA1X2ludGVncml0eS5wbApAQCAtMTMsNiArMTMsMTEgQEAgdXNl IFBvc3RncmVTUUw6OlRlc3Q6OkNsdXN0ZXI7CiB1c2UgUG9zdGdyZVNRTDo6VGVzdDo6VXRp bHM7CiB1c2UgVGVzdDo6TW9yZTsKIAorIyBDYW4gYmUgY2hhbmdlZCB0byB0ZXN0IHRoZSBv dGhlciBtb2Rlcy4KK215ICRtb2RlID0gJEVOVntQR19URVNUX1BHX0NPTUJJTkVCQUNLVVBf TU9ERX0gfHwgJy0tY29weSc7CisKK25vdGUgInRlc3RpbmcgdXNpbmcgbW9kZSAkbW9kZSI7 CisKICMgU2V0IHVwIGEgbmV3IGRhdGFiYXNlIGluc3RhbmNlLgogbXkgJG5vZGUxID0gUG9z dGdyZVNRTDo6VGVzdDo6Q2x1c3Rlci0+bmV3KCdub2RlMScpOwogJG5vZGUxLT5pbml0KGhh c19hcmNoaXZpbmcgPT4gMSwgYWxsb3dzX3N0cmVhbWluZyA9PiAxKTsKQEAgLTc5LDEzICs4 NCwxMyBAQCBteSAkcmVzdWx0cGF0aCA9ICRub2RlMS0+YmFja3VwX2RpciAuICcvcmVzdWx0 JzsKIAogIyBDYW4ndCBjb21iaW5lIDIgZnVsbCBiYWNrdXBzLgogJG5vZGUxLT5jb21tYW5k X2ZhaWxzX2xpa2UoCi0JWyAncGdfY29tYmluZWJhY2t1cCcsICRiYWNrdXAxcGF0aCwgJGJh Y2t1cDFwYXRoLCAnLW8nLCAkcmVzdWx0cGF0aCBdLAorCVsgJ3BnX2NvbWJpbmViYWNrdXAn LCAkYmFja3VwMXBhdGgsICRiYWNrdXAxcGF0aCwgJy1vJywgJHJlc3VsdHBhdGgsICRtb2Rl IF0sCiAJcXIvaXMgYSBmdWxsIGJhY2t1cCwgYnV0IG9ubHkgdGhlIGZpcnN0IGJhY2t1cCBz aG91bGQgYmUgYSBmdWxsIGJhY2t1cC8sCiAJImNhbid0IGNvbWJpbmUgZnVsbCBiYWNrdXBz Iik7CiAKICMgQ2FuJ3QgY29tYmluZSAyIGluY3JlbWVudGFsIGJhY2t1cHMuCiAkbm9kZTEt PmNvbW1hbmRfZmFpbHNfbGlrZSgKLQlbICdwZ19jb21iaW5lYmFja3VwJywgJGJhY2t1cDJw YXRoLCAkYmFja3VwMnBhdGgsICctbycsICRyZXN1bHRwYXRoIF0sCisJWyAncGdfY29tYmlu ZWJhY2t1cCcsICRiYWNrdXAycGF0aCwgJGJhY2t1cDJwYXRoLCAnLW8nLCAkcmVzdWx0cGF0 aCwgJG1vZGUgXSwKIAlxci9pcyBhbiBpbmNyZW1lbnRhbCBiYWNrdXAsIGJ1dCB0aGUgZmly c3QgYmFja3VwIHNob3VsZCBiZSBhIGZ1bGwgYmFja3VwLywKIAkiY2FuJ3QgY29tYmluZSBm dWxsIGJhY2t1cHMiKTsKIApAQCAtOTMsNyArOTgsNyBAQCAkbm9kZTEtPmNvbW1hbmRfZmFp bHNfbGlrZSgKICRub2RlMS0+Y29tbWFuZF9mYWlsc19saWtlKAogCVsKIAkJJ3BnX2NvbWJp bmViYWNrdXAnLCAkYmFja3VwMXBhdGgsICRiYWNrdXBvdGhlcjJwYXRoLCAnLW8nLAotCQkk cmVzdWx0cGF0aAorCQkkcmVzdWx0cGF0aCwgJG1vZGUKIAldLAogCXFyL2V4cGVjdGVkIHN5 c3RlbSBpZGVudGlmaWVyLipidXQgZm91bmQvLAogCSJjYW4ndCBjb21iaW5lIGJhY2t1cHMg ZnJvbSBkaWZmZXJlbnQgbm9kZXMiKTsKQEAgLTEwNiw3ICsxMTEsNyBAQCBjb3B5KCIkYmFj a3Vwb3RoZXIycGF0aC9iYWNrdXBfbWFuaWZlc3QiLCAiJGJhY2t1cDJwYXRoL2JhY2t1cF9t YW5pZmVzdCIpCiAkbm9kZTEtPmNvbW1hbmRfZmFpbHNfbGlrZSgKIAlbCiAJCSdwZ19jb21i aW5lYmFja3VwJywgJGJhY2t1cDFwYXRoLCAkYmFja3VwMnBhdGgsICRiYWNrdXAzcGF0aCwK LQkJJy1vJywgJHJlc3VsdHBhdGgKKwkJJy1vJywgJHJlc3VsdHBhdGgsICRtb2RlCiAJXSwK IAlxci8gbWFuaWZlc3Qgc3lzdGVtIGlkZW50aWZpZXIgaXMgLiosIGJ1dCBjb250cm9sIGZp bGUgaGFzIC8sCiAJImNhbid0IGNvbWJpbmUgYmFja3VwcyB3aXRoIGRpZmZlcmVudCBtYW5p ZmVzdCBzeXN0ZW0gaWRlbnRpZmllciAiKTsKQEAgLTExNiw3ICsxMjEsNyBAQCBtb3ZlKCIk YmFja3VwMnBhdGgvYmFja3VwX21hbmlmZXN0Lm9yaWciLCAiJGJhY2t1cDJwYXRoL2JhY2t1 cF9tYW5pZmVzdCIpCiAKICMgQ2FuJ3Qgb21pdCBhIHJlcXVpcmVkIGJhY2t1cC4KICRub2Rl MS0+Y29tbWFuZF9mYWlsc19saWtlKAotCVsgJ3BnX2NvbWJpbmViYWNrdXAnLCAkYmFja3Vw MXBhdGgsICRiYWNrdXAzcGF0aCwgJy1vJywgJHJlc3VsdHBhdGggXSwKKwlbICdwZ19jb21i aW5lYmFja3VwJywgJGJhY2t1cDFwYXRoLCAkYmFja3VwM3BhdGgsICctbycsICRyZXN1bHRw YXRoLCAkbW9kZSBdLAogCXFyL3N0YXJ0cyBhdCBMU04uKmJ1dCBleHBlY3RlZC8sCiAJImNh bid0IG9taXQgYSByZXF1aXJlZCBiYWNrdXAiKTsKIApAQCAtMTI0LDcgKzEyOSw3IEBAICRu b2RlMS0+Y29tbWFuZF9mYWlsc19saWtlKAogJG5vZGUxLT5jb21tYW5kX2ZhaWxzX2xpa2Uo CiAJWwogCQkncGdfY29tYmluZWJhY2t1cCcsICRiYWNrdXAxcGF0aCwgJGJhY2t1cDNwYXRo LCAkYmFja3VwMnBhdGgsCi0JCSctbycsICRyZXN1bHRwYXRoCisJCSctbycsICRyZXN1bHRw YXRoLCAkbW9kZQogCV0sCiAJcXIvc3RhcnRzIGF0IExTTi4qYnV0IGV4cGVjdGVkLywKIAki Y2FuJ3QgY29tYmluZSBiYWNrdXBzIGluIHRoZSB3cm9uZyBvcmRlciIpOwpAQCAtMTMzLDcg KzEzOCw3IEBAICRub2RlMS0+Y29tbWFuZF9mYWlsc19saWtlKAogJG5vZGUxLT5jb21tYW5k X29rKAogCVsKIAkJJ3BnX2NvbWJpbmViYWNrdXAnLCAkYmFja3VwMXBhdGgsICRiYWNrdXAy cGF0aCwgJGJhY2t1cDNwYXRoLAotCQknLW8nLCAkcmVzdWx0cGF0aAorCQknLW8nLCAkcmVz dWx0cGF0aCwgJG1vZGUKIAldLAogCSJjYW4gY29tYmluZSAzIG1hdGNoaW5nIGJhY2t1cHMi KTsKIHJtdHJlZSgkcmVzdWx0cGF0aCk7CkBAIC0xNDMsMTkgKzE0OCwxOSBAQCBteSAkc3lu dGhldGljMTJwYXRoID0gJG5vZGUxLT5iYWNrdXBfZGlyIC4gJy9zeW50aGV0aWMxMic7CiAk bm9kZTEtPmNvbW1hbmRfb2soCiAJWwogCQkncGdfY29tYmluZWJhY2t1cCcsICRiYWNrdXAx cGF0aCwgJGJhY2t1cDJwYXRoLCAnLW8nLAotCQkkc3ludGhldGljMTJwYXRoCisJCSRzeW50 aGV0aWMxMnBhdGgsICRtb2RlCiAJXSwKIAkiY2FuIGNvbWJpbmUgMiBtYXRjaGluZyBiYWNr dXBzIik7CiAKICMgQ2FuIGNvbWJpbmUgcmVzdWx0IG9mIHByZXZpb3VzIHN0ZXAgd2l0aCBz ZWNvbmQgaW5jcmVtZW50YWwuCiAkbm9kZTEtPmNvbW1hbmRfb2soCi0JWyAncGdfY29tYmlu ZWJhY2t1cCcsICRzeW50aGV0aWMxMnBhdGgsICRiYWNrdXAzcGF0aCwgJy1vJywgJHJlc3Vs dHBhdGggXSwKKwlbICdwZ19jb21iaW5lYmFja3VwJywgJHN5bnRoZXRpYzEycGF0aCwgJGJh Y2t1cDNwYXRoLCAnLW8nLCAkcmVzdWx0cGF0aCwgJG1vZGUgXSwKIAkiY2FuIGNvbWJpbmUg c3ludGhldGljIGJhY2t1cCB3aXRoIGxhdGVyIGluY3JlbWVudGFsIik7CiBybXRyZWUoJHJl c3VsdHBhdGgpOwogCiAjIENhbid0IGNvbWJpbmUgcmVzdWx0IG9mIDErMiB3aXRoIDIuCiAk bm9kZTEtPmNvbW1hbmRfZmFpbHNfbGlrZSgKLQlbICdwZ19jb21iaW5lYmFja3VwJywgJHN5 bnRoZXRpYzEycGF0aCwgJGJhY2t1cDJwYXRoLCAnLW8nLCAkcmVzdWx0cGF0aCBdLAorCVsg J3BnX2NvbWJpbmViYWNrdXAnLCAkc3ludGhldGljMTJwYXRoLCAkYmFja3VwMnBhdGgsICct bycsICRyZXN1bHRwYXRoLCAkbW9kZSBdLAogCXFyL3N0YXJ0cyBhdCBMU04uKmJ1dCBleHBl Y3RlZC8sCiAJImNhbid0IGNvbWJpbmUgc3ludGhldGljIGJhY2t1cCB3aXRoIGluY2x1ZGVk IGluY3JlbWVudGFsIik7CiAKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfY29tYmluZWJhY2t1 cC90LzAwNl9kYl9maWxlX2NvcHkucGwgYi9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvdC8w MDZfZGJfZmlsZV9jb3B5LnBsCmluZGV4IGQ1N2I1NTBhZjIxLi5mNDQ3ODhlODJiZiAxMDA2 NDQKLS0tIGEvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL3QvMDA2X2RiX2ZpbGVfY29weS5w bAorKysgYi9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvdC8wMDZfZGJfZmlsZV9jb3B5LnBs CkBAIC03LDYgKzcsMTEgQEAgdXNlIFBvc3RncmVTUUw6OlRlc3Q6OkNsdXN0ZXI7CiB1c2Ug UG9zdGdyZVNRTDo6VGVzdDo6VXRpbHM7CiB1c2UgVGVzdDo6TW9yZTsKIAorIyBDYW4gYmUg Y2hhbmdlZCB0byB0ZXN0IHRoZSBvdGhlciBtb2Rlcy4KK215ICRtb2RlID0gJEVOVntQR19U RVNUX1BHX0NPTUJJTkVCQUNLVVBfTU9ERX0gfHwgJy0tY29weSc7CisKK25vdGUgInRlc3Rp bmcgdXNpbmcgbW9kZSAkbW9kZSI7CisKICMgU2V0IHVwIGEgbmV3IGRhdGFiYXNlIGluc3Rh bmNlLgogbXkgJHByaW1hcnkgPSBQb3N0Z3JlU1FMOjpUZXN0OjpDbHVzdGVyLT5uZXcoJ3By aW1hcnknKTsKICRwcmltYXJ5LT5pbml0KGhhc19hcmNoaXZpbmcgPT4gMSwgYWxsb3dzX3N0 cmVhbWluZyA9PiAxKTsKQEAgLTQ1LDcgKzUwLDggQEAgJHByaW1hcnktPmNvbW1hbmRfb2so CiAjIFJlY292ZXIgdGhlIGluY3JlbWVudGFsIGJhY2t1cC4KIG15ICRyZXN0b3JlID0gUG9z dGdyZVNRTDo6VGVzdDo6Q2x1c3Rlci0+bmV3KCdyZXN0b3JlJyk7CiAkcmVzdG9yZS0+aW5p dF9mcm9tX2JhY2t1cCgkcHJpbWFyeSwgJ2JhY2t1cDInLAotCWNvbWJpbmVfd2l0aF9wcmlv ciA9PiBbJ2JhY2t1cDEnXSk7CisJY29tYmluZV93aXRoX3ByaW9yID0+IFsnYmFja3VwMSdd LAorCWNvbWJpbmVfbW9kZSA9PiAkbW9kZSk7CiAkcmVzdG9yZS0+c3RhcnQoKTsKIAogIyBR dWVyeSB0aGUgREIuCmRpZmYgLS1naXQgYS9zcmMvdGVzdC9wZXJsL1Bvc3RncmVTUUwvVGVz dC9DbHVzdGVyLnBtIGIvc3JjL3Rlc3QvcGVybC9Qb3N0Z3JlU1FML1Rlc3QvQ2x1c3Rlci5w bQppbmRleCA4M2YzODVhNDg3MC4uMDEzNWM1YTc5NWMgMTAwNjQ0Ci0tLSBhL3NyYy90ZXN0 L3BlcmwvUG9zdGdyZVNRTC9UZXN0L0NsdXN0ZXIucG0KKysrIGIvc3JjL3Rlc3QvcGVybC9Q b3N0Z3JlU1FML1Rlc3QvQ2x1c3Rlci5wbQpAQCAtODU2LDYgKzg1NiwxMSBAQCBzdWIgaW5p dF9mcm9tX2JhY2t1cAogCQkJCXB1c2ggQGNvbWJpbmVhcmdzLCAiLVQkb2xkZGlyPSRuZXdk aXIiOwogCQkJfQogCQl9CisJCSMgdXNlIHRoZSBjb21iaW5lIG1vZGUgKGNsb25lL2NvcHkt ZmlsZS1yYW5nZSkgaWYgc3BlY2lmaWVkCisJCWlmIChkZWZpbmVkICRwYXJhbXN7Y29tYmlu ZV9tb2RlfSkKKwkJeworCQkJcHVzaCBAY29tYmluZWFyZ3MsICRwYXJhbXN7Y29tYmluZV9t b2RlfTsKKwkJfQogCQlwdXNoIEBjb21iaW5lYXJncywgQHByaW9yX2JhY2t1cF9wYXRoLCAk YmFja3VwX3BhdGgsICctbycsICRkYXRhX3BhdGg7CiAJCVBvc3RncmVTUUw6OlRlc3Q6OlV0 aWxzOjpzeXN0ZW1fb3JfYmFpbChAY29tYmluZWFyZ3MpOwogCX0KLS0gCjIuNDUuMgoK --------------bwhAuqRPebFLDVfJZngcpjAs Content-Type: text/x-patch; charset=UTF-8; name="0004-Add-PG_TEST_PG_COMBINEBACKUP_MODE-to-CI-tasks.patch" Content-Disposition: attachment; filename="0004-Add-PG_TEST_PG_COMBINEBACKUP_MODE-to-CI-tasks.patch" Content-Transfer-Encoding: base64 RnJvbSA4MzZlMjBhMGVkMzRiN2E5YzM2NzY3NGU3NzFmYThjYjAyM2U0MzQxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBWb25kcmEgPHRvbWFzQDJuZHF1YWRyYW50 LmNvbT4KRGF0ZTogRnJpLCAyMSBKdW4gMjAyNCAxNzo1NTozOCArMDIwMApTdWJqZWN0OiBb UEFUQ0ggNC80XSBBZGQgUEdfVEVTVF9QR19DT01CSU5FQkFDS1VQX01PREUgdG8gQ0kgdGFz a3MKClRoaXMgY2hhbmdlcyBwZ19jb21iaW5lYmFja3VwIG1vZGUgZm9yIHR3byBvZiB0aGUg Q2lycnVzIENJIHRhc2tzLCB0bwpleGVyY2lzZSB0aGUgYWx0ZXJuYXRpdmUgY29weSBtZXRo b2RzIGluIHBnX2NvbWJpbmViYWNrdXAgdGVzdHMuIFdlCnRlc3QgLS1jbG9uZSBvbiBtYWNP UyBhbmQgLS1jb3B5LWZpbGUtcmFuZ2Ugb24gb25lIG9mIHRoZSBMaW51eCB0YXNrcy4KClJl cG9ydGVkLWJ5OiBQZXRlciBFaXNlbnRyYXV0CkRpc2N1c3Npb246IGh0dHBzOi8vcG9zdGdy LmVzL20vNDhkYTRhMWYtY2NkOS00OTg4LTk2MjItMjRmMzdiMWRlMmI0JTQwZWlzZW50cmF1 dC5vcmcKLS0tCiAuY2lycnVzLnRhc2tzLnltbCB8IDIgKysKIDEgZmlsZSBjaGFuZ2VkLCAy IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS8uY2lycnVzLnRhc2tzLnltbCBiLy5jaXJy dXMudGFza3MueW1sCmluZGV4IDMzNjQ2ZmFlYWRmLi40ZTAyOTEwM2M3ZSAxMDA2NDQKLS0t IGEvLmNpcnJ1cy50YXNrcy55bWwKKysrIGIvLmNpcnJ1cy50YXNrcy55bWwKQEAgLTMxOCw2 ICszMTgsNyBAQCB0YXNrOgogCiAgICAgICBlbnY6CiAgICAgICAgIFNBTklUSVpFUl9GTEFH UzogLWZzYW5pdGl6ZT1hZGRyZXNzCisgICAgICAgIFBHX1RFU1RfUEdfQ09NQklORUJBQ0tV UF9NT0RFOiAtLWNvcHktZmlsZS1yYW5nZQogCiAgICAgICAjIE5vcm1hbGx5LCB0aGUgInJl bGF0aW9uIHNlZ21lbnQiIGNvZGUgYmFzaWNhbGx5IGhhcyBubyBjb3ZlcmFnZSBpbiBvdXIK ICAgICAgICMgdGVzdHMsIGJlY2F1c2Ugd2UgKHF1aXRlIHJlYXNvbmFibHkpIGRvbid0IGdl bmVyYXRlIHRhYmxlcyBsYXJnZQpAQCAtNDMyLDYgKzQzMyw3IEBAIHRhc2s6CiAgICAgQ1hY RkxBR1M6IC1PZyAtZ2dkYgogCiAgICAgUEdfVEVTVF9QR19VUEdSQURFX01PREU6IC0tY2xv bmUKKyAgICBQR19URVNUX1BHX0NPTUJJTkVCQUNLVVBfTU9ERTogLS1jbG9uZQogCiAgIDw8 OiAqbWFjb3NfdGFza190ZW1wbGF0ZQogCi0tIAoyLjQ1LjIKCg== --------------bwhAuqRPebFLDVfJZngcpjAs--