The branch, v4-12-test has been updated
via ecdddde3c53 vfs_glusterfs: print exact cmdline for disabling
write-behind translator
via 9bcd19c42ae manpages/vfs_glusterfs: Mention silent skipping of
write-behind translator
from b3665f70109 vfs_shadow_copy2: Preserve all open flags assuming ROFS
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-test
- Log -----------------------------------------------------------------
commit ecdddde3c5387ec3749d9758a7191b9ff9bc91d8
Author: Günther Deschner <[email protected]>
Date: Tue Nov 24 15:38:41 2020 +0100
vfs_glusterfs: print exact cmdline for disabling write-behind translator
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14486
Guenther
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Fri Nov 27 17:15:07 UTC 2020 on sn-devel-184
(cherry picked from commit 369c1d539837b70e94fe9d533d44860c8a9380a1)
Autobuild-User(v4-12-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-12-test): Wed Dec 2 17:35:21 UTC 2020 on sn-devel-184
commit 9bcd19c42aee884f79f19128bbf0293ad0da1fb6
Author: Anoop C S <[email protected]>
Date: Thu Nov 5 16:12:09 2020 +0530
manpages/vfs_glusterfs: Mention silent skipping of write-behind translator
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14486
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Mon Nov 9 13:30:06 UTC 2020 on sn-devel-184
(cherry picked from commit be03ce7d8bb213633eedcfc3299b8d9865a3c67f)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_glusterfs.8.xml | 9 +++++++++
source3/modules/vfs_glusterfs.c | 7 +++++--
2 files changed, 14 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml
b/docs-xml/manpages/vfs_glusterfs.8.xml
index 7a4da1af919..d25135e14ac 100644
--- a/docs-xml/manpages/vfs_glusterfs.8.xml
+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
@@ -179,7 +179,16 @@
translator and refuse to connect if detected.
Please disable the write-behind translator for the GlusterFS
volume to allow the plugin to connect to the volume.
+ The write-behind translator can easily be disabled via calling
+ <programlisting>
+ gluster volume set <volumename>
performance.write-behind off
+ </programlisting> on the commandline.
</para>
+ <para>
+ With GlusterFS versions >= 9, we silently bypass write-behind
+ translator during initial connect and failure is avoided.
+ </para>
+
</refsect1>
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index c338674ac3c..ee73512e31b 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -345,9 +345,12 @@ static int check_for_write_behind_translator(TALLOC_CTX
*mem_ctx,
if (write_behind_present) {
DBG_ERR("Write behind translator is enabled for "
"volume (%s), refusing to connect! "
- "Please check the vfs_glusterfs(8) manpage for "
+ "Please turn off the write behind translator by calling
"
+ "'gluster volume set %s performance.write-behind off' "
+ "on the commandline. "
+ "Check the vfs_glusterfs(8) manpage for "
"further details.\n",
- volume);
+ volume, volume);
return -1;
}
--
Samba Shared Repository
