test/librbd: disable compare and write if skipping partial discard

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4e8b0b60a72fe1e1ac10a2beb46b77d4b58c91c4)

diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
index 85596ef575628d7b64a9018705b6e57b1de2f861..baa1a21ea620733784d7db490170a4449b4bf0b1 100644 (file)
--- a/src/test/librbd/fsx.cc
+++ b/src/test/librbd/fsx.cc
@@ -1962,6 +1962,13 @@ docompareandwrite(unsigned offset, unsigned size)
 {
         int ret;
 
+        if (skip_partial_discard) {
+                if (!quiet && testcalls > simulatedopcount)
+                        prt("compare and write disabled\n");
+                log4(OP_SKIPPED, OP_COMPARE_AND_WRITE, offset, size);
+                return;
+        }
+
         offset -= offset % writebdy;
         if (o_direct)
                 size -= size % writebdy;