user servicable snapshots

Change-Id: Idbf27dbe088e646a8ab81cedc5818413795895ea
Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com>
Signed-off-by: Anand Subramanian <anands@redhat.com>
Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-on: http://review.gluster.org/7700
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/tests/bugs/bug-859581.t b/tests/bugs/bug-859581.t
index f31e8b311ef..0aab48bb02b 100755
--- a/tests/bugs/bug-859581.t
+++ b/tests/bugs/bug-859581.t
@@ -22,7 +22,7 @@ TEST rm -f $(gf_get_gfid_backend_file_path $B0/${V0}1 "dir1")
 TEST rmdir $B0/${V0}1/dir1/dir2
 
 TEST $CLI volume heal $V0 full
-sleep 5
+EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
 
 TEST [ -d $B0/${V0}1/dir1/dir2 ]
 TEST [ ! -d $(gf_get_gfid_backend_file_path $B0/${V0}1 "dir1") ]
@@ -35,7 +35,15 @@ TEST $CLI volume start $V0
 EXPECT 'Started' volinfo_field $V0 'Status';
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 
-ls -l $M0/
+# Till now, protocol/server was not doing inode linking as part of readdirp.
+# But pas part of user servicable snapshots patcth, changes to do inode linking
+# in protocol/server in readdirp,  were introduced. So now to make sure
+# the gfid handle of dir1 is healed, explicit lookup has to be sent on it.
+# Otherwise, whenever ls -l is done just on the mount point $M0, lookup on the
+# entries received as part of readdirp, is not sent, because the inodes for
+# those entries were linked as part of readdirp itself. i.e instead of doing
+# "ls -l $M0", it has to be the below command.
+ls -l $M0/dir1;
 
 TEST [ -h $(gf_get_gfid_backend_file_path $B0/${V0}1 "dir1") ]