From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (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 lists.proxmox.com (Postfix) with ESMTPS id 3A32074B96 for ; Tue, 22 Jun 2021 12:23:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2DD9F2584C for ; Tue, 22 Jun 2021 12:23:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id 285A125841 for ; Tue, 22 Jun 2021 12:23:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F073743FDA for ; Tue, 22 Jun 2021 12:23:32 +0200 (CEST) Date: Tue, 22 Jun 2021 12:23:25 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210622101657.2344347-1-f.gruenbichler@proxmox.com> In-Reply-To: <20210622101657.2344347-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1624357320.sqo7goqoxp.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.673 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: Re: [pve-devel] [PATCH manager 1/2] postinst: set custom LVM settings X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2021 10:23:34 -0000 On June 22, 2021 12:16 pm, Fabian Gr=C3=BCnbichler wrote: > now that we no longer ship our own LVM packages, set the relevant > filtering options here if they are missing. >=20 > for an upgrade from PVE 6.x, the following two scenarios are likely: >=20 > A: user edited config provided by our old lvm2 package. it likely > contains our (or a modified) global_filter, but the old scan_lvs > default. in this case we ignore global_filter as long as it contains our > 'don't scan zvols' entry, and set scan_lvs to false. >=20 > B: config provided by our old lvm2 package was taken over by default > config from stock lvm2 package. scan_lvs defaults to false already, but > global_filter is unset (scan everything), so we need to set our own > global_filter excluding zvols. >=20 > other combinations should be handled fine as well. >=20 > for new installs (installer, install on top of Debian Bullseye) we are > always in scenario B. >=20 > Signed-off-by: Fabian Gr=C3=BCnbichler > --- >=20 > Notes: > once other difference between our old config and the stock one is tha= t we had > 'issue_discards' enabled. we could either put this in the release not= es, or > also enable it here automatically - but it is less straight-forward s= ince the > default is not "almost certainly wrong" like for the filtering option= s.. > =20 > we could drop the "check for marker" and just do this once on initial= install > and upgrades from 6.x, but since the fallout from not having these in= place can > be data corruption (activating multiple VGs with same name, using one= from a > guest on the host!) I'd rather play it safe.. >=20 > debian/postinst | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) >=20 > diff --git a/debian/postinst b/debian/postinst > index dcf77d24..241aac08 100755 > --- a/debian/postinst > +++ b/debian/postinst > @@ -8,6 +8,58 @@ set -e > # done its automatic conffile handling, and all the packages we depend > # of are already fully installed and configured. > =20 > +LVM_CONF_MARKER=3D"# added by pve-manager to avoid scanning" > + > +set_lvm_conf() { > + OLD_VALUE=3D"$(lvmconfig --typeconfig full devices/global_filter)" > + NEW_VALUE=3D'global_filter=3D["r|/dev/zd.*|"]' > + > + # only do these changes once > + # keep user changes afterwards provided marker is still there.. > + if grep -qv "$LVM_CONF_MARKER" /etc/lvm/lvm.conf; then > + # check global_filter > + # keep previous setting from our custom packaging if it is still there > + if echo "$OLD_VALUE" | grep -qvF 'r|/dev/zd.*|'; then > + SET_FILTER=3D1 > + BACKUP=3D1 > + fi > + # should be the default since bullseye > + if lvmconfig --typeconfig full devices/scan_lvs | grep -qv 'scan_lvs=3D= 0'; then > + SET_SCAN_LVS=3D1 > + BACKUP=3D1 > + fi > + if test -n "$BACKUP"; then > + echo "Backing up lvm.conf before setting pve-manager specific setti= ngs.." > + cp -vb /etc/lvm/lvm.conf /etc/lvm/lvm.conf.bak > + fi > + if test -n "$SET_FILTER"; then > + echo "Setting 'global_filter' in /etc/lvm/lvm.conf to prevent zvols= from being scanned:" > + echo "$OLD_VALUE =3D> $NEW_VALUE" > + # comment out existing setting > + sed -i -e 's/^\([[:space:]]*global_filter[[:space:]]*=3D\)/#\1/' /e= tc/lvm/lvm.conf > + # add new section with our setting > + cat >> /etc/lvm/lvm.conf < +devices { > + $LVM_CONF_MARKER ZFS zvols > + global_filter=3D$NEW_VALUE this should of course not have the 'global_filter=3D' prefix (moved that=20 into NEW_VALUE before sending and forgot to update this line :-/), but=20 rather be just + $NEW_VALUE > +} > +EOF > + fi > + if test -n "$SET_SCAN_LVS"; then > + echo "Adding scan_lvs=3D0 setting to /etc/lvm/lvm.conf to prevent L= Vs from being scanned." > + # comment out existing setting > + sed -i -e 's/^\([[:space:]]*scan_lvs[[:space:]]*=3D\)/#\1/' /etc/lv= m/lvm.conf > + # add new section with our setting > + cat >> /etc/lvm/lvm.conf < +devices { > + $LVM_CONF_MARKER LVM volumes > + scan_lvs=3D0 > +} > +EOF > + fi > + fi > +} > + > case "$1" in > triggered) > # We don't print a status message here, as dpkg already said > @@ -86,6 +138,9 @@ case "$1" in > newaliases || true > fi > fi > + > + set_lvm_conf > + > ;; > =20 > abort-upgrade|abort-remove|abort-deconfigure) > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20