diff options
author | Poornima G <pgurusid@redhat.com> | 2017-01-17 17:45:59 +0530 |
---|---|---|
committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-01-27 09:02:59 -0500 |
commit | 6ebbfb67315ae9abc4058775d3b48d5abfe306d5 (patch) | |
tree | ab93badb4608368d6653586b49e392dd13541756 /xlators/mgmt/glusterd/src/glusterd-volgen.c | |
parent | c1cafe6e314f01d3f07229c0972af5f1017c62cf (diff) |
glusterd, rda: If parallel readdir is enabled, split the cache limit
With patch http://review.gluster.org/#/c/16072/ readdir-ahead can be
loaded as a child of dht. i.e. there can be more than one instance
of readdir-ahead in client process. In this case the rda-cache-size
should be split among all the readdir-ahead instances. Also the
value of rda-request-size is considered as the minimum cache size
of any readdir-ahead instance.
>Change-Id: Iea2fe6d4c46adc09dd2e9a252332a0fe3005f2b9
>BUG: 1401812
>Signed-off-by: Poornima G <pgurusid@redhat.com>
>Reviewed-on: https://review.gluster.org/16424
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Kaushal M <kaushal@redhat.com>
>Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Change-Id: Iea2fe6d4c46adc09dd2e9a252332a0fe3005f2b9
BUG: 1417028
Signed-off-by: Poornima G <pgurusid@redhat.com>
(cherry picked from commit f245dc568e3c22882e22ddd3e26a4207f5704e3b)
Reviewed-on: https://review.gluster.org/16459
Tested-by: Raghavendra G <rgowdapp@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 76 |
1 files changed, 74 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 144bd5a4d57..f5ddef4755d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -3774,18 +3774,90 @@ out: return ret; } +static int +client_graph_set_rda_options (volgen_graph_t *graph, + glusterd_volinfo_t *volinfo, + dict_t *set_dict) +{ + char *rda_cache_s = NULL; + int32_t ret = 0; + uint64_t rda_cache_size = 0; + char *rda_req_s = NULL; + uint64_t rda_req_size = 0; + uint64_t new_cache_size = 0; + char new_cache_size_str[50] = {0,}; + char new_req_size_str[50] = {0,}; + int dist_count = 0; + + dist_count = volinfo->brick_count / volinfo->dist_leaf_count; + if (dist_count <= 1) + goto out; + + if (graph->type == GF_REBALANCED || + graph->type == GF_QUOTAD || + graph->type == GF_SNAPD || + !glusterd_volinfo_get_boolean (volinfo, VKEY_PARALLEL_READDIR) || + !glusterd_volinfo_get_boolean (volinfo, VKEY_READDIR_AHEAD)) + goto out; + + ret = glusterd_volinfo_get (volinfo, VKEY_RDA_CACHE_LIMIT, &rda_cache_s); + if (ret < 0) + goto out; + + gf_string2bytesize_uint64 (rda_cache_s, &rda_cache_size); + + ret = glusterd_volinfo_get (volinfo, VKEY_RDA_REQUEST_SIZE, &rda_req_s); + if (ret < 0) + goto out; + + gf_string2bytesize_uint64 (rda_req_s, &rda_req_size); + + new_cache_size = rda_cache_size / dist_count; + if (new_cache_size < rda_req_size) { + if (new_cache_size < 4 * 1024) + new_cache_size = rda_req_size = 4 * 1024; + else + rda_req_size = new_cache_size; + + snprintf (new_req_size_str, sizeof (new_req_size_str), + "%ld%s", rda_req_size, "B"); + ret = dict_set_dynstr_with_alloc (set_dict, + VKEY_RDA_REQUEST_SIZE, + new_req_size_str); + if (ret < 0) + goto out; + } + + snprintf (new_cache_size_str, sizeof (new_cache_size_str), + "%ld%s", new_cache_size, "B"); + ret = dict_set_dynstr_with_alloc (set_dict, + VKEY_RDA_CACHE_LIMIT, + new_cache_size_str); + if (ret < 0) + goto out; + +out: + return ret; +} + + static int client_graph_set_perf_options(volgen_graph_t *graph, glusterd_volinfo_t *volinfo, dict_t *set_dict) { - data_t *tmp_data = NULL; - char *volname = NULL; + data_t *tmp_data = NULL; + char *volname = NULL; + int ret = 0; /* * Logic to make sure NFS doesn't have performance translators by * default for a volume */ volname = volinfo->volname; + ret = client_graph_set_rda_options (graph, volinfo, set_dict); + if (ret < 0) + return ret; + tmp_data = dict_get (set_dict, "nfs-volume-file"); if (!tmp_data) return volgen_graph_set_options_generic(graph, set_dict, |