test: Fix osd-scrub-repair.sh for Jewel

The alloc_hint addition is caused by: 3bdd4398f1dcad0b7e22f1750ca524b97feca15a

Signed-off-by: David Zafman <dzafman@redhat.com>

test: Test case that reproduces tracker 18162

recover_replicas: object added to missing set for backfill, but is not in recovering, error!

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b9de5eec267627c8bc5ff0759ddea6c4a8aa7bce)

Conflicts:
src/test/erasure-code/test-erasure-eio.sh (Errors during backfill/recovery doesn't change state)

osd: Better handle failure to get enough EC shards to backfill

Fixes: http://tracker.ceph.com/issues/18162
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 6a02bfef3d44a13589c1a90bec29ff0ac64f97aa)

Conflicts:
src/osd/PGBackend.h (trivial)
src/osd/ReplicatedPG.cc (trivial)
src/osd/ReplicatedPG.h (trivial)

osd: For recovery get all possible shards to read on errors

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 390d12f71a1bd6e07f3516b1c73e467e9960725d)

Conflicts:
src/osd/ECBackend.h (trivial)

osd: Allow recovery to send additional reads

For now it doesn't include non-acting OSDs
Added test for this case

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1235810c2ad08ccb7ef5946686eb2b85798f5bca)

test: Allow modified options to existing setup functions

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f92aa6c82449152901a4663c523e9ba43363eca3)

Conflicts:
src/test/erasure-code/test-erasure-eio.sh (trivial)

test: Use feature to get last array element

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 43e3206de2a20bf17ad9f2b16b7e486804097bf2)

test: Add a removal test for erasure code read

Test feature: http://tracker.ceph.com/issues/14513

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 50e08b0a5d7dc30a164313c1480b6cc829b6ec65)

qa: Add common generalized inject_eio() to ceph-helpers.sh

Retry for a while to allow pool to appear

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 574b3cd3d416a3ba3611775f871646ab137266f5)

Conflicts:
qa/workunits/ceph-helpers.sh (trivial)
src/test/erasure-code/test-erasure-eio.sh (trivial)
src/test/osd/osd-scrub-repair.sh (asok sockets not in /tmp)

  osd/ECBackend: only need check missing_loc when doing recovery

Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit 317100ad5b12ffaf00b0559b1b50a99323d6dc4f)

test: test-erasure-eio.sh fix recovery testing and enable it

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 4f592255e1e7aa1c176652e554bc1346ac447e30)

test: CLEANUP make test clearer by using "fail" as argument

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ce85112d353b30a615093643d29410432d69b4cd)

test: CLEANUP to later enable TEST_rados_get_with_subreadall_eio_shard_*

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 6a78b81f37fd6fb495672142fe9d135d144391c6)

erasure: Remove unused variable

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 6cb93f7d3406efb8955770aef21e2dc791958b0a)

Merge pull request #18548 from dillaman/wip-21911-jewel

jewel: test/librbd: fixed metadata tests under upgrade scenarios

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>

Merge pull request #18560 from dillaman/wip-21912-jewel

jewel: test/librbd: updated test_notify to handle new release lock semantics

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

test/librbd: updated test_notify to handle new release lock semantics

Fixes: http://tracker.ceph.com/issues/21912
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

test/librbd: fixed metadata tests under upgrade scenarios

Fixes: http://tracker.ceph.com/issues/21911
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #17942 from smithfarm/wip-21522-jewel

jewel: ceph-disk: fix --runtime omission when enabling ceph-osd@$ID.service units for device-backed OSDs

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #17815 from dzafman/wip-21117

jewel: osd: osd_scrub_during_recovery only considers primary, not replicas

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #18169 from tchaikov/wip-bz1494543-jewel

jewel: ceph-disk: factor out the retry logic into a decorator

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #18166 from tchaikov/wip-jewel-sphinx

jewel: admin: bump sphinx to 1.6

Reviewed-by: Alfredo Deza <adeza@redhat.com>

ceph-disk: retry on OSError

we are likely to
1) create partition, for instance, sdc1
2) partprobe sdc
3) udevadm settle
4) check the device by its path: /dev/sdc1

but there is chance that the uevent sent from kernel fails to reach udev
before we call "udevadm", hence "/dev/sdc1" does not exist even after
"udevadm settle" returns. so we retry in case of OSError here.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4f82dfb9e761a09484e6ba3bd027da535162783e)

Merge pull request #16294 from smithfarm/wip-18853-jewel

jewel: build/ops: upstart: radosgw-all does not start on boot if ceph-base is not installed

Reviewed-by: Kefu Chai <kchai@redhat.com>

ceph-disk: factor out the retry logic into a decorator

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 02a8620de7f200736900aafc944b2c1ac47d9910)

Conflicts:
src/ceph-disk/ceph_disk/main.py: jewel does not have PROCDIR,
so resolve it by using '/proc'. also, in jewel, unmount() does not
have `do_rm` parameter, so do not handle it.

admin/build-doc: support optional argument for specifying sphinx builders

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5b9ec53512cb8119db3af335283445ac972053b7)

Conflicts:
admin/build-doc: trivial resolution

doc,cmake: do not scan non-man pages when building man pages

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0e00d2f21bddd8ee811dec816cff5b4f05b1f891)

Conflicts:
doc/man/CMakeLists.txt: jewel does not have this file. so do
not cherry-pick changes of it.

doc: switch to upstream sphinx-ditaa

it works with setuptools and is now compatible with py3

the py3 branch is created to track the upstream's master branch

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit fda079d5ed4c8a80c677f714a680233a568d512e)

admin: bump sphinx to 1.6

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 88a1114cb3f90e52ba718dc832617fa004d63b3c)

10.2.10

Merge pull request #18100 from ceph/wip-yuriw-fix-clients-jewel

tests: Added openstack.yaml bits to enable runs on ovh nodes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

tests - Added openstack.yaml bits to enable runs on ovh nodes

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #18044 from ceph/wip-yuriw-fix-clients-jewel

qa: Changed distros symlink to point to supported OSs

Reviewed-by: Sage Weil <sage@redhat.com>

Changed distros symlink to point to supported OSs

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #18027 from ceph/wip-yuriw-fix-clients-jewel

tests - Added suit to test upgraded clients against jewel ceph clusters

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

tests - Added suit to test upgraded clients against jewel ceph clusters

Replaces https://github.com/ceph/ceph/pull/17981
We need to run this suite using suite-branch option in
order to use jewel workloads agains ceph cluster luminous+ branches

Added 'libcephfs1' to exclude_packages in upgrade_workload

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

ceph-disk: fix '--runtime' omission for ceph-osd service

f425a127b introduces a regression that ceph-disk omits "--runtime" when
enabling ceph-osd@$ID.service units for device-backed OSDs.

Fixes: http://tracker.ceph.com/issues/21498
Signed-off-by: Carl Xiong <cxiong@suse.com>
(cherry picked from commit a385b5b0c35106c9b44d81655983b2f7566b21cd)

Merge pull request #17892 from smithfarm/wip-p2p-s3-test

jewel: tests: fix upgrade/jewel-x/point-to-point-x

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

qa: point-to-point-x: upgrade client.1 to -x along with cluster nodes

The client.1 rgw in workload_x had not been upgraded to -x.

Fixes: http://tracker.ceph.com/issues/21499
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit afc5a7d3208071b65c0d76d124bfc47a099a446c)

tests: use special branch of ceph/s3-tests with pre-10.2.10

Jewel v10.2.10 introduces a fix for S3 ACL code, for which a new test was added
to ceph/s3-tests.git (ceph-jewel branch). Since the jewel point-to-point-x
upgrade test runs s3-tests on 10.2.7, modify the test to use a special
ceph/s3-tests branch (ceph-jewel-10-2-7) that omits the new test.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #17780 from smithfarm/wip-rh-74-jewel

tests: CentOS 7.4 is now the latest

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

osd: Fixes for osd_scrub_during_recovery handling

Fixes: http://tracker.ceph.com/issues/18206
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 367c32c69a512d2bea85a9b3860ec28bb4433750)

Conflicts:
src/osd/OSD.cc (trivial)
src/osd/PG.cc (trivial)
src/test/osd/osd-recovery-scrub.sh (moved from qa/standalone/scrub/osd-recovery-scrub.sh)
Fixes to osd-recovery_scrub.sh for Jewel compatibility
src/osd/OSD.h (Jewel only - moved is_recovery_active() to OSDService)
src/test/Makefile.am (Jewel only - add test to make check)
src/test/osd/CMakeLists.txt (Jewel only - add test to make check)

Merge pull request #16297 from smithfarm/wip-20518-jewel

jewel: rbd: cli: map with cephx disabled results in error message

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #17781 from smithfarm/wip-drop-11429

tests: Removed 11429 config

Reviewed-by: Kefu Chai <kchai@redhat.com>

tests: Removed 11429 config

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from fde4d3bb96abc0c0ca5bca213a0a2423f95e91a2)

Conflicts:
    Cherry-picked manually because, nowadays, we have the entire ceph-qa-suite
    under qa/ in ceph/ceph.git

tests: CentOS 7.4 is now the latest

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 2311b64025cdb6131035aaf01e7c97486da12e15)

Conflicts
    qa/distros/supported/centos_latest.yaml (renamed from centos_7.3.yaml)

Merge pull request #16473 from smithfarm/wip-20723-jewel

jewel: osd: rados ls on pool with no access returns no error

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #17626 from badone/wip-jewel-ceph-osd-flush-segfault

jewel: core: kv: let ceph_logger destructed after db reset

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #17677 from mslovy/wip-disable-kstore-test

jewel: qa: disable kstore to fix false positive case

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #17597 from smithfarm/wip-21186-jewel

jewel: rgw: rgw_file:  incorrect lane lock behavior in evict_block()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17287 from smithfarm/wip-21109-jewel

jewel: rgw: send data-log list infinitely

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17285 from smithfarm/wip-20820-jewel

jewel: rgw: Segmentation fault when exporting rgw bucket in nfs-ganesha

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17281 from smithfarm/wip-20818-jewel

jewel: rgw hangs in RGWRealmReloader::reload on SIGHUP

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17280 from smithfarm/wip-20815-jewel

jewel: rgw: uninitialized memory is accessed during creation of bucket's metadata

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17279 from smithfarm/wip-20813-jewel

jewel: rgw: usage logging on tenated buckets causes invalid memory reads

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17277 from smithfarm/wip-20726-jewel

jewel: rgw: user quota did not work well on multipart upload

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #17649 from dillaman/wip-21346

jewel: qa/workunits/rbd: relax greps to support upgrade formatting change

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #17166 from smithfarm/wip-20719-jewel

jewel: rgw: Truncated objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17165 from smithfarm/wip-20715-jewel

jewel: rgw: radosgw-admin data sync run crash

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17164 from smithfarm/wip-20712-jewel

jewel: rgw: not initialized pointer cause rgw crash with ec data pool

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17159 from smithfarm/wip-20709-jewel

jewel: rgw: radosgw-admin: bucket rm with --bypass-gc and without --purge-data doesn't throw error message

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17156 from smithfarm/wip-20673-jewel

jewel: rgw: multisite: RGWRadosRemoveOmapKeysCR::request_complete return val is wrong

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17148 from smithfarm/wip-20292-jewel

jewel: rgw: multisite: log_meta on secondary zone causes continuous loop of metadata sync

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17147 from smithfarm/wip-20290-jewel

jewel: rgw: rgw_file: prevent conflict of mkdir between restarts

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #16856 from prallabh/wip-20895

jewel: rgw: bucket index check in radosgw-admin removes valid index

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #16767 from linuxbox2/jewel-rgw-mpart-race

jewel: rgw : fix race in RGWCompleteMultipart

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

qa: disable kstore to fix false positive case

Signed-off-by: Ning Yao <yaoning@unitedstack.com>

Merge pull request #17574 from smithfarm/wip-21297-jewel

jewel: libradosstriper processes arbitrary printf placeholders in user input

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

rgw: fix radosgw-admin data sync run crash

If sync thread have run before, then run data sync init. sync_status is still remain in rados pool. so no matter sync_status exists or not, if state is StateInit, sync_status.sync_info.num_shards should be updated.

Fixes: http://tracker.ceph.com/issues/20423
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit c307910d7131fc290f00bb8e33876e667afb72ec)

Conflicts:
    src/rgw/rgw_data_sync.cc (no data_sync_module or instance_id in jewel)

Merge pull request #16299 from smithfarm/wip-20262-jewel

jewel: rgw: datalog trim can't work as expected

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17167 from smithfarm/wip-20720-jewel

jewel: multisite: RGWPeriodPuller does not call RGWPeriod::reflect() on new period

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

tests: use XFS explicitly in singleton-nomsgr/pool-access.yaml

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>

qa/suites/rados/singleton-nomsgr: fix syntax

This parsed out as

  tasks:
  - install: null
  - ceph:
      conf:
        osd: osd max object name len = 400 osd max object namespace len = 64
  - workunit:
      clients:
        all:
        - rados/test_health_warnings.sh

which is clearly not correct.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from 85e2f3f31d25dbfd9770cc3b1f232025df53b628)

Conflicts:
    applied changes to pool-access.yaml instead of health-warnings.yaml

Merge pull request #15556 from cbodley/wip-19847

jewel: rgw: multisite: fixes for meta sync across periods

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17155 from smithfarm/wip-20641-jewel

jewel: rgw: multisite: lock is not released when RGWMetaSyncShardCR::full_sync() fails to write marker

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #17278 from smithfarm/wip-20728-jewel

jewel: rgw: multipart parts on versioned bucket create versioned bucket index entries

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

rgw: we no longer use log_meta

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit ac8b0077c1f53ff0037c4163489b838eebf8c247)

rgw: is_single_zonegroup doesn't use store or cct

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 0b0090cee249c5380efa4bb416d724a7e2dbfc08)

rgw: log_meta only for more than one zone

Fixes: http://tracker.ceph.com/issues/20357
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 088dba03ccc65609ef1c51306389ebcf1126ec8c)

rgw: only log metadata on metadata master zone

Fixes: http://tracker.ceph.com/issues/20244
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b8272f3607074a2f7cbfd08f7bbc82f22cf120ba)

Merge pull request #16296 from smithfarm/wip-20267-jewel

jewel: rbd: api: is_exclusive_lock_owner shouldn't return -EBUSY

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #17385 from dillaman/wip-19957

jewel: librbd: reacquire lock should update lock owner client id

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #17402 from dillaman/wip-20515

jewel: librbd: fail IO request when exclusive lock cannot be obtained

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #17412 from dillaman/wip-18704

jewel: librbd: prevent self-blacklisting during break lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

qa/workunits/rbd: relax greps to support upgrade formatting change

Fixes: http://tracker.ceph.com/issues/21181
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 273c84578b06905229a7c6eae7b1a12bbe60de95)

Conflicts:
qa/workunits/rbd/import_export.sh: trivial resolution

qa/suites/rados/singleton-nomsgr/pool-access: behave on ext4

We may land on an ext4 root partition.

Fixes: http://tracker.ceph.com/issues/20043
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from 657453d34914832f6e8012fbd69200e9680bd9ff)

Conflicts:
    applied the changes to pool-access.yaml instead of health-warnings.yaml
    to address a specific test failure in the jewel branch

tasks/ceph: construct CephManager earlier

Previously, if errors occurred during healthy(), then
the finally block would invoke osd_scrub_pgs, which relies
on CephManager being constructed, and it would die, hiding
the original exception.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit c444db12d455a1901da8041e92f5eff1a9875170)

Conflicts:
qa/tasks/ceph.py: the `tasks` directory was moved into
`qa` after the cherry-picked change was merged.
so apply the change manually to the ceph.py
under `qa` directory.
(cherry picked from commit bc71dabb4e311bd2461489e98e9b95d5b635effc)

kv: let ceph_logger destructed after db reset

if ceph_logger is deleted earlier than db, it may still be used by db, which cause a segment fault.

Signed-off-by: wumingqiao <wumingqiao@inspur.com>
(cherry picked from commit a5cd03c643d6cb9074dfd2952cde83435de1b9dd)

Merge pull request #15189 from mslovy/wip-19996-jewel

jewel: osd: fix infinite loops in fiemap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #16711 from cbodley/wip-20346

jewel: rgw: meta sync thread crash at RGWMetaSyncShardCR

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #17552 from dillaman/wip-21279

jewel: test/cls_rbd: mask newer feature bits to support upgrade tests

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

rgw_file:  fix LRU lane lock in evict_block()

Found by "Supriti Singh" <Supriti.Singh@suse.com>.

Fixes http://tracker.ceph.com/issues/21141

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 3301596734adcbda1e8e76a742935efdeb7518fd)

Merge pull request #17514 from smithfarm/wip-21232-jewel

jewel: core: interval_set: optimize intersect_of insert operations

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #16293 from smithfarm/wip-20460-jewel

jewel: core: test_envlibrados_for_rocksdb.yaml fails on crypto restart

Reviewed-by: Kefu Chai <kchai@redhat.com>

qa/suites/rbd: fixed cache override

Fixes: http://tracker.ceph.com/issues/21251
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 98061bb3d7ce6309ddb04ea4d7e9d44a7ecd09c6)

libradosstriper: remove format injection vulnerability

Fixes: http://tracker.ceph.com/issues/20240
Signed-off-by: Stan K <redrampage@selectel.ru>
(cherry picked from commit e94d3b9661d287e500cdf4e6c102d2e3bb04475e)

Merge pull request #17084 from badone/wip-ceph-disk-dmcrypt-key-jewel

jewel: ceph-disk: Use stdin for 'config-key put' command

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #17008 from asheplyakov/19182-bp-jewel

jewel: mon: fix force_pg_create pg stuck in creating bug

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

osd: Reverse order of op_has_sufficient_caps and do_pg_op

Fixes: http://tracker.ceph.com/issues/19790
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit a921882e7c676d68ed67b54301b49fd9bed42945)

Conflicts:
        qa/suites/rados/singleton-nomsgr/all/pool-access.yaml - drop mgr.x
            role, which is not needed in jewel and might even cause the test to
            fail
        src/osd/PrimaryLogPG.cc - this file doesn't exist in jewel, so apply
            the change manually to ReplicatedPG.cc (i.e., by moving the
            op->includes_pg_op() conditional below the
            !op_has_sufficient_caps(op) conditional)

Merge pull request #17133 from smithfarm/wip-21035-jewel

jewel: ceph-disk: systemd unit timesout too quickly

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>