]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_fuse: enable fuse_debug when the '-d' option is specified 35398/head
authorXiubo Li <xiubli@redhat.com>
Mon, 25 May 2020 01:05:42 +0000 (21:05 -0400)
committerNathan Cutler <ncutler@suse.com>
Thu, 4 Jun 2020 13:56:07 +0000 (15:56 +0200)
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)

src/common/config.cc
src/common/options.cc

index 8024d433bf6a6a77784a083213bcbdc55fb86c4d..8816512cd6ce3b5c059d1ff7d340c8508c1b78c3 100644 (file)
@@ -661,6 +661,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");
index e490cb3703a1c8d0f5b178209f1d9efc0a2f0687..2f04ba5a91bdf29a303f430b82d20d8d2e7c1c8c 100644 (file)
@@ -8376,9 +8376,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)