summaryrefslogtreecommitdiffstats
path: root/tests
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 /tests
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 'tests')
-rw-r--r--tests/basic/ec/ec.t2
-rw-r--r--tests/basic/jbr/jbr-volgen.t (renamed from tests/basic/nsr/nsr-volgen.t)8
-rwxr-xr-xtests/basic/jbr/jbr.t (renamed from tests/basic/nsr/nsr.t)4
-rw-r--r--tests/volume.rc6
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/basic/ec/ec.t b/tests/basic/ec/ec.t
index f98f2110e8f..a6ae287b7a7 100644
--- a/tests/basic/ec/ec.t
+++ b/tests/basic/ec/ec.t
@@ -12,7 +12,7 @@ function my_getfattr {
}
function get_rep_count {
- v=$(my_getfattr -n trusted.nsr.rep-count $1)
+ v=$(my_getfattr -n trusted.jbr.rep-count $1)
#echo $v > /dev/tty
echo $v
}
diff --git a/tests/basic/nsr/nsr-volgen.t b/tests/basic/jbr/jbr-volgen.t
index 99563ef608a..fcd20e5f998 100644
--- a/tests/basic/nsr/nsr-volgen.t
+++ b/tests/basic/jbr/jbr-volgen.t
@@ -6,7 +6,7 @@
volfiles=${GLUSTERD_WORKDIR}/vols/${V0}/
check_brick_volfiles () {
for vf in ${volfiles}${V0}.$(hostname).*.vol; do
- grep -qs experimental/nsr $vf || return
+ grep -qs experimental/jbr $vf || return
# At least for now, nothing else would put a client translator
# in a brick volfile.
grep -qs protocol/client $vf || return
@@ -18,16 +18,16 @@ TEST glusterd
TEST pidof glusterd
TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2}
-TEST $CLI volume set $V0 cluster.nsr on
+TEST $CLI volume set $V0 cluster.jbr on
# Check that the client volfile got modified properly.
-TEST grep -qs experimental/nsrc ${volfiles}${V0}.tcp-fuse.vol
+TEST grep -qs experimental/jbrc ${volfiles}${V0}.tcp-fuse.vol
# Check that the brick volfiles got modified as well.
EXPECT "OK" check_brick_volfiles
# Put things back and make sure the "undo" worked.
-TEST $CLI volume set $V0 cluster.nsr off
+TEST $CLI volume set $V0 cluster.jbr off
TEST $CLI volume start $V0
TEST $GFS -s $H0 --volfile-id $V0 $M0
echo hello > $M0/probe
diff --git a/tests/basic/nsr/nsr.t b/tests/basic/jbr/jbr.t
index b5a4aaf1058..283446c9635 100755
--- a/tests/basic/nsr/nsr.t
+++ b/tests/basic/jbr/jbr.t
@@ -17,13 +17,13 @@ TEST $CLI_1 peer probe $H3;
EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count;
TEST $CLI_1 volume create $V0 replica 3 $H1:$L1 $H2:$L2 $H3:$L3
-TEST $CLI_1 volume set $V0 cluster.nsr on
+TEST $CLI_1 volume set $V0 cluster.jbr on
#TEST $CLI_1 volume set $V0 diagnostics.brick-log-level DEBUG
TEST $CLI_1 volume start $V0
TEST glusterfs --volfile-id=$V0 --volfile-server=$H1 --entry-timeout=0 $M0;
-EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" nsrc_child_up_status $V0 0
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" jbrc_child_up_status $V0 0
echo "file" > $M0/file1
TEST stat $L1/file1
diff --git a/tests/volume.rc b/tests/volume.rc
index 71b40b72d66..f46f8a19e62 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -110,7 +110,7 @@ function snap_client_connected_status {
echo "$up"
}
-function _nsrc_child_up_status {
+function _jbrc_child_up_status {
local vol=$1
#brick_id is (brick-num in volume info - 1)
local brick_id=$2
@@ -121,11 +121,11 @@ function _nsrc_child_up_status {
echo "$up"
}
-function nsrc_child_up_status {
+function jbrc_child_up_status {
local vol=$1
#brick_id is (brick-num in volume info - 1)
local brick_id=$2
- _nsrc_child_up_status $vol $brick_id generate_mount_statedump
+ _jbrc_child_up_status $vol $brick_id generate_mount_statedump
}
function _afr_child_up_status {