Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nMtYz-00067p-IK for pgsql-hackers@arkaria.postgresql.org; Wed, 23 Feb 2022 15:28:22 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1nMtYx-0000k3-S5 for pgsql-hackers@arkaria.postgresql.org; Wed, 23 Feb 2022 15:28:19 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nMtYx-0000jt-G1 for pgsql-hackers@lists.postgresql.org; Wed, 23 Feb 2022 15:28:19 +0000 Received: from www.pro-open.de ([46.4.51.10]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nMtYq-00085h-9v for pgsql-hackers@lists.postgresql.org; Wed, 23 Feb 2022 15:28:19 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by www.pro-open.de (Postfix) with ESMTP id CB68A45000BE for ; Wed, 23 Feb 2022 16:28:10 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at pro-open.de Received: from www.pro-open.de ([127.0.0.1]) by localhost (www.pro-open.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PK4wogHKFKa9 for ; Wed, 23 Feb 2022 16:28:10 +0100 (CET) Received: from [192.168.0.20] (p4fd27957.dip0.t-ipconnect.de [79.210.121.87]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by www.pro-open.de (Postfix) with ESMTPSA id 41E0B45000BD for ; Wed, 23 Feb 2022 16:28:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pro-open.de; s=dkim; t=1645630090; bh=e9lnXtwoQo4edOBVSzMdhCAiGdAilc68gzJvnFUC7Cc=; h=Date:To:From:Subject:From; b=FbvdFf29kGrkdw3YbofJOyhKqIwJr+loPqLxmuL/AnwMk/eWMHyxab34PiM/lAGF2 elpPT4+bNOXf0oUmLq0sSz0qIsXnXUBHl3njfEibjKKdDMjjaZphQdiAOYaITPlsZi xi1vGPO5qjlJ9+lkLhzi4v4fdj31OA031W936On5FH6slpNIFIxifNioRHpTAZXWW1 9j9BPjRNj9iUojlmG1D+4XEpcPl/AvHxaSw+v1ZyqkAV5uGIzsIZzL49UQndGAWCX2 iKPKbm3MleE3HeeYbThlIirRQcH9s4sgemnB+E9VVwzC5oBwLUA8V48XrrXRJ52P6I jZS/owwJS6mfg== Content-Type: multipart/mixed; boundary="------------ujq0FAEkBmun0RTYj3XN9bhU" Message-ID: <7c59265d-ac50-b0aa-ca1e-65e8bd27642a@pro-open.de> Date: Wed, 23 Feb 2022 16:28:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: de-DE To: "pgsql-hackers@lists.postgresql.org" From: "Gunnar \"Nick\" Bluth" Subject: PATCH: add "--config-file=" option to pg_rewind 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. --------------ujq0FAEkBmun0RTYj3XN9bhU Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi! During a Patroni PR discussion (https://github.com/zalando/patroni/pull/2225), we realised that if one wants to use the "-c" option on a typical Debian/Ubuntu installation (where the config resides below /etc/postgresql/), pg_rewind needs a way to be told where the postgresql.conf actually is. The attached patch implements this as an option. I'm extremely unhappy that I called it "--config-file" here, while "postgres" itself wants "--config_file". But as the other dashed options of pg_rewind are, well, dashed and not underscored, it seemed to be better that the other way... As the "-c" feature appeared in 12 and existing Debian installations are unable to use it right now, I suggest to even backport the patch. Oh, and I'm still not subscribed to -hackers, so the usual "please CC me" applies! Best regards, -- Gunnar "Nick" Bluth Eimermacherweg 106 D-48159 Münster Mobil +49 172 8853339 Email: gunnar.bluth@pro-open.de __________________________________________________________________________ "Ceterum censeo SystemD esse delendam" - Cato --------------ujq0FAEkBmun0RTYj3XN9bhU Content-Type: text/x-patch; charset=UTF-8; name="add_configfile_to_pg_rewind.patch" Content-Disposition: attachment; filename="add_configfile_to_pg_rewind.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9yZWYvcGdfcmV3aW5kLnNnbWwgYi9kb2Mvc3Jj L3NnbWwvcmVmL3BnX3Jld2luZC5zZ21sCmluZGV4IDMzZTZiYjY0YWQuLmY4MGFkYmY1YWUg MTAwNjQ0Ci0tLSBhL2RvYy9zcmMvc2dtbC9yZWYvcGdfcmV3aW5kLnNnbWwKKysrIGIvZG9j L3NyYy9zZ21sL3JlZi9wZ19yZXdpbmQuc2dtbApAQCAtMjQxLDYgKzI0MSwxNyBAQCBQb3N0 Z3JlU1FMIGRvY3VtZW50YXRpb24KICAgICAgIDwvbGlzdGl0ZW0+CiAgICAgIDwvdmFybGlz dGVudHJ5PgogCisgICAgIDx2YXJsaXN0ZW50cnk+CisgICAgICA8dGVybT48b3B0aW9uPi0t Y29uZmlnLWZpbGU9PHJlcGxhY2VhYmxlIGNsYXNzPSJwYXJhbWV0ZXIiPmZpbGVwYXRoPC9y ZXBsYWNlYWJsZT48L29wdGlvbj48L3Rlcm0+CisgICAgICA8bGlzdGl0ZW0+CisgICAgICAg PHBhcmE+CisgICAgICAgIEluIGNhc2UgdGhlIDxmaWxlbmFtZT5wb3N0Z3Jlc3FsLmNvbmY8 L2ZpbGVuYW1lPiBvZiB5b3VyIHRhcmdldCBjbHVzdGVyIGlzIG5vdCBpbiB0aGUgCisgICAg ICAgIHRhcmdldCBwZ2RhdGEgYW5kIHlvdSB3YW50IHRvIHVzZSB0aGUgPG9wdGlvbj4tYzwv b3B0aW9uPiBvcHRpb24sCisgICAgICAgIHByb3ZpZGUgYSAocmVsYXRpdmUgb3IgYWJzb2x1 dGUpIHBhdGggdG8gdGhlIDxmaWxlbmFtZT5wb3N0Z3Jlc3FsLmNvbmY8L2ZpbGVuYW1lPiB1 c2luZyB0aGlzIG9wdGlvbi4KKyAgICAgICA8L3BhcmE+CisgICAgICA8L2xpc3RpdGVtPgor ICAgICA8L3Zhcmxpc3RlbnRyeT4KKwogICAgICA8dmFybGlzdGVudHJ5PgogICAgICAgPHRl cm0+PG9wdGlvbj4tLWRlYnVnPC9vcHRpb24+PC90ZXJtPgogICAgICAgPGxpc3RpdGVtPgpk aWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ19yZXdpbmQvcGdfcmV3aW5kLmMgYi9zcmMvYmluL3Bn X3Jld2luZC9wZ19yZXdpbmQuYwppbmRleCBlZmI4MmE0MDM0Li5kNTdhM2E2ODUyIDEwMDY0 NAotLS0gYS9zcmMvYmluL3BnX3Jld2luZC9wZ19yZXdpbmQuYworKysgYi9zcmMvYmluL3Bn X3Jld2luZC9wZ19yZXdpbmQuYwpAQCAtNjAsNiArNjAsNyBAQCBjaGFyCSAgICpkYXRhZGly X3RhcmdldCA9IE5VTEw7CiBjaGFyCSAgICpkYXRhZGlyX3NvdXJjZSA9IE5VTEw7CiBjaGFy CSAgICpjb25uc3RyX3NvdXJjZSA9IE5VTEw7CiBjaGFyCSAgICpyZXN0b3JlX2NvbW1hbmQg PSBOVUxMOworY2hhcgkgICAqY29uZmlnX2ZpbGUgPSBOVUxMOwogCiBzdGF0aWMgYm9vbCBk ZWJ1ZyA9IGZhbHNlOwogYm9vbAkJc2hvd3Byb2dyZXNzID0gZmFsc2U7CkBAIC04Niw2ICs4 Nyw3IEBAIHVzYWdlKGNvbnN0IGNoYXIgKnByb2duYW1lKQogCXByaW50ZihfKCJPcHRpb25z OlxuIikpOwogCXByaW50ZihfKCIgIC1jLCAtLXJlc3RvcmUtdGFyZ2V0LXdhbCAgICAgICB1 c2UgcmVzdG9yZV9jb21tYW5kIGluIHRhcmdldCBjb25maWd1cmF0aW9uIHRvXG4iCiAJCQkg IiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHJpZXZlIFdBTCBmaWxlcyBm cm9tIGFyY2hpdmVzXG4iKSk7CisJcHJpbnRmKF8oIiAgICAgIC0tY29uZmlnLWZpbGU9RklM RSAgICAgICAgIHBhdGggdG8gcG9zdGdyZXNxbC5jb25mIGlmIG91dHNpZGUgdGFyZ2V0LXBn ZGF0YSAoZm9yIC1jKVxuIikpOwogCXByaW50ZihfKCIgIC1ELCAtLXRhcmdldC1wZ2RhdGE9 RElSRUNUT1JZICBleGlzdGluZyBkYXRhIGRpcmVjdG9yeSB0byBtb2RpZnlcbiIpKTsKIAlw cmludGYoXygiICAgICAgLS1zb3VyY2UtcGdkYXRhPURJUkVDVE9SWSAgc291cmNlIGRhdGEg ZGlyZWN0b3J5IHRvIHN5bmNocm9uaXplIHdpdGhcbiIpKTsKIAlwcmludGYoXygiICAgICAg LS1zb3VyY2Utc2VydmVyPUNPTk5TVFIgICAgc291cmNlIHNlcnZlciB0byBzeW5jaHJvbml6 ZSB3aXRoXG4iKSk7CkBAIC0xMjAsNiArMTIyLDcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAJCXsibm8tc3luYyIsIG5vX2FyZ3VtZW50LCBOVUxMLCAnTid9LAogCQl7InBy b2dyZXNzIiwgbm9fYXJndW1lbnQsIE5VTEwsICdQJ30sCiAJCXsiZGVidWciLCBub19hcmd1 bWVudCwgTlVMTCwgM30sCisJCXsiY29uZmlnLWZpbGUiLCByZXF1aXJlZF9hcmd1bWVudCwg TlVMTCwgNX0sCiAJCXtOVUxMLCAwLCBOVUxMLCAwfQogCX07CiAJaW50CQkJb3B0aW9uX2lu ZGV4OwpAQCAtMjA0LDYgKzIwNywxMCBAQCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikK IAkJCWNhc2UgNDoKIAkJCQlub19lbnN1cmVfc2h1dGRvd24gPSB0cnVlOwogCQkJCWJyZWFr OworCisJCQljYXNlIDU6CisJCQkJY29uZmlnX2ZpbGUgPSBwZ19zdHJkdXAob3B0YXJnKTsK KwkJCQlicmVhazsKIAkJfQogCX0KIApAQCAtMTA1MSw5ICsxMDU4LDE2IEBAIGdldFJlc3Rv cmVDb21tYW5kKGNvbnN0IGNoYXIgKmFyZ3YwKQogCSAqIEJ1aWxkIGEgY29tbWFuZCBhYmxl IHRvIHJldHJpZXZlIHRoZSB2YWx1ZSBvZiBHVUMgcGFyYW1ldGVyCiAJICogcmVzdG9yZV9j b21tYW5kLCBpZiBzZXQuCiAJICovCi0Jc25wcmludGYocG9zdGdyZXNfY21kLCBzaXplb2Yo cG9zdGdyZXNfY21kKSwKKwlpZiAoY29uZmlnX2ZpbGUgPT0gTlVMTCkKKwl7CisJCXNucHJp bnRmKHBvc3RncmVzX2NtZCwgc2l6ZW9mKHBvc3RncmVzX2NtZCksCiAJCQkgIlwiJXNcIiAt RCBcIiVzXCIgLUMgcmVzdG9yZV9jb21tYW5kIiwKIAkJCSBwb3N0Z3Jlc19leGVjX3BhdGgs IGRhdGFkaXJfdGFyZ2V0KTsKKwl9IGVsc2UgeworCQlzbnByaW50Zihwb3N0Z3Jlc19jbWQs IHNpemVvZihwb3N0Z3Jlc19jbWQpLAorCQkJICJcIiVzXCIgLUQgXCIlc1wiIC0tY29uZmln X2ZpbGU9XCIlc1wiIC1DIHJlc3RvcmVfY29tbWFuZCIsCisJCQkgcG9zdGdyZXNfZXhlY19w YXRoLCBkYXRhZGlyX3RhcmdldCwgY29uZmlnX2ZpbGUpOworCX0KIAogCWlmICghcGlwZV9y ZWFkX2xpbmUocG9zdGdyZXNfY21kLCBjbWRfb3V0cHV0LCBzaXplb2YoY21kX291dHB1dCkp KQogCQlleGl0KDEpOwo= --------------ujq0FAEkBmun0RTYj3XN9bhU--