From a4849fb914425db87a76c1f1c229f28bc39398f9 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 18 Mar 2014 18:06:12 +0200 Subject: [PATCH] qa: test_alloc_hint: flush journal before prodding the FS OSDs that for some reason get behind on processing their op queue break expect_alloc_hint_eq(), as it pokes the FS and not the journal. Fix it by flushing the journal before proceeding with anything else. Signed-off-by: Ilya Dryomov --- qa/workunits/rados/test_alloc_hint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qa/workunits/rados/test_alloc_hint.sh b/qa/workunits/rados/test_alloc_hint.sh index 14cf22d5beb8a..52fa6ea67f4da 100755 --- a/qa/workunits/rados/test_alloc_hint.sh +++ b/qa/workunits/rados/test_alloc_hint.sh @@ -54,6 +54,11 @@ function expect_alloc_hint_eq() { local expected_extsize="$1" for (( i = 0 ; i < "${NUM_OSDS}" ; i++ )); do + # Make sure that stuff is flushed from the journal to the store + # by the time we get to it, as we prod the actual files and not + # the journal. + sudo ceph daemon "osd.${i}" "flush_journal" + # e.g., .../25.6_head/foo__head_7FC1F406__19 # .../26.bs1_head/bar__head_EFE6384B__1a_ffffffffffffffff_1 local fns=(${OSD_DATA[i]}/current/${PGID}*_head/${OBJ}_*) -- 2.39.5