From 50b93f72f9a3f5bfd1d610801aecb06823adaa63 Mon Sep 17 00:00:00 2001 From: Sakshi Bansal Date: Thu, 31 Mar 2016 15:02:03 +0530 Subject: NFS: new option nfs.rdirplus added When this option is 'disabled', NFS falls back to standard readdir instead of readdirp Change-Id: Icaaf4da6533bee56160d4a81e42bb60f7d341945 BUG: 1302948 Signed-off-by: Sakshi Bansal Reviewed-on: http://review.gluster.org/13782 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- xlators/nfs/server/src/nfs.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'xlators/nfs/server/src/nfs.c') diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index 116854b9109..66bd69d2b4f 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -1073,6 +1073,9 @@ nfs_init_state (xlator_t *this) goto free_foppool; } } + + GF_OPTION_INIT ("nfs.rdirplus", nfs->rdirplus, bool, free_foppool); + GF_OPTION_INIT (OPT_SERVER_RPC_STATD, nfs->rpc_statd, path, free_foppool); GF_OPTION_INIT (OPT_SERVER_RPC_STATD_PIDFILE, nfs->rpc_statd_pid_file, path, free_foppool); @@ -1285,6 +1288,14 @@ nfs_reconfigure_state (xlator_t *this, dict_t *options) OPT_SERVER_GID_CACHE_TIMEOUT, optuint32); } + GF_OPTION_RECONF ("nfs.rdirplus", optbool, + options, bool, out); + if (nfs->rdirplus != optbool) { + nfs->rdirplus = optbool; + gf_msg (GF_NFS, GF_LOG_INFO, 0, NFS_MSG_RECONFIG_VALUE, + "Reconfigured nfs.rdirplus with value %d", optbool); + } + /* reconfig nfs.dynamic-volumes */ ret = dict_get_str_boolean (options, "nfs.dynamic-volumes", GF_NFS_DVM_OFF); @@ -2081,6 +2092,12 @@ struct volume_options options[] = { .description = "Sets the TTL of an entry in the auth cache. Value is " "in seconds." }, + { .key = {"nfs.rdirplus"}, + .type = GF_OPTION_TYPE_BOOL, + .default_value = "on", + .description = "When this option is set to off NFS falls back to " + "standard readdir instead of readdirp" + }, { .key = {NULL} }, }; -- cgit