diff options
| author | Gaurav Kumar Garg <ggarg@redhat.com> | 2015-04-10 14:16:36 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-04-13 08:43:52 +0000 |
| commit | 1387bd92e8ada3a0e46d833997a14d35e810f0de (patch) | |
| tree | a27016f4114788731a1a061e0289608445f31fd2 /xlators/mgmt | |
| parent | 4e10fe52f88ad37b64a167afac1ab654e3016d5e (diff) | |
bitrot/glusterd: Scrubber should not crawl bricks if bitrot is not enable
If user create multiple volume and user enable bitrot only for few
volume then scrubber should not crawl bricks of volume on which bitrot
is not enable.
Fix is while volfile generation check whether bitrot is enable on that
particular volume or not. If bitrot is enable then only it add bricks of
that volume in scrubber volfile.
Change-Id: I53687c8e1acb39f8e4a712028b73f0b7006122b9
BUG: 1207547
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/10190
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Tested-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/mgmt')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index bbac2a2283b..ce63e4fc0a4 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1629,8 +1629,8 @@ brick_graph_add_changetimerecorder (volgen_graph_t *graph, goto out; bricknum = 0; - list_for_each_entry_safe (brickiter, tmp, &volinfo->bricks, - brick_list) { + cds_list_for_each_entry_safe (brickiter, tmp, &volinfo->bricks, + brick_list) { if (brickiter == brickinfo) break; bricknum++; @@ -4761,7 +4761,7 @@ build_bitd_graph (volgen_graph_t *graph, dict_t *mod_dict) if (mod_dict) dict_copy (mod_dict, set_dict); - list_for_each_entry (voliter, &priv->volumes, vol_list) { + cds_list_for_each_entry (voliter, &priv->volumes, vol_list) { if (voliter->status != GLUSTERD_STATUS_STARTED) continue; @@ -4775,7 +4775,8 @@ build_bitd_graph (volgen_graph_t *graph, dict_t *mod_dict) strcpy (transt, "tcp"); - list_for_each_entry (brickinfo, &voliter->bricks, brick_list) { + cds_list_for_each_entry (brickinfo, &voliter->bricks, + brick_list) { if (!glusterd_is_local_brick (this, voliter, brickinfo)) continue; xl = volgen_graph_build_client (graph, voliter, @@ -4854,10 +4855,13 @@ build_scrub_graph (volgen_graph_t *graph, dict_t *mod_dict) if (mod_dict) dict_copy (mod_dict, set_dict); - list_for_each_entry (voliter, &priv->volumes, vol_list) { + cds_list_for_each_entry (voliter, &priv->volumes, vol_list) { if (voliter->status != GLUSTERD_STATUS_STARTED) continue; + if (!glusterd_is_bitrot_enabled (voliter)) + continue; + memset (transt, '\0', 16); get_transport_type (voliter, set_dict, transt, _gf_false); @@ -4865,15 +4869,10 @@ build_scrub_graph (volgen_graph_t *graph, dict_t *mod_dict) strcpy (transt, "tcp"); - list_for_each_entry (brickinfo, &voliter->bricks, brick_list) { + cds_list_for_each_entry (brickinfo, &voliter->bricks, + brick_list) { if (!glusterd_is_local_brick (this, voliter, brickinfo)) continue; - /*To do: check whether bitd is enable or not if " - * "not then continue; - * Since bitd is a service running within the " - * trusted storage pool, it is treated as a trusted - * client. - */ xl = volgen_graph_build_client (graph, voliter, brickinfo->hostname, brickinfo->path, |