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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 209066242F; Wed, 16 Sep 2020 14:14:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 164CA23B09; Wed, 16 Sep 2020 14:14:36 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 50C5123AED; Wed, 16 Sep 2020 14:14:35 +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 1237E453E3; Wed, 16 Sep 2020 14:14:35 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Wed, 16 Sep 2020 14:14:18 +0200 Message-Id: <20200916121419.3997-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916121419.3997-1-s.ivanov@proxmox.com> References: <20200916121419.3997-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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] [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2020 12:14:36 -0000 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. This patch needs the corresponding addition of 'zfs-import@.service' in the zfsonlinux repository. Suggested-by: Fabian Grünbichler Signed-off-by: Stoiko Ivanov --- src/api2/node/disks/zfs.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs index c5d6f6a6..0f0e4220 100644 --- a/src/api2/node/disks/zfs.rs +++ b/src/api2/node/disks/zfs.rs @@ -25,6 +25,8 @@ use crate::server::WorkerTask; use crate::api2::types::*; +use crate::tools::systemd; + pub const DISK_ARRAY_SCHEMA: Schema = ArraySchema::new( "Disk name list.", &BLOCKDEVICE_NAME_SCHEMA) .schema(); @@ -355,6 +357,9 @@ pub fn create_zpool( let output = crate::tools::run_command(command, None)?; worker.log(output); + let import_unit = format!("zfs-import@{}.service", systemd::escape_unit(&name, false)); + systemd::enable_unit(&import_unit)?; + if let Some(compression) = compression { let mut command = std::process::Command::new("zfs"); command.args(&["set", &format!("compression={}", compression), &name]); -- 2.20.1