From: Xiubo Li <xiubli@redhat.com>
Date: Mon, 25 May 2020 01:05:42 +0000 (-0400)
Subject: ceph_fuse: enable fuse_debug when the '-d' option is specified
X-Git-Tag: v15.2.4~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd3fa6a75fec386ea90075df3ae0707bb1cef522;p=ceph.git

ceph_fuse: enable fuse_debug when the '-d' option is specified

The global_init() will check and remove the -d option, but it should
enable the libfuse debug mode.

Fixes: https://tracker.ceph.com/issues/45524
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 818f56b0da249311c4950406b11c0f97faa86789)
---

diff --git a/src/common/config.cc b/src/common/config.cc
index eb6b721e12e3..dd4958d401cb 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -659,6 +659,7 @@ int md_config_t::parse_argv(ConfigValues& values,
       set_val_or_die(values, tracker, "daemonize", "false");
     }
     else if (ceph_argparse_flag(args, i, "-d", (char*)NULL)) {
+      set_val_or_die(values, tracker, "fuse_debug", "true");
       set_val_or_die(values, tracker, "daemonize", "false");
       set_val_or_die(values, tracker, "log_file", "");
       set_val_or_die(values, tracker, "log_to_stderr", "true");
diff --git a/src/common/options.cc b/src/common/options.cc
index f44c03f6c3b2..01e423acdc88 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -8336,9 +8336,11 @@ std::vector<Option> get_mds_client_options() {
     .set_default(true)
     .set_description("pass atomic_o_trunc flag to FUSE on mount"),
 
-    Option("fuse_debug", Option::TYPE_BOOL, Option::LEVEL_DEV)
+    Option("fuse_debug", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)
-    .set_description(""),
+    .set_flag(Option::FLAG_STARTUP)
+    .set_flag(Option::FLAG_NO_MON_UPDATE)
+    .set_description("enable debugging for the libfuse"),
 
     Option("fuse_multithreaded", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)