diff options
| author | Kotresh HR <khiremat@redhat.com> | 2016-04-20 23:49:39 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2016-05-01 21:21:10 -0700 |
| commit | 3c01660f63a32e53395e9af13f33ee5439932cdf (patch) | |
| tree | 4b8ef33c648f6d7d90e4fdf886c2a62b154a4552 /xlators | |
| parent | 60e340481ad5496e920722e8267572fa26cf2822 (diff) | |
glusterd/bitrot: Fix bit-rot scrub status
Few of the dictionary values were not allocated and
set. This patch allocates them and set.
Change-Id: Ic61c1209b238e45219793fd8bec92235adfbd013
BUG: 1329211
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/14120
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 68208312acb..5f04cba15db 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -8618,7 +8618,6 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, key, &node_uuid); if (!ret) { node_uuid_str = gf_strdup (node_uuid); - memset (key, 0, 256); snprintf (key, 256, "node-uuid-%d", src_count+dst_count); ret = dict_set_dynstr (aggr, key, node_uuid_str); @@ -8713,7 +8712,8 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, "bitrot_log_file", &bitd_log); if (!ret) { - ret = dict_set_str (aggr, "bitrot_log_file", bitd_log); + ret = dict_set_dynstr_with_alloc (aggr, "bitrot_log_file", + bitd_log); if (ret) { gf_msg_debug (this->name, 0, "Failed to set " "bitrot log file location"); @@ -8723,7 +8723,8 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, "scrub_log_file", &scrub_log); if (!ret) { - ret = dict_set_str (aggr, "scrub_log_file", scrub_log); + ret = dict_set_dynstr_with_alloc (aggr, "scrub_log_file", + scrub_log); if (ret) { gf_msg_debug (this->name, 0, "Failed to set " "scrubber log file location"); @@ -8733,7 +8734,8 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, "features.scrub-freq", &scrub_freq); if (!ret) { - ret = dict_set_str (aggr, "features.scrub-freq", scrub_freq); + ret = dict_set_dynstr_with_alloc (aggr, "features.scrub-freq", + scrub_freq); if (ret) { gf_msg_debug (this->name, 0, "Failed to set " "scrub-frequency value to dictionary"); @@ -8743,8 +8745,9 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, "features.scrub-throttle", &scrub_impact); if (!ret) { - ret = dict_set_str (aggr, "features.scrub-throttle", - scrub_impact); + ret = dict_set_dynstr_with_alloc (aggr, + "features.scrub-throttle", + scrub_impact); if (ret) { gf_msg_debug (this->name, 0, "Failed to set " "scrub-throttle value to dictionary"); @@ -8754,7 +8757,8 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, "features.scrub", &scrub_state); if (!ret) { - ret = dict_set_str (aggr, "features.scrub", scrub_state); + ret = dict_set_dynstr_with_alloc (aggr, "features.scrub", + scrub_state); if (ret) { gf_msg_debug (this->name, 0, "Failed to set " "scrub state value to dictionary"); |