diff options
| author | Gaurav Kumar Garg <garg.gaurav52@gmail.com> | 2015-11-25 17:38:43 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-12-17 19:29:00 -0800 |
| commit | 530533fe44f08f30d1230c65db0054be7c6d3281 (patch) | |
| tree | f28c4122cb9a18d8fb55df6a91495987bbbda146 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 459314829691e3cb0c31f4971111d7dadfb199d8 (diff) | |
bitrot: getting correct value of scrub stat's
This patch is backport of: http://review.gluster.org/#/c/12776/
When user execute bitrot scrub status command then gluster
is not giving correct value of Number of Scrubbed files,
Number of Unsigned files, Last completed scrub time,
Duration of last scrub.
With this patch scrub status will give correct value for
all the above fields.
>> Change-Id: Ic966f76d22db5b0c889e6386a1c2219afbda1f49
>> BUG: 1285989
>> Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
>> Signed-off-by: Kotresh HR <khiremat@redhat.com>
>> Reviewed-on: http://review.gluster.org/12776
>> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>> Tested-by: Gluster Build System <jenkins@build.gluster.com>
>> Reviewed-by: Venky Shankar <vshankar@redhat.com>
Change-Id: Ic966f76d22db5b0c889e6386a1c2219afbda1f49
BUG: 1291546
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
(cherry picked from commit 22827d51c232c44a8f5ac003529d907d93baf7b0)
Change-Id: Icef24cce35c8d54ffdfa5282491338318e78780b
Reviewed-on: http://review.gluster.org/12966
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index c373229788b..c9457e89b45 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -8304,7 +8304,8 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) uint64_t scrubbed_files = 0; uint64_t unsigned_files = 0; uint64_t scrub_duration = 0; - uint64_t last_scrub_time = 0; + char *last_scrub_time = NULL; + char *scrub_time = NULL; char *volname = NULL; char *node_uuid = NULL; char *node_uuid_str = NULL; @@ -8396,11 +8397,12 @@ glusterd_volume_bitrot_scrub_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) memset (key, 0, 256); snprintf (key, 256, "last-scrub-time-%d", src_count); - ret = dict_get_uint64 (rsp_dict, key, &value); + ret = dict_get_str (rsp_dict, key, &last_scrub_time); if (!ret) { + scrub_time = gf_strdup (last_scrub_time); memset (key, 0, 256); snprintf (key, 256, "last-scrub-time-%d", src_count+dst_count); - ret = dict_set_uint64 (aggr, key, value); + ret = dict_set_dynstr (aggr, key, scrub_time); if (ret) { gf_msg_debug (this->name, 0, "Failed to set " "last scrub time value"); @@ -8522,7 +8524,8 @@ glusterd_bitrot_volume_node_rsp (dict_t *aggr, dict_t *rsp_dict) uint64_t scrubbed_files = 0; uint64_t unsigned_files = 0; uint64_t scrub_duration = 0; - uint64_t last_scrub_time = 0; + char *last_scrub_time = NULL; + char *scrub_time = NULL; char *volname = NULL; char *node_str = NULL; char *scrub_freq = NULL; @@ -8663,11 +8666,13 @@ glusterd_bitrot_volume_node_rsp (dict_t *aggr, dict_t *rsp_dict) } } - ret = dict_get_uint64 (rsp_dict, "last-scrub-time", &value); + ret = dict_get_str (rsp_dict, "last-scrub-time", &last_scrub_time); if (!ret) { memset (key, 0, 256); snprintf (key, 256, "last-scrub-time-%d", i); - ret = dict_set_uint64 (aggr, key, value); + + scrub_time = gf_strdup (last_scrub_time); + ret = dict_set_dynstr (aggr, key, scrub_time); if (ret) { gf_msg_debug (this->name, 0, "Failed to set " "last scrub time value"); |