From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 9B23F1FF16F for ; Fri, 15 Nov 2024 15:01:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BEDF1563B; Fri, 15 Nov 2024 15:01:31 +0100 (CET) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Fri, 15 Nov 2024 15:00:27 +0100 Message-Id: <20241115140037.191682-3-m.frank@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241115140037.191682-1-m.frank@proxmox.com> References: <20241115140037.191682-1-m.frank@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.023 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 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. [storagetunnel.pm, dir.pm, pci.pm, tunnel.pm, usb.pm] Subject: [pve-devel] [PATCH guest-common v12 2/12] add dir mapping section config 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" Adds a config file for directories by using a 'map' property string for each node mapping. Next to node & path, there is the optional submounts parameter in the map property string that is used to announce other mounted file systems in the specified directory. Additionally there are the default settings for xattr & acl. example config: ``` some-dir-id map node=node1,path=/mnt/share/,submounts=1 map node=node2,path=/mnt/share/, xattr 1 acl 1 ``` Signed-off-by: Markus Frank --- src/Makefile | 1 + src/PVE/Mapping/Dir.pm | 204 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+) create mode 100644 src/PVE/Mapping/Dir.pm diff --git a/src/Makefile b/src/Makefile index cbc40c1..030e7f7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,6 +15,7 @@ install: PVE install -m 0644 PVE/StorageTunnel.pm ${PERL5DIR}/PVE/ install -m 0644 PVE/Tunnel.pm ${PERL5DIR}/PVE/ install -d ${PERL5DIR}/PVE/Mapping + install -m 0644 PVE/Mapping/Dir.pm ${PERL5DIR}/PVE/Mapping/ install -m 0644 PVE/Mapping/PCI.pm ${PERL5DIR}/PVE/Mapping/ install -m 0644 PVE/Mapping/USB.pm ${PERL5DIR}/PVE/Mapping/ install -d ${PERL5DIR}/PVE/VZDump diff --git a/src/PVE/Mapping/Dir.pm b/src/PVE/Mapping/Dir.pm new file mode 100644 index 0000000..6a343b1 --- /dev/null +++ b/src/PVE/Mapping/Dir.pm @@ -0,0 +1,204 @@ +package PVE::Mapping::Dir; + +use strict; +use warnings; + +use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_lock_file cfs_write_file); +use PVE::INotify; +use PVE::JSONSchema qw(get_standard_option parse_property_string); +use PVE::SectionConfig; + +use base qw(PVE::SectionConfig); + +my $FILENAME = 'mapping/dir.cfg'; + +cfs_register_file($FILENAME, + sub { __PACKAGE__->parse_config(@_); }, + sub { __PACKAGE__->write_config(@_); }); + + +# so we don't have to repeat the type every time +sub parse_section_header { + my ($class, $line) = @_; + + if ($line =~ m/^(\S+)\s*$/) { + my $id = $1; + my $errmsg = undef; # set if you want to skip whole section + eval { PVE::JSONSchema::pve_verify_configid($id) }; + $errmsg = $@ if $@; + my $config = {}; # to return additional attributes + return ('dir', $id, $errmsg, $config); + } + return undef; +} + +sub format_section_header { + my ($class, $type, $sectionId, $scfg, $done_hash) = @_; + + return "$sectionId\n"; +} + +sub type { + return 'dir'; +} + +my $map_fmt = { + node => get_standard_option('pve-node'), + path => { + description => "Absolute directory path that should be shared with the guest.", + type => 'string', + format => 'pve-storage-path', + }, + submounts => { + type => 'boolean', + description => "Announce that the directory contains other mounted" + ." file systems. If this is not set and multiple file systems are" + ." mounted, the guest may encounter duplicates due to file system" + ." specific inode IDs.", + optional => 1, + default => 1, + }, + description => { + description => "Description of the node specific directory.", + type => 'string', + optional => 1, + maxLength => 4096, + }, +}; + +my $defaultData = { + propertyList => { + id => { + type => 'string', + description => "The ID of the directory", + format => 'pve-configid', + }, + description => { + description => "Description of the directory", + type => 'string', + optional => 1, + maxLength => 4096, + }, + map => { + type => 'array', + description => 'A list of maps for the cluster nodes.', + optional => 1, + items => { + type => 'string', + format => $map_fmt, + }, + }, + xattr => { + type => 'boolean', + description => "Enable support for extended attributes." + ." If not supported by Guest OS or file system, this option is" + ." simply ignored.", + optional => 1, + default => 0, + }, + acl => { + type => 'boolean', + description => "Enable support for POSIX ACLs (implies --xattr)." + ." The guest OS has to support ACLs. When used in a directory" + ." with a file system without ACL support, the ACLs are ignored.", + optional => 1, + default => 0, + }, + }, +}; + +sub private { + return $defaultData; +} + +sub map_fmt { + return $map_fmt; +} + +sub options { + return { + description => { optional => 1 }, + map => {}, + xattr => { optional => 1 }, + acl => { optional => 1 }, + }; +} + +sub assert_valid { + my ($dir_cfg) = @_; + + my $path = $dir_cfg->{path}; + + if (! -e $path) { + die "Path $path does not exist\n"; + } elsif (! -d $path) { + die "Path $path exists, but is not a directory\n"; + } + + return 1; +}; + +sub assert_no_duplicate_node { + my ($map_list) = @_; + + my %count; + for my $map (@$map_list) { + my $entry = parse_property_string($map_fmt, $map); + $count{$entry->{node}}++; + } + for my $node (keys %count) { + if ($count{$node} > 1) { + die "Node '$node' is specified $count{$node} times.\n"; + } + } +} + +sub config { + return cfs_read_file($FILENAME); +} + +sub lock_dir_config { + my ($code, $errmsg) = @_; + + cfs_lock_file($FILENAME, undef, $code); + if (my $err = $@) { + $errmsg ? die "$errmsg: $err" : die $err; + } +} + +sub write_dir_config { + my ($cfg) = @_; + + cfs_write_file($FILENAME, $cfg); +} + +sub find_on_current_node { + my ($id) = @_; + + my $cfg = config(); + my $node = PVE::INotify::nodename(); + + return get_node_mapping($cfg, $id, $node); +} + +sub get_node_mapping { + my ($cfg, $id, $nodename) = @_; + + return undef if !defined($cfg->{ids}->{$id}); + + my $res = []; + my $mapping_list = $cfg->{ids}->{$id}->{map}; + for my $map (@{$mapping_list}) { + my $entry = eval { parse_property_string($map_fmt, $map) }; + warn $@ if $@; + if ($entry && $entry->{node} eq $nodename) { + push $res->@*, $entry; + } + } + return $res; +} + +PVE::Mapping::Dir->register(); +PVE::Mapping::Dir->init(); + +1; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel