tests/block_cloning: try harder to stay on same txg in fallback test

We've observed this test failing intermittently. When it does, the "same block" check shows that both files have the same content, that is, the file was cloned. The only way this could have happened is if the open txg moved between the dd and clonefile calls. That's possible because although we set zfs_txg_timeout to be large, that only affects the wait time in the sync thread at the start of a new txg; it doesn't change anything if its currently waiting or working. So here we just force the txgs to move immediately before, which should get both operations onto the same txg as intented. Sponsored-By: OpenDrives Inc. Sponsored-By: Klara Inc. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rob Norris Rob Norris <[email protected]> Closes openzfs#15303
openzfsonwindows · Dec 11, 2023 · 41e1811 · 41e1811
1 parent 1568ae8
commit 41e1811
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/...fs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh b/...fs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
@@ -51,6 +51,7 @@ log_onexit cleanup
 log_must zpool create -o feature@block_cloning=enabled $TESTPOOL $DISKS
 
 log_must set_tunable64 TXG_TIMEOUT 5000
+log_must sync_pool $TESTPOOL true
 
 log_must dd if=/dev/urandom of=/$TESTPOOL/file bs=128K count=4
 log_must clonefile -f /$TESTPOOL/file /$TESTPOOL/clone 0 0 524288