diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-19 14:54:32 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-05-31 21:40:47 -0700 |
| commit | 1b3d0bb2d8a75806968532d2ee006f34e9bb6334 (patch) | |
| tree | cb985dbf44f581aaa378144f978c5457185bf50a /tests | |
| parent | 3ea46dca41d0a006576214b2d71a462ee6866c4d (diff) | |
tiering/nfs: duplication of nodes in client graph
Back port of http://review.gluster.org/10820
When creating client volfiles, xlator tier-dht will
be loaded for each volume. So for services like nfs
have one or more volumes . So for each volume in the
graph a tier-dht xlator will be created. So the graph
parser will fail because of the redundant node in
graph.
By this change tier-dht will be renamed as volname-tier-dht
>Change-Id: I3c9b9c23ddcb853773a8a02be7fd8a5d09a7f972
>BUG: 1222840
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/10820
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System
>Reviewed-by: Kaushal M <kaushal@redhat.com>
Change-Id: I5629d48d4d1dbec8790f75e2fee66729aa2f6eed
BUG: 1226029
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/10981
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Joseph Fernandes
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t | 4 | ||||
| -rwxr-xr-x | tests/basic/tier/tier.t | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t b/tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t index 028bc6a47d0..6199463b36d 100755 --- a/tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t +++ b/tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t @@ -57,6 +57,9 @@ TEST $CLI volume set $V0 features.ctr-enabled on TEST [ -d d1 ] TEST [ -e file1 ] +cd +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0; + TEST $CLI volume detach-tier $V0 start TEST $CLI volume detach-tier $V0 commit @@ -64,4 +67,5 @@ EXPECT "0" confirm_tier_removed ${V0}${CACHE_BRICK_FIRST} EXPECT_WITHIN $REBALANCE_TIMEOUT "0" confirm_vol_stopped $V0 + cleanup diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 79e171f85bf..2a5f7486d7f 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -110,7 +110,7 @@ sleep 12 uuidgen >> d1/data2.txt # Check promotion on read to slow tier -( cd $M0 ; umount $M0 ) # fail but drops kernel cache +( cd $M0 ; umount -l $M0 ) # fail but drops kernel cache cat d1/data3.txt sleep 5 EXPECT_WITHIN $PROMOTE_TIMEOUT "0" file_on_fast_tier d1/data2.txt @@ -133,4 +133,6 @@ EXPECT "0" confirm_tier_removed ${V0}${CACHE_BRICK_FIRST} EXPECT_WITHIN $REBALANCE_TIMEOUT "0" confirm_vol_stopped $V0 +cd; + cleanup |