[tarantool-patches] [PATCH] lua: fix fio.rmtree to work with non empty dirs

[tarantool-patches] [PATCH] lua: fix fio.rmtree to work with non empty dirs

[Konstantin Belyavskiy]

Fix 'fio.rmtree' to remove a non empty directories.
And update test.

Closes #3258
---
Ticket: https://github.com/tarantool/tarantool/issues/3258
Branch: https://github.com/tarantool/tarantool/tree/kbelyavs/gh-3258-fix-fio-rmtree
 src/lua/fio.lua       |  8 ++++++--
 test/app/fio.result   | 16 ++++++++++++++++
 test/app/fio.test.lua |  7 +++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/lua/fio.lua b/src/lua/fio.lua
index 3fda6e532..d5531c154 100644
--- a/src/lua/fio.lua
+++ b/src/lua/fio.lua
@@ -382,8 +382,12 @@ fio.rmtree = function(path)
     for i, f in ipairs(ls) do
         local tmppath = fio.pathjoin(path, f)
         local st = fio.stat(tmppath)
-        if st and st:is_dir() then
-            st, err = fio.rmtree(tmppath)
+        if st then
+            if st:is_dir() then
+                st, err = fio.rmtree(tmppath)
+            else
+                st, err = fio.unlink(tmppath)
+            end
             if err ~= nil  then
                 return nil, err
             end
diff --git a/test/app/fio.result b/test/app/fio.result
index 6c4609855..d985b688b 100644
--- a/test/app/fio.result
+++ b/test/app/fio.result
@@ -413,6 +413,22 @@ fio.rmdir(dir2)
   - false
   - 'fio: No such file or directory'
 ...
+-- gh-3258 rmtree should remove directories with files
+fio.mktree('tmp2/tmp3/tmp4')
+---
+- true
+...
+fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
+---
+...
+fh:close()
+---
+- true
+...
+fio.rmtree('tmp2')
+---
+- true
+...
 fio.rmdir(tmpdir)
 ---
 - true
diff --git a/test/app/fio.test.lua b/test/app/fio.test.lua
index 0850413d9..14e0fb72c 100644
--- a/test/app/fio.test.lua
+++ b/test/app/fio.test.lua
@@ -131,6 +131,13 @@ fio.rmdir(dir2)
 
 { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
 { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
+
+-- gh-3258 rmtree should remove directories with files
+fio.mktree('tmp2/tmp3/tmp4')
+fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
+fh:close()
+fio.rmtree('tmp2')
+
 fio.rmdir(tmpdir)
 fio.rmdir(tmpdir)
 
-- 
2.14.3 (Apple Git-98)

[tarantool-patches] Re: [PATCH] lua: fix fio.rmtree to work with non empty dirs

[Alexander Turenko]

Hi Kostya!

The patch looks good for me except one tiny comment.

WBR, Alexander Turenko.

> index 0850413d9..14e0fb72c 100644
> --- a/test/app/fio.test.lua
> +++ b/test/app/fio.test.lua
> @@ -131,6 +131,13 @@ fio.rmdir(dir2)
>  
>  { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
>  { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
> +
> +-- gh-3258 rmtree should remove directories with files
> +fio.mktree('tmp2/tmp3/tmp4')
> +fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
> +fh:close()
> +fio.rmtree('tmp2')
> +

I think it would be good to check that the directory really disappears
(via fio.listdir()).

[tarantool-patches] Re[2]: [tarantool-patches] [PATCH] lua: fix fio.rmtree to work with non empty dirs

[Konstantin Belyavskiy]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

Thanks for review, now check directory absence with fio.stat()

>Среда, 18 июля 2018, 6:43 +03:00 от Alexander Turenko <alexander.turenko@tarantool.org>:
>
>Hi Kostya!
>
>The patch looks good for me except one tiny comment.
>
>WBR, Alexander Turenko.
>
>> index 0850413d9..14e0fb72c 100644
>> --- a/test/app/fio.test.lua
>> +++ b/test/app/fio.test.lua
>> @@ -131,6 +131,13 @@ fio.rmdir(dir2)
>> 
>>  { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
>>  { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
>> +
>> +-- gh-3258 rmtree should remove directories with files
>> +fio.mktree('tmp2/tmp3/tmp4')
>> +fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
>> +fh:close()
>> +fio.rmtree('tmp2')
>> +
>
>I think it would be good to check that the directory really disappears
>(via fio.listdir()).


Best regards,
Konstantin Belyavskiy
k.belyavskiy@tarantool.org

[-- Attachment #2: Type: text/html, Size: 1567 bytes --]

[tarantool-patches] Re: Re[2]: [PATCH] lua: fix fio.rmtree to work with non empty dirs

[Alexander Turenko]

Hi,

LGTM.

WBR, Alexander Turenko.

On Mon, Jul 23, 2018 at 08:27:47PM +0300, Konstantin Belyavskiy wrote:
>    Thanks for review, now check directory absence with fio.stat()
> 
>      Среда, 18 июля 2018, 6:43 +03:00 от Alexander Turenko
>      <alexander.turenko@tarantool.org>:
> 
>    Hi Kostya!
>    The patch looks good for me except one tiny comment.
>    WBR, Alexander Turenko.
>    > index 0850413d9..14e0fb72c 100644
>    > --- a/test/app/fio.test.lua
>    > +++ b/test/app/fio.test.lua
>    > @@ -131,6 +131,13 @@ fio.rmdir(dir2)
>    >
>    > { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3),
>    fio.unlink(file4) }
>    > { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3),
>    fio.unlink(file4) }
>    > +
>    > +-- gh-3258 rmtree should remove directories with files
>    > +fio.mktree('tmp2/tmp3/tmp4')
>    > +fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
>    > +fh:close()
>    > +fio.rmtree('tmp2')
>    > +
>    I think it would be good to check that the directory really disappears
>    (via fio.listdir()).
> 
>    Best regards,
>    Konstantin Belyavskiy
>    k.belyavskiy@tarantool.org

[tarantool-patches] Re: [PATCH] lua: fix fio.rmtree to work with non empty dirs

[Konstantin Osipov]

* Alexander Turenko <alexander.turenko@tarantool.org> [18/07/18 09:46]:
> Hi Kostya!
> 
> The patch looks good for me except one tiny comment.
> 

I pushed an updated patch (it was not sent to this list), but
contains a fix for this review comment.

> WBR, Alexander Turenko.
> 
> > index 0850413d9..14e0fb72c 100644
> > --- a/test/app/fio.test.lua
> > +++ b/test/app/fio.test.lua
> > @@ -131,6 +131,13 @@ fio.rmdir(dir2)
> >  
> >  { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
> >  { fio.unlink(file1), fio.unlink(file2), fio.unlink(file3), fio.unlink(file4) }
> > +
> > +-- gh-3258 rmtree should remove directories with files
> > +fio.mktree('tmp2/tmp3/tmp4')
> > +fh = fio.open('tmp2/tmp3/tmp4/tmp.txt', {'O_RDWR', 'O_CREAT'})
> > +fh:close()
> > +fio.rmtree('tmp2')
> > +
> 
> I think it would be good to check that the directory really disappears
> (via fio.listdir()).

-- 
Konstantin Osipov, Moscow, Russia, +7 903 626 22 32
http://tarantool.io - www.twitter.com/kostja_osipov