Merge PR ceph#20855 into master

* refs/pull/20855/head: client: add the fuse parameter max_write Reviewed-by: Patrick Donnelly <[email protected]>
jeffrey4l · Apr 3, 2018 · 8b7892f · 8b7892f
2 parents 9d8037f + 8dbc5c9
commit 8b7892f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/doc/cephfs/client-config-ref.rst b/doc/cephfs/client-config-ref.rst
@@ -177,6 +177,12 @@
 :Type: Boolean
 :Default: ``true``
 
+``fuse max write``
+
+:Description: Set the maximum number of bytes in a single write operation.  Because the FUSE default is 128kbytes, SO fuse_max_write default set to 0(The default does not take effect)
+:Type: Integer
+:Default: ``0``
+
 Developer Options
 #################
 

diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc
@@ -1095,6 +1095,8 @@ int CephFuse::Handle::init(int argc, const char *argv[])
     "fuse_atomic_o_trunc");
   auto fuse_debug = client->cct->_conf->get_val<bool>(
     "fuse_debug");
+  auto fuse_max_write = client->cct->_conf->get_val<uint64_t>(
+    "fuse_max_write");
 
   if (fuse_allow_other) {
     newargv[newargc++] = "-o";
@@ -1109,6 +1111,13 @@ int CephFuse::Handle::init(int argc, const char *argv[])
     newargv[newargc++] = "-o";
     newargv[newargc++] = "big_writes";
   }
+  if (fuse_max_write > 0) {
+    char strsplice[65];
+    newargv[newargc++] = "-o";
+    newargv[newargc++] = strsplice;
+    sprintf(strsplice, "max_write=%" PRIu64, fuse_max_write);
+    newargv[newargc++] = strsplice;
+  }
   if (fuse_atomic_o_trunc) {
     newargv[newargc++] = "-o";
     newargv[newargc++] = "atomic_o_trunc";

diff --git a/src/common/options.cc b/src/common/options.cc
@@ -7071,6 +7071,10 @@ std::vector<Option> get_mds_client_options() {
     .set_default(false)
     .set_description("big_writes is deprecated in libfuse 3.0.0"),
 
+    Option("fuse_max_write", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    .set_default(0)
+    .set_description("Set the maximum number of bytes in a single write operation.  Because the FUSE default is 128kbytes, SO fuse_max_write default set to 0(The default does not take effect)"),
+
     Option("fuse_atomic_o_trunc", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .set_description(""),