diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2016-04-04 14:55:20 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-04-25 12:05:35 -0700 |
| commit | 0a43265f1b10c35506fe82a525aa0fa43af6c0cd (patch) | |
| tree | 42f27443ef5e4dc85b935cbfc1a8eb3f1d7a96b3 /xlators/mgmt/glusterd/src/glusterd-volgen.c | |
| parent | c3353cdc4a3bcea416953af0585a08f33c5d4639 (diff) | |
nsr/jbr: Renaming nsr to jbr
As per community consensus, we have decided to rename
nsr to jbr(Journal-Based-Replication). This is the patch
to rename the "nsr" code to "jbr"
Change-Id: Id2a9837f2ec4da89afc32438b91a1c302bb4104f
BUG: 1328043
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/13899
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 44b3e777490..62a4f31cd69 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1876,7 +1876,7 @@ add_one_peer (volgen_graph_t *graph, glusterd_brickinfo_t *peer, } int -add_nsr_stuff (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, +add_jbr_stuff (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, glusterd_brickinfo_t *brickinfo) { xlator_t *me; @@ -1886,8 +1886,8 @@ add_nsr_stuff (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, uint16_t index = 0; xlator_t *kid; - /* Create the NSR xlator, but defer linkage for now. */ - me = xlator_instantiate ("experimental/nsr", "%s-nsr", + /* Create the JBR xlator, but defer linkage for now. */ + me = xlator_instantiate ("experimental/jbr", "%s-jbr", volinfo->volname); if (!me || volgen_xlator_link(me, first_of(graph))) { return -1; @@ -1960,9 +1960,9 @@ brick_graph_add_index (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, if (!graph || !volinfo || !brickinfo || !set_dict) goto out; - /* For NSR we don't need/want index. */ - if (glusterd_volinfo_get_boolean(volinfo, "cluster.nsr") > 0) { - return add_nsr_stuff (graph, volinfo, brickinfo); + /* For JBR we don't need/want index. */ + if (glusterd_volinfo_get_boolean(volinfo, "cluster.jbr") > 0) { + return add_jbr_stuff (graph, volinfo, brickinfo); } xl = volgen_graph_add (graph, "features/index", volinfo->volname); @@ -3552,8 +3552,8 @@ volgen_graph_build_afr_clusters (volgen_graph_t *graph, char option[32] = {0}; int start_count = 0; - if (glusterd_volinfo_get_boolean(volinfo, "cluster.nsr") > 0) { - replicate_type = "experimental/nsrc"; + if (glusterd_volinfo_get_boolean(volinfo, "cluster.jbr") > 0) { + replicate_type = "experimental/jbrc"; } else { replicate_type = "cluster/replicate"; } @@ -5309,7 +5309,7 @@ assign_groups (glusterd_volinfo_t *volinfo) gf_uuid_generate(tmp_uuid); } brickinfo->group = group_num; - gf_uuid_copy(brickinfo->nsr_uuid, tmp_uuid); + gf_uuid_copy(brickinfo->jbr_uuid, tmp_uuid); if (++in_group >= volinfo->replica_count) { in_group = 0; ++group_num; @@ -5385,7 +5385,7 @@ generate_brick_volfiles (glusterd_volinfo_t *volinfo) } } - if (glusterd_volinfo_get_boolean(volinfo, "cluster.nsr") > 0) { + if (glusterd_volinfo_get_boolean(volinfo, "cluster.jbr") > 0) { assign_groups(volinfo); } |