From 1b3d0bb2d8a75806968532d2ee006f34e9bb6334 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Tue, 19 May 2015 14:54:32 +0530 Subject: 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 >Reviewed-on: http://review.gluster.org/10820 >Reviewed-by: Atin Mukherjee >Tested-by: Gluster Build System >Tested-by: NetBSD Build System >Reviewed-by: Kaushal M Change-Id: I5629d48d4d1dbec8790f75e2fee66729aa2f6eed BUG: 1226029 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/10981 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Joseph Fernandes Reviewed-by: Kaushal M --- tests/basic/tier/bug-1214222-directories_miising_after_attach_tier.t | 4 ++++ tests/basic/tier/tier.t | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'tests') 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 -- cgit