]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
qa: update scrub start code to use comma sep scrubopts
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 9 Jun 2021 02:37:16 +0000 (19:37 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 28 Jun 2021 19:43:07 +0000 (12:43 -0700)
commitc4b7045d345c0204164e1a7ec1bb790499a0dee5
tree88d5530e515a66b94e9af38f39d9bb2f9aaf8916
parent2e1902f3a43860da461e68ebea5ef8dd48418278
qa: update scrub start code to use comma sep scrubopts

The documentation specifies this in [1] and yet we were using (I
believe) an older syntax:

    ceph tell mds.foo:0 scrub start / recursive force

instead of

    ceph tell mds.foo:0 scrub start / recursive,force

Oddly the former works at least as recently as in [2]:

    2021-06-03T07:11:42.071 DEBUG:teuthology.orchestra.run.smithi025:> sudo adjust-ulimits ceph-coverage /home/ubuntu/cephtest/archive/coverage timeout 120 ceph --cluster ceph tell mds.1:0 scrub start / recursive force
    ...
    2021-06-03T07:11:42.268 INFO:teuthology.orchestra.run.smithi025.stdout:{
    2021-06-03T07:11:42.268 INFO:teuthology.orchestra.run.smithi025.stdout:    "return_code": 0,
    2021-06-03T07:11:42.268 INFO:teuthology.orchestra.run.smithi025.stdout:    "scrub_tag": "cf7a74b2-3eb2-4657-9274-ea504b1ebf8f",
    2021-06-03T07:11:42.269 INFO:teuthology.orchestra.run.smithi025.stdout:    "mode": "asynchronous"
    2021-06-03T07:11:42.269 INFO:teuthology.orchestra.run.smithi025.stdout:}

[1] https://docs.ceph.com/en/latest/cephfs/scrub/
[2] /ceph/teuthology-archive/pdonnell-2021-06-03_03:40:33-fs-wip-pdonnell-testing-20210603.020013-distro-basic-smithi/6148097/teuthology.log

Fixes: https://tracker.ceph.com/issues/51146
See-also: https://tracker.ceph.com/issues/51145
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0f505dc299fd10f27bab74b02356c1164814d0f5)
qa/tasks/cephfs/test_data_scan.py
qa/tasks/cephfs/test_forward_scrub.py
qa/tasks/cephfs/test_multimds_misc.py
qa/tasks/cephfs/test_recovery_pool.py
qa/tasks/cephfs/test_scrub.py
qa/tasks/fwd_scrub.py