ceph-fuse: load supplementary groups by default

Partially addresses POSIX test failures in [1] due to the config setting being
false by default.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1480182#c6

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 08b077338cba1250c36232f91c708d189326bbb6)

diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc
index d10f7b8143a282251bf8310f36b4071c7fe133ee..d24ad5c3451a14a5211988510e313af7efd06589 100644 (file)
--- a/src/client/fuse_ll.cc
+++ b/src/client/fuse_ll.cc
@@ -135,7 +135,7 @@ static int getgroups_cb(void *handle, gid_t **sgids)
 }
 
 #define GET_GROUPS(perms, req) {                               \
-  if (cfuse->client->cct->_conf->fuse_set_user_groups) {       \
+  if (g_conf->get_val<bool>("fuse_set_user_groups")) { \
     gid_t *gids = NULL;                                                \
     int count = getgroups(req, &gids);                         \
     perms.init_gids(gids, count);                              \

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index c65b52acb6061a4264cf237bbc080f184a09634f..e802fa05508a031045c5bdc9011ae000ec18a6d3 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -403,7 +403,6 @@ OPTION(fuse_debug, OPT_BOOL)
 OPTION(fuse_multithreaded, OPT_BOOL)
 OPTION(fuse_require_active_mds, OPT_BOOL) // if ceph_fuse requires active mds server
 OPTION(fuse_syncfs_on_mksnap, OPT_BOOL)
-OPTION(fuse_set_user_groups, OPT_BOOL) // if ceph_fuse fills in group lists or not
 
 OPTION(client_try_dentry_invalidate, OPT_BOOL) // the client should try to use dentry invaldation instead of remounting, on kernels it believes that will work for
 OPTION(client_die_on_failed_remount, OPT_BOOL)

diff --git a/src/common/options.cc b/src/common/options.cc
index 6166ef3f8d50b5515f7308756faf3b27e97190ba..0cd24befa27711514d148a8cacd886eb14c82d7e 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5899,8 +5899,8 @@ std::vector<Option> get_mds_client_options() {
     .set_description(""),
 
     Option("fuse_set_user_groups", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(false)
-    .set_description(""),
+    .set_default(true)
+    .set_description("check for ceph-fuse to consider supplementary groups for permissions"),
 
     Option("client_try_dentry_invalidate", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)