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 564D76621E for ; Thu, 5 Nov 2020 14:42:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 429A118F66 for ; Thu, 5 Nov 2020 14:41:30 +0100 (CET) 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 1A2E018F53 for ; Thu, 5 Nov 2020 14:41:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D93CC46038 for ; Thu, 5 Nov 2020 14:41:28 +0100 (CET) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 5 Nov 2020 14:36:28 +0100 Message-Id: <20201105133629.9802-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 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] [PATCH proxmox-backup 1/2] mount zpools created via API under /mnt/datastore X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2020 13:42:00 -0000 as we do for other file systems Signed-off-by: Fabian Ebner --- docs/storage.rst | 2 +- src/api2/node/disks/zfs.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/storage.rst b/docs/storage.rst index 8541237b..022d951e 100644 --- a/docs/storage.rst +++ b/docs/storage.rst @@ -57,7 +57,7 @@ create a datastore at the location ``/mnt/datastore/store1``: You can also create a ``zpool`` with various raid levels from **Administration -> Disks -> Zpool** in the web interface, or by using ``zpool create``. The command below creates a mirrored ``zpool`` using two disks (``sdb`` & ``sdc``) and -mounts it on the root directory (default): +mounts it under ``/mnt/datastore/zpool1``: .. code-block:: console diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs index 79094012..ef7b7c67 100644 --- a/src/api2/node/disks/zfs.rs +++ b/src/api2/node/disks/zfs.rs @@ -243,7 +243,7 @@ pub fn zpool_details( permission: &Permission::Privilege(&["system", "disks"], PRIV_SYS_MODIFY, false), }, )] -/// Create a new ZFS pool. +/// Create a new ZFS pool. Will be mounted under '/mnt/datastore/'. pub fn create_zpool( name: String, devices: String, @@ -303,10 +303,11 @@ pub fn create_zpool( bail!("{:?} needs at least {} disks.", raidlevel, min_disks); } + let mount_point = format!("/mnt/datastore/{}", &name); + // check if the default path does exist already and bail if it does - // otherwise we get an error on mounting - let mut default_path = std::path::PathBuf::from("/"); - default_path.push(&name); + // otherwise 'zpool create' aborts after partitioning, but before creating the pool + let default_path = std::path::PathBuf::from(&mount_point); match std::fs::metadata(&default_path) { Err(_) => {}, // path does not exist @@ -322,7 +323,7 @@ pub fn create_zpool( let mut command = std::process::Command::new("zpool"); - command.args(&["create", "-o", &format!("ashift={}", ashift), &name]); + command.args(&["create", "-o", &format!("ashift={}", ashift), "-m", &mount_point, &name]); match raidlevel { ZfsRaidLevel::Single => { @@ -371,7 +372,6 @@ pub fn create_zpool( } if add_datastore { - let mount_point = format!("/{}", name); crate::api2::config::datastore::create_datastore(json!({ "name": name, "path": mount_point }))? } -- 2.20.1