From 6f634d2701dbd1cf74f75754e129ae7bdcb999ee Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 5 Jun 2018 11:01:37 -0700 Subject: [PATCH] test: Use a file that should be on all OSes Also, create temporary files in test specific dir and remove Caused by: 154330fd68d952a4e1b972891f02b6dc9c355424 Signed-off-by: David Zafman (cherry picked from commit c1e96ae7cb1b39f2cf397b15fa23458226580a68) --- qa/standalone/scrub/osd-unexpected-clone.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/qa/standalone/scrub/osd-unexpected-clone.sh b/qa/standalone/scrub/osd-unexpected-clone.sh index b969405f82bba..bc9263ae32dff 100755 --- a/qa/standalone/scrub/osd-unexpected-clone.sh +++ b/qa/standalone/scrub/osd-unexpected-clone.sh @@ -47,7 +47,7 @@ function TEST_recover_unexpected() { ceph osd pool create foo 1 rados -p foo put foo /etc/passwd rados -p foo mksnap snap - rados -p foo put foo /etc/motd + rados -p foo put foo /etc/group wait_for_clean || return 1 @@ -55,16 +55,17 @@ function TEST_recover_unexpected() { JSON=`objectstore_tool $dir $osd --op list foo | grep snapid.:1` echo "JSON is $JSON" - rm -f _ data - objectstore_tool $dir $osd "$JSON" get-attr _ > _ - objectstore_tool $dir $osd "$JSON" get-bytes data + rm -f $dir/_ $dir/data + objectstore_tool $dir $osd "$JSON" get-attr _ > $dir/_ + objectstore_tool $dir $osd "$JSON" get-bytes $dir/data rados -p foo rmsnap snap sleep 5 - objectstore_tool $dir $osd "$JSON" set-bytes data - objectstore_tool $dir $osd "$JSON" set-attr _ _ + objectstore_tool $dir $osd "$JSON" set-bytes $dir/data + objectstore_tool $dir $osd "$JSON" set-attr _ $dir/_ + rm -f $dir/_ $dir/data sleep 5 -- 2.39.5