From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 2541862530;
 Wed, 30 Sep 2020 09:35:51 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 12B7315E86;
 Wed, 30 Sep 2020 09:35:51 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [212.186.127.180])
 (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 E2E5C15E79;
 Wed, 30 Sep 2020 09:35:46 +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 A9E12458E9;
 Wed, 30 Sep 2020 09:35:46 +0200 (CEST)
To: Proxmox Backup Server development discussion
 <pbs-devel@lists.proxmox.com>, Stoiko Ivanov <s.ivanov@proxmox.com>,
 pve-devel@lists.proxmox.com
References: <20200916121419.3997-1-s.ivanov@proxmox.com>
 <20200916121419.3997-3-s.ivanov@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Message-ID: <46e7d550-4891-8e8f-4f08-977a60047b51@proxmox.com>
Date: Wed, 30 Sep 2020 09:35:45 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
 Thunderbird/82.0
MIME-Version: 1.0
In-Reply-To: <20200916121419.3997-3-s.ivanov@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.164 Adjusted score from AWL reputation of From: address
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 RCVD_IN_DNSWL_MED        -2.3 Sender listed at https://www.dnswl.org/,
 medium trust
 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. [zfs.rs]
Subject: [pve-devel] applied: [pbs-devel] [RFC proxmox-backup 1/1]
 api2/node/disks/zfs: instantiate import service
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 30 Sep 2020 07:35:51 -0000

On 16.09.20 14:14, Stoiko Ivanov wrote:
> When creating a new zpool for a datastore, also instantiate an
> import-unit for it. This helps in cases where '/etc/zfs/zool.cache'
> get corrupted and thus the pool is not imported upon boot.
>=20
> This patch needs the corresponding addition of 'zfs-import@.service' in=

> the zfsonlinux repository.
>=20
> Suggested-by: Fabian Gr=C3=BCnbichler <f.gruenbichler@proxmox.com>
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
>  src/api2/node/disks/zfs.rs | 5 +++++
>  1 file changed, 5 insertions(+)
>=20
>

applied, thanks!

did the following (-w white-space ignored) change, similar to the PVE one=
=2E

diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs
index 0f0e4220..16534199 100644
--- a/src/api2/node/disks/zfs.rs
+++ b/src/api2/node/disks/zfs.rs
@@ -357,8 +357,10 @@ pub fn create_zpool(
             let output =3D crate::tools::run_command(command, None)?;
             worker.log(output);
=20
+            if std::path::Path::new("/lib/systemd/system/zfs-import@.ser=
vice").exists() {
                 let import_unit =3D format!("zfs-import@{}.service", sys=
temd::escape_unit(&name, false));
                 systemd::enable_unit(&import_unit)?;
+            }
=20
             if let Some(compression) =3D compression {
                 let mut command =3D std::process::Command::new("zfs");





From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 2541862530;
 Wed, 30 Sep 2020 09:35:51 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 12B7315E86;
 Wed, 30 Sep 2020 09:35:51 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [212.186.127.180])
 (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 E2E5C15E79;
 Wed, 30 Sep 2020 09:35:46 +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 A9E12458E9;
 Wed, 30 Sep 2020 09:35:46 +0200 (CEST)
To: Proxmox Backup Server development discussion
 <pbs-devel@lists.proxmox.com>, Stoiko Ivanov <s.ivanov@proxmox.com>,
 pve-devel@lists.proxmox.com
References: <20200916121419.3997-1-s.ivanov@proxmox.com>
 <20200916121419.3997-3-s.ivanov@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Message-ID: <46e7d550-4891-8e8f-4f08-977a60047b51@proxmox.com>
Date: Wed, 30 Sep 2020 09:35:45 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
 Thunderbird/82.0
MIME-Version: 1.0
In-Reply-To: <20200916121419.3997-3-s.ivanov@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.164 Adjusted score from AWL reputation of From: address
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 RCVD_IN_DNSWL_MED        -2.3 Sender listed at https://www.dnswl.org/,
 medium trust
 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. [zfs.rs]
Subject: [pbs-devel] applied: [RFC proxmox-backup 1/1] api2/node/disks/zfs:
 instantiate import service
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
 <pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 30 Sep 2020 07:35:51 -0000

On 16.09.20 14:14, Stoiko Ivanov wrote:
> When creating a new zpool for a datastore, also instantiate an
> import-unit for it. This helps in cases where '/etc/zfs/zool.cache'
> get corrupted and thus the pool is not imported upon boot.
>=20
> This patch needs the corresponding addition of 'zfs-import@.service' in=

> the zfsonlinux repository.
>=20
> Suggested-by: Fabian Gr=C3=BCnbichler <f.gruenbichler@proxmox.com>
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
>  src/api2/node/disks/zfs.rs | 5 +++++
>  1 file changed, 5 insertions(+)
>=20
>

applied, thanks!

did the following (-w white-space ignored) change, similar to the PVE one=
=2E

diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs
index 0f0e4220..16534199 100644
--- a/src/api2/node/disks/zfs.rs
+++ b/src/api2/node/disks/zfs.rs
@@ -357,8 +357,10 @@ pub fn create_zpool(
             let output =3D crate::tools::run_command(command, None)?;
             worker.log(output);
=20
+            if std::path::Path::new("/lib/systemd/system/zfs-import@.ser=
vice").exists() {
                 let import_unit =3D format!("zfs-import@{}.service", sys=
temd::escape_unit(&name, false));
                 systemd::enable_unit(&import_unit)?;
+            }
=20
             if let Some(compression) =3D compression {
                 let mut command =3D std::process::Command::new("zfs");