tst_fill_fs: enhance the filesystem filling routine
PATCH v2 1/1 tst_fill_fs: enhance the filesystem filling routine
Do more tries with size in half when write() getting ENOSPC, until the size is less than the filesystem block size. Though we can't really fill a filesystem full, this could make the routine more robust.
--- lib/tst_fill_fs.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
lib/tst_fill_fs.c +10 -4
@@ -6,6 +6,7 @@#include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <sys/statvfs.h> #define TST_NO_DEFAULT_MAIN #include "tst_test.h"
@@ -19,6 +20,8 @@ void tst_fill_fs(const char *path, int verbose)size_t len;ssize_t ret;int fd; +struct statvfs fi; +statvfs (path, &fi);for (;;) { len =random () % (1024 *102400 );
@@ -37,17 +40,20 @@ void tst_fill_fs(const char *path, int verbose)return ; } -while (len) { +while (len >= fi.f_bsize/2 ) { ret =write (fd, buf,MIN (len,sizeof (buf)));if (ret <0 ) { +if (errno ==ENOSPC ) { +SAFE_FSYNC (fd); + len /=2 ; +continue ; + } +SAFE_CLOSE (fd);if (errno !=ENOSPC )tst_brk (TBROK |TERRNO ,"write()" ); - -tst_res (TINFO |TERRNO ,"write()" ); -return ; } len -= ret;
Signature · 1 line
2.20.1
PATCH v2 1/1 tst_fill_fs: enhance the filesystem filling routine
Hi!
Quoted 36 lines
lib/tst_fill_fs.c +10
-1@@ -6,6 +6,7 @@#include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <sys/statvfs.h> #define TST_NO_DEFAULT_MAIN #include "tst_test.h" @@ -19,6 +20,8 @@ void tst_fill_fs(const char *path, int verbose)size_t len;ssize_t ret;int fd; +struct statvfs fi; +statvfs (path, &fi);for (;;) { len =random () % (1024 *102400 );@@ -37,17 +40,20 @@ void tst_fill_fs(const char *path, int verbose)return ; } -while (len) { +while (len >= fi.f_bsize/2 ) { ret =write (fd, buf,MIN (len,sizeof (buf)));if (ret <0 ) { +if (errno ==ENOSPC ) { +SAFE_FSYNC (fd); + len /=2 ; +continue ; + } +
lib/tst_fill_fs.c void tst_fill_fs(const char *path, int verbose) · line 59
Quoted 10 lines
lib/tst_fill_fs.c +0
-3SAFE_CLOSE (fd);if (errno !=ENOSPC )tst_brk (TBROK |TERRNO ,"write()" ); - -tst_res (TINFO |TERRNO ,"write()" ); -return ; } len -= ret;
Wouldn't this cause second SAFE_CLOSE() here because we no longer do a return from from the while loop on ENOSPC?
Why not just:
lib/tst_fill_fs.c +7 -0
@@ -41,6 +41,13 @@ void tst_fill_fs(const char *path, int verbose) ret =write (fd, buf,MIN (len,sizeof (buf)));if (ret <0 ) { +/* retry on ENOSPC to make sure filesystem is really full */ +if (errno ==ENOSPC && len >= fi.f_bsize/2 ) { +SAFE_FSYNC (fd); + len /=2 ; +continue ; + } +SAFE_CLOSE (fd);if (errno !=ENOSPC )
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/1 tst_fill_fs: enhance the filesystem filling routine
Quoted 46 lines · Cyril Hrubis
Hi!
Quoted 45 lines
lib/tst_fill_fs.c +10
-4@@ -6,6 +6,7 @@#include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <sys/statvfs.h> #define TST_NO_DEFAULT_MAIN #include "tst_test.h" @@ -19,6 +20,8 @@ void tst_fill_fs(const char *path, int verbose)size_t len;ssize_t ret;int fd; +struct statvfs fi; +statvfs (path, &fi);for (;;) { len =random () % (1024 *102400 );@@ -37,17 +40,20 @@ void tst_fill_fs(const char *path, int verbose)return ; } -while (len) { +while (len >= fi.f_bsize/2 ) { ret =write (fd, buf,MIN (len,sizeof (buf)));if (ret <0 ) { +if (errno ==ENOSPC ) { +SAFE_FSYNC (fd); + len /=2 ; +continue ; + } +SAFE_CLOSE (fd);if (errno !=ENOSPC )tst_brk (TBROK |TERRNO ,"write()" ); - -tst_res (TINFO |TERRNO ,"write()" ); -return ; }
Quoted 5 lines
lib/tst_fill_fs.c void tst_fill_fs(const char *path, int verbose) · line 59
Quoted 1 line
lib/tst_fill_fs.c +0
-0len -= ret;Wouldn't this cause second
SAFE_CLOSE()here because we no longer do a return from from the while loop on ENOSPC?
No, it wouldn't cause that. The while's condition judgment will help to go-out the loop when len < fi.f_bsize/2, and it only do SAFE_CLOSE() once in any situation I think.
Quoted 15 lines
Why not just:
lib/tst_fill_fs.c +1
-0@@ -41,6 +41,13 @@ void tst_fill_fs(const char *path, int verbose) ret =write (fd, buf,MIN (len,sizeof (buf)));if (ret <0 ) { +/* retry on ENOSPC to make sure filesystem is really full */
+ if (errno == ENOSPC && len >=
fi.f_bsize/2) {
lib/tst_fill_fs.c void tst_fill_fs(const char *path, int verbose) · line 48
Quoted 3 lines
lib/tst_fill_fs.c +3
-0+SAFE_FSYNC (fd); + len /=2 ; +continue ;
It does the same thing as my patch, but your code looks a little better because it reserves the print&reutrn part in below.
I will send patch V3 on your suggestion.
Quoted 12 lines
lib/tst_fill_fs.c +2
-1+ } +SAFE_CLOSE (fd);if (errno !=ENOSPC ) --Cyril Hrubis
[email protected]
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20191126/7afc91dc/attachment.htm>