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 1sKPxS-00A6GE-5L for pgsql-hackers@arkaria.postgresql.org; Thu, 20 Jun 2024 22:08:42 +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 1sKPwR-002EyL-BI for pgsql-hackers@arkaria.postgresql.org; Thu, 20 Jun 2024 22:07:39 +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 1sKPwR-002EyC-0f for pgsql-hackers@lists.postgresql.org; Thu, 20 Jun 2024 22:07:39 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1sKPwN-002Jez-He for pgsql-hackers@postgresql.org; Thu, 20 Jun 2024 22:07:37 +0000 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4217990f8baso14047355e9.2 for ; Thu, 20 Jun 2024 15:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb.com; s=google; t=1718921253; x=1719526053; 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=2N9E69dDnHa9TDxAdUudEz3U8hvd/mDottddrg0wnV0=; b=hZK6cgxjYjCVeYfO999Bq6TgLHskFd1KyBxZtIcVgh9wwE5qM6iSGDWjnU2VwCnPps WFSZRbKUwYx8ae98OZH1Gk6vh/dKHY7LKVrMpKWzk5vzE90AeQAbd+YKVdAo7LmTULAY sv+w2q2t7J0A8K6LD6Hrn1hDiolKYapbtqMWlsCZyAcQ0+0w7CmtQ6/S4UQk4OOD4SzZ ODK87OFnp3IezVjEIUPguqCFJFtu3FCrYEj4ZsNJ+1NphFcdFJSy5fDgiFT3KyJd9jAB SVRI0kbpNa0MFILp2Y6Fuec0i7BACccrMbY4ARTL4enOkCm8kIH9lK2XFFuDIfjKhAcQ be3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718921253; x=1719526053; 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=2N9E69dDnHa9TDxAdUudEz3U8hvd/mDottddrg0wnV0=; b=p9PnLhfkVZGIWhCjwRLWBVzxZNsXCgELs7bNx1+gROsqDRGrWxe2wiMNF9yICNdg5y 2rwfTitMCsZrFPN7bi31ctlyQwMVJwdThTeCV298PP+0MSljgHfHtMBGiM3fuomhifbh NYwhzY9RDFmsJm+ErDB70SqEg6D5t/ZxSZB6LcMPBDWKP+nEoohrfmG9c29r1RpW/OYV 57KKHEVLlx/b51ITMX2BCLRVA2TUtx8zGw5LdZV4Z0zlUKu5SAeEGT+xds0k6WooQTlq ZJgkRwduIF5eWE9Gl/yONZZApXQf1njjuR0SSeuthbKyA6GnybPIzUfovCCeG9MYtt+N sIEw== X-Forwarded-Encrypted: i=1; AJvYcCWUqgZngfN3zG25VxUdyBKYawA3kU0lMInpzSN6WZojmvh43VIp2Mu82x6pL0sb8JI2cRbARx70vywd8GSl5Q/0swyr+d5Sy4vstiGU X-Gm-Message-State: AOJu0Yz2531jT0EARTmmHfdKazbZPVpR/hdKKz2WA7Zy3Syv6+XNcigo 8j3MTyFlLJYqlkVj5MXNK9PNJxXxM+XnW5cAiuQFUClE/Veqml7nvHGJLisgMXPAza4JXeex1XI = X-Google-Smtp-Source: AGHT+IEM/59l/PIjPmxvJKouo5ejgIkYvgdNeA5BNblU7cPC1/l8CHwl2QFH5UtFLJEcoSp45F7Bxw== X-Received: by 2002:adf:f68a:0:b0:35f:d70:6193 with SMTP id ffacd0b85a97d-36317b7d44fmr4731790f8f.41.1718921253357; Thu, 20 Jun 2024 15:07:33 -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-a6fcf56091esm14204266b.179.2024.06.20.15.07.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Jun 2024 15:07:32 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------THXT5QnJn70NDbJhapTYHBkY" Message-ID: <9498bcb1-ee7b-484f-b2fb-3d22c48cb4c5@enterprisedb.com> Date: Fri, 21 Jun 2024 00:07:32 +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> Content-Language: en-US In-Reply-To: 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. --------------THXT5QnJn70NDbJhapTYHBkY Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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. regards -- Tomas Vondra EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --------------THXT5QnJn70NDbJhapTYHBkY Content-Type: text/x-patch; charset=UTF-8; name="0001-fix-clone-headers.patch" Content-Disposition: attachment; filename="0001-fix-clone-headers.patch" Content-Transfer-Encoding: base64 RnJvbSBhZTcxMmFhNjMxNmM4ZjcwMzVlZGVlOWZiNDllMWJmZTFlYTMwYjk0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBWb25kcmEgPHRvbWFzQDJuZHF1YWRyYW50 LmNvbT4KRGF0ZTogVGh1LCAyMCBKdW4gMjAyNCAyMzo1MDoyMiArMDIwMApTdWJqZWN0OiBb UEFUQ0hdIGZpeCBjbG9uZSBoZWFkZXJzCgotLS0KIHNyYy9iaW4vcGdfY29tYmluZWJhY2t1 cC9jb3B5X2ZpbGUuYyAgICAgICAgfCAxMiArKysrKysrKysrKy0KIHNyYy9iaW4vcGdfY29t YmluZWJhY2t1cC9wZ19jb21iaW5lYmFja3VwLmMgfCAgOCArKysrKysrKwogMiBmaWxlcyBj aGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEv c3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL2NvcHlfZmlsZS5jIGIvc3JjL2Jpbi9wZ19jb21i aW5lYmFja3VwL2NvcHlfZmlsZS5jCmluZGV4IDA4YzNiODc1NDIwLi44YjUwZTkzNzM0NiAx MDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19jb21iaW5lYmFja3VwL2NvcHlfZmlsZS5jCisrKyBi L3NyYy9iaW4vcGdfY29tYmluZWJhY2t1cC9jb3B5X2ZpbGUuYwpAQCAtMTMsNiArMTMsMTAg QEAKICNpZmRlZiBIQVZFX0NPUFlGSUxFX0gKICNpbmNsdWRlIDxjb3B5ZmlsZS5oPgogI2Vu ZGlmCisjaWZkZWYgX19saW51eF9fCisjaW5jbHVkZSA8c3lzL2lvY3RsLmg+CisjaW5jbHVk ZSA8bGludXgvZnMuaD4KKyNlbmRpZgogI2luY2x1ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8 bGltaXRzLmg+CiAjaW5jbHVkZSA8c3lzL3N0YXQuaD4KQEAgLTIxNCw2ICsyMTgsOSBAQCBj b3B5X2ZpbGVfY2xvbmUoY29uc3QgY2hhciAqc3JjLCBjb25zdCBjaGFyICpkZXN0LAogCQlw Z19mYXRhbCgiZXJyb3Igd2hpbGUgY2xvbmluZyBmaWxlIFwiJXNcIiB0byBcIiVzXCI6ICVt Iiwgc3JjLCBkZXN0KTsKICNlbGlmIGRlZmluZWQoX19saW51eF9fKSAmJiBkZWZpbmVkKEZJ Q0xPTkUpCiAJeworCQlpbnQJCQlzcmNfZmQ7CisJCWludAkJCWRlc3RfZmQ7CisKIAkJaWYg KChzcmNfZmQgPSBvcGVuKHNyYywgT19SRE9OTFkgfCBQR19CSU5BUlksIDApKSA8IDApCiAJ CQlwZ19mYXRhbCgiY291bGQgbm90IG9wZW4gZmlsZSBcIiVzXCI6ICVtIiwgc3JjKTsKIApA QCAtMjI4LDggKzIzNSwxMSBAQCBjb3B5X2ZpbGVfY2xvbmUoY29uc3QgY2hhciAqc3JjLCBj b25zdCBjaGFyICpkZXN0LAogCQkJdW5saW5rKGRlc3QpOwogCiAJCQlwZ19mYXRhbCgiZXJy b3Igd2hpbGUgY2xvbmluZyBmaWxlIFwiJXNcIiB0byBcIiVzXCI6ICVzIiwKLQkJCQkJIHNy YywgZGVzdCk7CisJCQkJCSBzcmMsIGRlc3QsIHN0cmVycm9yKHNhdmVfZXJybm8pKTsKIAkJ fQorCisJCWNsb3NlKHNyY19mZCk7CisJCWNsb3NlKGRlc3RfZmQpOwogCX0KICNlbHNlCiAJ cGdfZmF0YWwoImZpbGUgY2xvbmluZyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm0i KTsKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfY29tYmluZWJhY2t1cC9wZ19jb21iaW5lYmFj a3VwLmMgYi9zcmMvYmluL3BnX2NvbWJpbmViYWNrdXAvcGdfY29tYmluZWJhY2t1cC5jCmlu ZGV4IDAxZDdmYjk4ZTc5Li5mNjdjY2Y3NmVhMiAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19j b21iaW5lYmFja3VwL3BnX2NvbWJpbmViYWNrdXAuYworKysgYi9zcmMvYmluL3BnX2NvbWJp bmViYWNrdXAvcGdfY29tYmluZWJhY2t1cC5jCkBAIC0xNiw2ICsxNiwxNCBAQAogI2luY2x1 ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8bGltaXRzLmg+CiAKKyNpZmRlZiBIQVZFX0NPUFlG SUxFX0gKKyNpbmNsdWRlIDxjb3B5ZmlsZS5oPgorI2VuZGlmCisjaWZkZWYgX19saW51eF9f CisjaW5jbHVkZSA8c3lzL2lvY3RsLmg+CisjaW5jbHVkZSA8bGludXgvZnMuaD4KKyNlbmRp ZgorCiAjaW5jbHVkZSAiYmFja3VwX2xhYmVsLmgiCiAjaW5jbHVkZSAiY29tbW9uL2Jsa3Jl ZnRhYmxlLmgiCiAjaW5jbHVkZSAiY29tbW9uL2NoZWNrc3VtX2hlbHBlci5oIgotLSAKMi40 NS4yCgo= --------------THXT5QnJn70NDbJhapTYHBkY--