youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-fix retry logic (#1533)

Browse Source 
This logic has always been broken but happened to try one time due to
&& operator precedence.  7158e50ee2
broke this further when quoting && since the command was not
evaluated.
This commit is contained in:
Andrew Gaul
2021-01-25 18:32:40 +09:00
committed by GitHub
parent d019dda4f7
commit 1987bcbea3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration-test-common.sh
View File

@ -106,7 +106,7 @@ function retry {
status=0
for i in $(seq $N); do
echo "Trying: $*"
"$@"
eval $@
status=$?
if [ $status == 0 ]; then
break
@ -296,7 +296,7 @@ function stop_s3fs {
# Retry in case file system is in use
if [ `uname` = "Darwin" ]; then
if df | grep -q $TEST_BUCKET_MOUNT_POINT_1; then
retry 10 df | grep -q $TEST_BUCKET_MOUNT_POINT_1 && umount $TEST_BUCKET_MOUNT_POINT_1
retry 10 df "|" grep -q $TEST_BUCKET_MOUNT_POINT_1 "&&" umount $TEST_BUCKET_MOUNT_POINT_1
fi
else
if grep -q $TEST_BUCKET_MOUNT_POINT_1 /proc/mounts; then