diff options
| author | Niels de Vos <ndevos@redhat.com> | 2014-06-06 12:45:12 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-06-09 00:27:07 -0700 |
| commit | 4215d071cec4fc8a62ca4fd6212d83f931838829 (patch) | |
| tree | 5820bfa6d6e9e3cb20ab4a94643faca62f3fc971 | |
| parent | 4e1ca1be6c26846e876d4181c9f2adea37856ded (diff) | |
gNFS: Make NFS DRC off by default
DRC in NFS causes memory bloat and there are known memory corruptions.
It would be good to disable drc by default till the feature is stable.
Change-Id: I93db6ef5298672c56fb117370bb582a5e5550b17
BUG: 1105524
Original-patch-by: Santosh Kumar Pradhan <spradhan@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/8004
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Santosh Pradhan <spradhan@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | rpc/rpc-lib/src/rpc-drc.c | 19 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 2 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs.c | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/rpc/rpc-lib/src/rpc-drc.c b/rpc/rpc-lib/src/rpc-drc.c index bc37324d391..5f54baf42e0 100644 --- a/rpc/rpc-lib/src/rpc-drc.c +++ b/rpc/rpc-lib/src/rpc-drc.c @@ -719,12 +719,12 @@ rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options) GF_ASSERT (options); /* Toggle DRC on/off, when more drc types(persistent/cluster) - are added, we shouldn't treat this as boolean */ - ret = dict_get_str_boolean (options, "nfs.drc", _gf_true); + * are added, we shouldn't treat this as boolean. */ + ret = dict_get_str_boolean (options, "nfs.drc", _gf_false); if (ret == -1) { gf_log (GF_RPCSVC, GF_LOG_INFO, "drc user options need second look"); - ret = _gf_true; + ret = _gf_false; } gf_log (GF_RPCSVC, GF_LOG_INFO, "DRC is turned %s", (ret?"ON":"OFF")); @@ -870,12 +870,12 @@ rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options) * case 2: DRC is "OFF" * ACTION: rpcsvc_drc_deinit() */ - ret = dict_get_str_boolean (options, "nfs.drc", _gf_true); - if (ret < 0) { - enable_drc = _gf_true; - } else { - enable_drc = ret; - } + ret = dict_get_str_boolean (options, "nfs.drc", _gf_false); + if (ret < 0) + ret = _gf_false; + + enable_drc = ret; + gf_log (GF_RPCSVC, GF_LOG_INFO, "DRC is turned %s", (ret?"ON":"OFF")); /* case 1: DRC is "ON"*/ if (enable_drc) { @@ -893,6 +893,5 @@ rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options) } /* case 2: DRC is "OFF" */ - gf_log (GF_RPCSVC, GF_LOG_INFO, "DRC is manually turned OFF"); return rpcsvc_drc_deinit (svc); } diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index fa4f88f9a06..664c37af9d6 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -3424,7 +3424,7 @@ build_nfs_graph (volgen_graph_t *graph, dict_t *mod_dict) if (ret) goto out; - ret = xlator_set_option (nfsxl, "nfs.drc", "on"); + ret = xlator_set_option (nfsxl, "nfs.drc", "off"); if (ret) goto out; diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index 7da66214af8..422b7fa6c12 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -1897,7 +1897,7 @@ struct volume_options options[] = { }, { .key = {"nfs.drc"}, .type = GF_OPTION_TYPE_STR, - .default_value = "on", + .default_value = "off", .description = "Enable Duplicate Request Cache in gNFS server to " "improve correctness of non-idempotent operations like " "write, delete, link, et al" |