From 0a43265f1b10c35506fe82a525aa0fa43af6c0cd Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Mon, 4 Apr 2016 14:55:20 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/13899 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Jeff Darcy --- tests/basic/ec/ec.t | 2 +- tests/basic/jbr/jbr-volgen.t | 37 +++++++++++++++++++++++++++++++++++++ tests/basic/jbr/jbr.t | 33 +++++++++++++++++++++++++++++++++ tests/basic/nsr/nsr-volgen.t | 37 ------------------------------------- tests/basic/nsr/nsr.t | 33 --------------------------------- 5 files changed, 71 insertions(+), 71 deletions(-) create mode 100644 tests/basic/jbr/jbr-volgen.t create mode 100755 tests/basic/jbr/jbr.t delete mode 100644 tests/basic/nsr/nsr-volgen.t delete mode 100755 tests/basic/nsr/nsr.t (limited to 'tests/basic') 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/jbr/jbr-volgen.t b/tests/basic/jbr/jbr-volgen.t new file mode 100644 index 00000000000..fcd20e5f998 --- /dev/null +++ b/tests/basic/jbr/jbr-volgen.t @@ -0,0 +1,37 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc + +volfiles=${GLUSTERD_WORKDIR}/vols/${V0}/ +check_brick_volfiles () { + for vf in ${volfiles}${V0}.$(hostname).*.vol; do + 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 + done + echo "OK" +} + +TEST glusterd +TEST pidof glusterd + +TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2} +TEST $CLI volume set $V0 cluster.jbr on + +# Check that the client volfile got modified properly. +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.jbr off +TEST $CLI volume start $V0 +TEST $GFS -s $H0 --volfile-id $V0 $M0 +echo hello > $M0/probe +EXPECT hello cat ${B0}/${V0}1/probe +EXPECT hello cat ${B0}/${V0}2/probe + +cleanup diff --git a/tests/basic/jbr/jbr.t b/tests/basic/jbr/jbr.t new file mode 100755 index 00000000000..283446c9635 --- /dev/null +++ b/tests/basic/jbr/jbr.t @@ -0,0 +1,33 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc +. $(dirname $0)/../../cluster.rc +. $(dirname $0)/../../snapshot.rc + +cleanup; + +TEST verify_lvm_version; +#Create cluster with 3 nodes +TEST launch_cluster 3; +TEST setup_lvm 3 + +TEST $CLI_1 peer probe $H2; +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.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" jbrc_child_up_status $V0 0 + +echo "file" > $M0/file1 +TEST stat $L1/file1 +TEST stat $L2/file1 +TEST stat $L3/file1 + +cleanup; diff --git a/tests/basic/nsr/nsr-volgen.t b/tests/basic/nsr/nsr-volgen.t deleted file mode 100644 index 99563ef608a..00000000000 --- a/tests/basic/nsr/nsr-volgen.t +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc -. $(dirname $0)/../../volume.rc - -volfiles=${GLUSTERD_WORKDIR}/vols/${V0}/ -check_brick_volfiles () { - for vf in ${volfiles}${V0}.$(hostname).*.vol; do - grep -qs experimental/nsr $vf || return - # At least for now, nothing else would put a client translator - # in a brick volfile. - grep -qs protocol/client $vf || return - done - echo "OK" -} - -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 - -# Check that the client volfile got modified properly. -TEST grep -qs experimental/nsrc ${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 start $V0 -TEST $GFS -s $H0 --volfile-id $V0 $M0 -echo hello > $M0/probe -EXPECT hello cat ${B0}/${V0}1/probe -EXPECT hello cat ${B0}/${V0}2/probe - -cleanup diff --git a/tests/basic/nsr/nsr.t b/tests/basic/nsr/nsr.t deleted file mode 100755 index b5a4aaf1058..00000000000 --- a/tests/basic/nsr/nsr.t +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc -. $(dirname $0)/../../volume.rc -. $(dirname $0)/../../cluster.rc -. $(dirname $0)/../../snapshot.rc - -cleanup; - -TEST verify_lvm_version; -#Create cluster with 3 nodes -TEST launch_cluster 3; -TEST setup_lvm 3 - -TEST $CLI_1 peer probe $H2; -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 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 - -echo "file" > $M0/file1 -TEST stat $L1/file1 -TEST stat $L2/file1 -TEST stat $L3/file1 - -cleanup; -- cgit