Add unlink hook to ioengine API, gluster ioengine
fio would just call unlink even with engines that are not using the
operating systems file namespace... This provides a hook to allow
overriding that, with a default handler, and implements it for the
gluster ioengine.
There are others which it'd probably make sense I'm sure.
Huamin Chen looked over my changes to the gluster code earlier...
>I like this unlink idea, it would be great if you can also make unlink optional (if my coding reading is correct). This looks a great pull request candidate to fio. Please ping Axboe after you are done. He is not actively watching pull requests.
>Please also feel free to augment gluster code and pull me for review if necessary.
-castor
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/filesetup.c b/filesetup.c
index 12a43b1..29a76c0 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -59,7 +59,7 @@
if (unlink_file || new_layout) {
dprint(FD_FILE, "layout unlink %s\n", f->file_name);
- if ((unlink(f->file_name) < 0) && (errno != ENOENT)) {
+ if ((td_io_unlink_file(td, f) < 0) && (errno != ENOENT)) {
td_verror(td, errno, "unlink");
return 1;
}
@@ -172,7 +172,7 @@
if (td->terminate) {
dprint(FD_FILE, "terminate unlink %s\n", f->file_name);
- unlink(f->file_name);
+ td_io_unlink_file(td, f);
} else if (td->o.create_fsync) {
if (fsync(f->fd) < 0) {
td_verror(td, errno, "fsync");
@@ -1100,6 +1100,11 @@
dprint(FD_FILE, "close files\n");
for_each_file(td, f, i) {
+ if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
+ dprint(FD_FILE, "free unlink %s\n", f->file_name);
+ td_io_unlink_file(td, f);
+ }
+
if (fio_file_open(f))
td_io_close_file(td, f);
@@ -1107,7 +1112,7 @@
if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
dprint(FD_FILE, "free unlink %s\n", f->file_name);
- unlink(f->file_name);
+ td_io_unlink_file(td, f);
}
sfree(f->file_name);