summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorAvra Sengupta <asengupt@redhat.com>2016-04-04 14:55:20 +0530
committerJeff Darcy <jdarcy@redhat.com>2016-04-25 12:05:35 -0700
commit0a43265f1b10c35506fe82a525aa0fa43af6c0cd (patch)
tree42f27443ef5e4dc85b935cbfc1a8eb3f1d7a96b3 /xlators/mgmt
parentc3353cdc4a3bcea416953af0585a08f33c5d4639 (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')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c20
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c12
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.h4
3 files changed, 18 insertions, 18 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);
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index ecec57b4159..40323bb7ece 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -2735,15 +2735,15 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.op_version = GD_OP_VERSION_3_7_6,
.flags = OPT_FLAG_CLIENT_OPT
},
- { .key = "cluster.nsr",
- .voltype = "experimental/nsr",
- .option = "!nsr",
+ { .key = "cluster.jbr",
+ .voltype = "experimental/jbr",
+ .option = "!jbr",
.op_version = GD_OP_VERSION_4_0_0,
- .description = "enable NSR instead of AFR for replication",
+ .description = "enable JBR instead of AFR for replication",
.flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT
},
- { .key = "cluster.nsr.quorum-percent",
- .voltype = "experimental/nsr",
+ { .key = "cluster.jbr.quorum-percent",
+ .voltype = "experimental/jbr",
.option = "quorum-percent",
.op_version = GD_OP_VERSION_4_0_0,
.description = "percent of rep_count-1 bricks that must be up"
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h
index 34e3e19d32c..587c2e82774 100644
--- a/xlators/mgmt/glusterd/src/glusterd.h
+++ b/xlators/mgmt/glusterd/src/glusterd.h
@@ -210,13 +210,13 @@ struct glusterd_brickinfo {
int32_t snap_status;
/*
* The group is used to identify which bricks are part of the same
- * replica set during brick-volfile generation, so that NSR volfiles
+ * replica set during brick-volfile generation, so that JBR volfiles
* can "cross-connect" the bricks to one another. It is also used by
* AFR to load the arbiter xlator in the appropriate brick in case of
* a replica 3 volume with arbiter enabled.
*/
uint16_t group;
- uuid_t nsr_uuid;
+ uuid_t jbr_uuid;
};
typedef struct glusterd_brickinfo glusterd_brickinfo_t;