From 2ff5ee8bde44b5d0ff7ff3cbc732abb17c559979 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Dec 2021 21:30:09 +0000 Subject: [PATCH] Revert "output: Don't use nbdkit-file-plugin cache=none when writing" I have now fixed the implementation of cache=none in nbdkit, so this reverts the previous commit (except we still drop fadvise=sequential as that is not needed). You must have nbdkit >= 1.29.10 with this commit otherwise performance will be poor: https://gitlab.com/nbdkit/nbdkit/-/commit/a956e2e75d6c88eeefecd967505667c9f176e3af This reverts commit ac59d3b2310511b1537d408b675b19ec9a5d384e. (cherry picked from commit 5d5383b91280aeb59b84f442ac333dc700a04d0c) --- output/output.ml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/output/output.ml b/output/output.ml index f829fe43..414f01eb 100644 --- a/output/output.ml +++ b/output/output.ml @@ -98,14 +98,7 @@ let output_to_local_file ?(changeuid = fun f -> f ()) let cmd = Nbdkit.add_arg cmd "file" filename in let cmd = if Nbdkit.version nbdkit_config >= (1, 22, 0) then ( - (* nbdkit 1.28 has a very naive implementation of - * page cache eviction. We need to copy the one from - * nbdcopy copy/file-ops.c. Until then do not use - * this flag because it causes a large slow down on - * some machines. XXX - *) - (*let cmd = Nbdkit.add_arg cmd "fadvise" "sequential" in - let cmd = Nbdkit.add_arg cmd "cache" "none" in*) + let cmd = Nbdkit.add_arg cmd "cache" "none" in cmd ) else cmd in -- 2.31.1