diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-03-18 17:06:12 +0100 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-03-19 09:59:27 +0100 |
| commit | a4849fb914425db87a76c1f1c229f28bc39398f9 (patch) | |
| tree | c0c8aad6d741fd162f73532f82a9d2a35ab7720e | |
| parent | osd: add flush_journal admin socket command (diff) | |
| download | ceph-a4849fb914425db87a76c1f1c229f28bc39398f9.tar.xz ceph-a4849fb914425db87a76c1f1c229f28bc39398f9.zip | |
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 <ilya.dryomov@inktank.com>
| -rwxr-xr-x | qa/workunits/rados/test_alloc_hint.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qa/workunits/rados/test_alloc_hint.sh b/qa/workunits/rados/test_alloc_hint.sh index 14cf22d5beb..52fa6ea67f4 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}_*) |