From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED5CF39AD3 for ; Fri, 1 Mar 2024 19:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709320486; cv=none; b=E6uZlfndcAXIHuKFjCyVTozl1UhQa0mLkaQ/FFyhtLjdtQDEsA7nErj+OX8vuB29bH4YdU6kc9N5ryNEzHggIEkiy4g39EaW+i9AUVRMn1cErthq9v3UShL5f+0jzvSEbdgUdq6BgX3zCAQabSBpuJv50ixMaOzCQc7Q7uPJ6ow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709320486; c=relaxed/simple; bh=0CEbY0BjjMgrToebaI751yluRtUHOU1itRQT+UGTUxI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=be79e36xajR6xrmPB1YLHYfhDVPW//RgOf6VLBdWqn8QKRqaIuaCDeep40PmVUpP5+isS/qBo8z9QL/yksOkwXxGMaRQhnLPXfzodkwU1XghjuctVcmURr1rMBV2AEFJ2zv9Bhj4R9aCiWjwd7fQPxHT5rpmFi3mT+fQmXib5Hk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gIHjhn3s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gIHjhn3s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A041C433C7 for ; Fri, 1 Mar 2024 19:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709320485; bh=0CEbY0BjjMgrToebaI751yluRtUHOU1itRQT+UGTUxI=; h=From:To:Subject:Date:From; b=gIHjhn3sVpq6IwusbZP3a9/Es7q9+ls9QUBvQjdZPGvIrL/hBLyOGK/0aIy/Tp91W 5szoP5BlMlv87G5c/ZDmK3I7jfygfvpzG9P4iPgOuN+cSO8MEsMht0+6VHanvIQL2/ /nqyu6W1SmlHksNqOtXZ2fbD53Om+Z/6xPJt1bd3XuSb6+4WDd6BIkP+DrcYoMyUGR tdX1BfzSV4TlnrMkmt3rD2qHNLRKTTwM3lzrhq4OjI+N3bUDNZ433lIVND+ZvnhLvD /h2z7gNwASn4ZofZj7VHmqS+ZTucvKeJ4cuL0ri2hfhpH7iKCf9opEx3hYLrfvXEGm mqna6+A5de3xA== From: Jeff Layton To: kdevops@lists.linux.dev Subject: [PATCH] nfsd: rework how we use storage Date: Fri, 1 Mar 2024 14:14:43 -0500 Message-ID: <20240301191444.88839-1-jlayton@kernel.org> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Jeff Layton --- kconfigs/Kconfig.nfsd | 26 ++++++++++++-------------- playbooks/roles/nfsd/defaults/main.yml | 2 ++ playbooks/roles/nfsd/tasks/main.yml | 11 ++++++++++- scripts/nfsd.Makefile | 4 ++-- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/kconfigs/Kconfig.nfsd b/kconfigs/Kconfig.nfsd index 946c2c101b58..db80d8c0981e 100644 --- a/kconfigs/Kconfig.nfsd +++ b/kconfigs/Kconfig.nfsd @@ -1,22 +1,20 @@ # FIXME: need defaults for terraform hosts -config NFSD_EXPORT_DEVICE_0 - string "First device to be exported" - default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME - default "/dev/disk/by-id/virtio-kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO - default "/dev/disk/by-id/ata-QEMU_HARDDISK_kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE +config NFSD_EXPORT_DEVICE_PREFIX + string "The device prefix to use for LVM PVs" + default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME + default "/dev/disk/by-id/virtio-kdevops" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO + default "/dev/disk/by-id/ata-QEMU_HARDDISK_kdevops" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE default "" help - To set up nfsd for testing, we give it filesystems to export. This - block device is used as a PV for LVM, and volumes are provisioned from it. + To set up nfsd for testing, we give it filesystems to export. This string + will be the prefix for the block devices used as PVs for LVM. -config NFSD_EXPORT_DEVICE_1 - string "Second device to be exported" - default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME - default "/dev/disk/by-id/virtio-kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO - default "/dev/disk/by-id/ata-QEMU_HARDDISK_kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE +config NFSD_EXPORT_DEVICE_COUNT + int "Number of devices to add as LVM PVs" + default 3 if LIBVIRT help - To set up nfsd for testing, we give it filesystems to export. This - block device is used as a PV for LVM, and volumes are provisioned from it. + The number of disk devices to dedicate as LVM PVs. In general, we + avoid using device index 0 as that is used for /data. choice prompt "Type of filesystem to export" diff --git a/playbooks/roles/nfsd/defaults/main.yml b/playbooks/roles/nfsd/defaults/main.yml index 4a72f4f0b048..c2a8044d8a46 100644 --- a/playbooks/roles/nfsd/defaults/main.yml +++ b/playbooks/roles/nfsd/defaults/main.yml @@ -1,6 +1,8 @@ # SPDX-License-Identifier GPL-2.0+ --- # Our sensible defaults for the nfsd role. +nfsd_export_device_prefix: "" +nfsd_export_device_count: 0 nfsd_export_label: "export" nfsd_export_fs_opts: "" nfsd_lease_time: "90" diff --git a/playbooks/roles/nfsd/tasks/main.yml b/playbooks/roles/nfsd/tasks/main.yml index e051d21bd819..e2a6b1b2afab 100644 --- a/playbooks/roles/nfsd/tasks/main.yml +++ b/playbooks/roles/nfsd/tasks/main.yml @@ -22,13 +22,22 @@ group: root mode: 0644 +- name: Build string of devices to use as PVs + set_fact: + nfsd_lvm_pvs: "{{ nfsd_lvm_pvs + [ nfsd_export_device_prefix item ] }}" + with_items: "{{ range(1, nfsd_export_device_count) }}" + +- name: Print the PV list + ansible.builtin.debug: + var: nfsd_lvm_pvs + - name: Create a new LVM VG become: yes become_flags: 'su - -c' become_method: sudo community.general.lvg: vg: "exports" - pvs: "{{ nfsd_export_device_0 }},{{ nfsd_export_device_1 }}" + pvs: "{{ nfsd_lvm_pvs | join(',') }}" - name: Create {{ nfsd_export_path }} become: yes diff --git a/scripts/nfsd.Makefile b/scripts/nfsd.Makefile index 40338ab93fce..d3549a29af84 100644 --- a/scripts/nfsd.Makefile +++ b/scripts/nfsd.Makefile @@ -1,5 +1,5 @@ -NFSD_EXTRA_ARGS += nfsd_export_device_0='$(subst ",,$(CONFIG_NFSD_EXPORT_DEVICE_0))' -NFSD_EXTRA_ARGS += nfsd_export_device_1='$(subst ",,$(CONFIG_NFSD_EXPORT_DEVICE_1))' +NFSD_EXTRA_ARGS += nfsd_export_device_prefix='$(subst ",,$(CONFIG_NFSD_EXPORT_DEVICE_PREFIX))' +NFSD_EXTRA_ARGS += nfsd_export_device_count='$(subst ",,$(CONFIG_NFSD_EXPORT_DEVICE_COUNT))' NFSD_EXTRA_ARGS += nfsd_export_fstype='$(subst ",,$(CONFIG_NFSD_EXPORT_FSTYPE))' NFSD_EXTRA_ARGS += nfsd_export_path='$(subst ",,$(CONFIG_NFSD_EXPORT_PATH))' NFSD_EXTRA_ARGS += nfsd_export_options='$(subst ",,$(CONFIG_NFSD_EXPORT_OPTIONS))' -- 2.43.2