[pve-devel] [PATCH V2 storage 0/2] cifs plugin - add options parameter

[pve-devel] [PATCH V2 storage 0/2] cifs plugin - add options parameter

[Stefan Hrdlicka]

V1 -> V2:
# pve-storage (1/2)
* fixed nitpicks

# pve-docs (2/2)
* extended options explanation
* changed example option to `echo_interval=60` as second parameter

Stefan Hrdlicka (1):
  fixes #2920: add options parameter to cifs plugin

 PVE/Storage/CIFSPlugin.pm | 16 +++++++++++++---
 PVE/Storage/NFSPlugin.pm  |  4 ----
 PVE/Storage/Plugin.pm     |  6 ++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

-- 
2.30.2

[pve-devel] [PATCH V2 storage 1/2] fix #2920: add options parameter to cifs plugin

[Stefan Hrdlicka]

this makes it possible to add all mount options offered by mount.cifs
NFS & CIFS now share the options parameter since the use it for
the same prupose

Signed-off-by: Stefan Hrdlicka <s.hrdlicka@proxmox.com>

Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/Storage/CIFSPlugin.pm | 16 +++++++++++++---
 PVE/Storage/NFSPlugin.pm  |  4 ----
 PVE/Storage/Plugin.pm     |  6 ++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm
index 982040a..62fa6d2 100644
--- a/PVE/Storage/CIFSPlugin.pm
+++ b/PVE/Storage/CIFSPlugin.pm
@@ -64,7 +64,7 @@ sub get_cred_file {
 }
 
 sub cifs_mount {
-    my ($server, $share, $mountpoint, $storeid, $smbver, $user, $domain) = @_;
+    my ($server, $share, $mountpoint, $storeid, $smbver, $user, $domain, $options) = @_;
 
     $server = "[$server]" if Net::IP::ip_is_ipv6($server);
     my $source = "//${server}/$share";
@@ -79,6 +79,7 @@ sub cifs_mount {
     }
 
     push @$cmd, '-o', defined($smbver) ? "vers=$smbver" : "vers=default";
+    push @$cmd, '-o', $options if $options;
 
     run_command($cmd, errmsg => "mount error");
 }
@@ -144,6 +145,7 @@ sub options {
 	mkdir => { optional => 1 },
 	bwlimit => { optional => 1 },
 	preallocation => { optional => 1 },
+	options => { optional => 1 },
     };
 }
 
@@ -231,8 +233,16 @@ sub activate_storage {
 	die "unable to activate storage '$storeid' - " .
 	    "directory '$path' does not exist\n" if ! -d $path;
 
-	cifs_mount($server, $share, $path, $storeid, $scfg->{smbversion},
-	    $scfg->{username}, $scfg->{domain});
+	cifs_mount(
+	    $server,
+	    $share,
+	    $path,
+	    $storeid,
+	    $scfg->{smbversion},
+	    $scfg->{username},
+	    $scfg->{domain},
+	    $scfg->{options}
+	);
     }
 
     $class->SUPER::activate_storage($storeid, $scfg, $cache);
diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm
index 5bd7313..f777483 100644
--- a/PVE/Storage/NFSPlugin.pm
+++ b/PVE/Storage/NFSPlugin.pm
@@ -69,10 +69,6 @@ sub properties {
 	    description => "Server IP or DNS name.",
 	    type => 'string', format => 'pve-storage-server',
 	},
-	options => {
-	    description => "NFS mount options (see 'man nfs')",
-	    type => 'string',  format => 'pve-storage-options',
-	},
     };
 }
 
diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 8a41df1..5029560 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -181,6 +181,12 @@ my $defaultData = {
 	    default => 'metadata',
 	    optional => 1,
 	},
+	options => {
+	    description => "NFS/CIFS mount options (see 'man nfs' " .
+		"or 'man mount.cifs')",
+	    type => 'string',  format => 'pve-storage-options',
+	    optional => 1,
+	},
     },
 };
 
-- 
2.30.2

[pve-devel] [PATCH V2 docs 2/2] fix #2920: add cifs options parameter

[Stefan Hrdlicka]

Signed-off-by: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
---
 pve-storage-cifs.adoc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pve-storage-cifs.adoc b/pve-storage-cifs.adoc
index bb4b902..a8fc350 100644
--- a/pve-storage-cifs.adoc
+++ b/pve-storage-cifs.adoc
@@ -57,6 +57,13 @@ path::
 
 The local mount point. Optional, defaults to `/mnt/pve/<STORAGE_ID>/`.
 
+options::
+
+Additional CIFS mount options (see `man mount.cifs`). Some options are set
+automatically and shouldn't be set here. PVE will always set the option `soft`.
+Depending on the configuration these options are set automatically:
+`username`, `credentials`, `guest`, `domain`, `vers`.
+
 .Configuration Example (`/etc/pve/storage.cfg`)
 ----
 cifs: backup
@@ -64,6 +71,7 @@ cifs: backup
 	server 10.0.0.11
 	share VMData
 	content backup
+	options noserverino,echo_interval=30
 	username anna
 	smbversion 3
 
-- 
2.30.2