From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E0E831FF166 for ; Fri, 25 Oct 2024 13:13:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 86AEB1E676; Fri, 25 Oct 2024 13:13:33 +0200 (CEST) From: Friedrich Weber To: pve-devel@lists.proxmox.com Date: Fri, 25 Oct 2024 13:13:03 +0200 Message-Id: <20241025111304.99680-2-f.weber@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241025111304.99680-1-f.weber@proxmox.com> References: <20241025111304.99680-1-f.weber@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [plugin.pm, proxmox.com, rbdplugin.pm] Subject: [pve-devel] [PATCH storage 1/2] fix #5779: rbd: allow to pass custom krbd map options 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" When KRBD is enabled for an RBD storage, the storage plugin calls out to `rbd map` to map an RBD image as a block device on the host. Sometimes it might be necessary to pass custom options to `rbd map`. For instance, in some setups with Windows VMs, KRBD logs `bad crc/signature` and VMs performance is degraded unless the `rxbounce` option is enabled, as reported in the forum [1]. To allow users to specify custom options for KRBD, introduce a corresponding `krbd-map-options` property to the RBD plugin. The property is designed to only accept a supported set of map options. For now, this is only the `rxbounce` map option, but the supported set can be extended in the future. The reasoning for constraining the supported set of map options instead of allowing to pass a free-form option string is as follows: If `rxbounce` turns out to be a sensible default, accepting a free-form option string now will make it hard to switch over the default to `rxbounce` while still allowing users to disable `rxbounce` if needed. This would require scanning the free-form string for a `norxbounce` or similar, which is cumbersome. If users need to set a map option that `krbd-map-options` does not support (yet), they can alternatively set the RBD config option `rbd_default_map_options` [2]. [1] https://forum.proxmox.com/threads/155741/ [2] https://github.com/ceph/ceph/blob/b2a4bd840/src/common/options/rbd.yaml.in#L507 Signed-off-by: Friedrich Weber --- src/PVE/Storage/Plugin.pm | 10 ++++++++++ src/PVE/Storage/RBDPlugin.pm | 14 +++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 8cc693c..02be257 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -394,6 +394,16 @@ sub verify_dir_override { die "invalid override '$value'\n"; } +PVE::JSONSchema::register_format('pve-storage-krbd-map-option', \&verify_krbd_map_option); +sub verify_krbd_map_option { + my ($option, $noerr) = @_; + + return $option if $option eq 'rxbounce'; + + return undef if $noerr; + die "invalid krbd map option '$option'\n"; +} + sub private { return $defaultData; } diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index f45ad3f..8110cff 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -394,6 +394,12 @@ sub properties { description => "Client keyring contents (for external clusters).", type => 'string', }, + 'krbd-map-options' => { + description => "Additional map options (only for krbd). Supported:" + ." rxbounce.", + type => 'string', + format => 'pve-storage-krbd-map-option-list', + }, }; } @@ -410,6 +416,7 @@ sub options { krbd => { optional => 1 }, keyring => { optional => 1 }, bwlimit => { optional => 1 }, + 'krbd-map-options' => { optional => 1 }, }; } @@ -726,7 +733,12 @@ sub map_volume { # features can only be enabled/disabled for image, not for snapshot! $krbd_feature_update->($scfg, $storeid, $img_name); - my $cmd = $rbd_cmd->($scfg, $storeid, 'map', $name); + my @additional_options = (); + if ($scfg->{'krbd-map-options'}) { + @additional_options = ('--options', $scfg->{'krbd-map-options'}); + } + + my $cmd = $rbd_cmd->($scfg, $storeid, 'map', $name, @additional_options); run_rbd_command($cmd, errmsg => "can't map rbd volume $name"); return $kerneldev; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel