qa/workunits/rados/test-upgrade-11.0.0: skip LibRadosMiscECPP.CompareExtentRange

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

Merge pull request #17082 from vumrao/wip-vumrao-scrub-recovery-false

jewel: osd: default osd_scrub_during_recovery=false

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #17841 from smithfarm/wip-21478-jewel

jewel: systemd: Add explicit Before=ceph.target

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #17847 from batrick/i21481

jewel: qa: use xfs instead of btrfs w/ filestore

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

Merge pull request #17101 from vumrao/wip-vumrao-jewel

jewel: core: Addition of online osd 'omap'compaction command

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: liuchang0812 <liuchang0812@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #17893 from dzafman/wip-19140-19224

jewel: osd ops (sent and?) arrive at osd out of order

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

Merge pull request #18080 from linuxbox2/jewel-awsv4-sort

jewel: radosgw: fix awsv4 header line sort order.

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #18165 from tchaikov/wip-no-btrfs-jewel

jewel: qa: use xfs instead of btrfs w/ filestore

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

qa/suites: add objectstore facet where it was missing

There are places where we were testing xfs vs btrfs on
filestore and now want to cover both filestore and bluestore.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 29a19dce30ddd41ef4e7806b6970a6daa738f39b)

Conflicts: remove bluestore.yaml as jewel does not support it. and
  remove links to objectstore from where the tests do not exist in jewel
  yet, for instance, qa/suites/mgr/basic.

Merge pull request #17594 from tchaikov/wip-jewel-20616

jewel: librados: copy out data to users' buffer for xio

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

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>

qa/workunits/cephtool/test.sh: add sudo for daemon compact

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2f272ab4512bb2248ac2ef180ece6d122f8e7479)

test: add test of ceph compact command

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit d1f24d053f367511cf12a43350bad246c5f28c9f)

 Conflicts:
qa/workunits/cephtool/test.sh
         Removed all tests which are not part of this backport

osd: new command compact via tell/daemon

user could manual compact OSD's omap as following:
1. ceph tell osd.id compact
2. ceph daemon osd.id compact
user's requests will be impacted during compaction.

Fixes: http://tracker.ceph.com/issues/19592
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit b4ad4297652df2f6ebfadcdededc7a47607ab534)

 Conflicts:
src/osd/OSD.cc
         Removed all admin socket register and unregister commands
         which are not part of this backport
         Changed admin_command to command variable because in jewel
         we use command variable.

os: export compact interface in ObjectStore and ObjectMap

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit eb5723d3abd4e1b6caec477090761d7919efc7bd)

 Conflicts:
src/os/bluestore/BlueStore.h
         Removed declarations which are not part of this backport
          inject_data_error()
          inject_mdata_error()
          debug_data_eio()
          debug_mdata_eio()
          debug_oj_on_delete()
src/os/filestore/FileStore.h
         Removed declarations which are not part of this backport
          set<ghobject_t> data_error_set
          set<ghobject_t> mdata_error_set
          inject_data_error() override
          inject_mdata_error() override

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)

qa: stop testing btrfs

This is too noisy and we don't recommend it anyway.

See http://tracker.ceph.com/issues/20169

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5a2d78ad85ef7adcb716f98b1ba28c1463d2ed53)

Conflicts:
qa/objectstore/filestore-btrfs.yaml: we add some notes in this
file in master, but didn't backport the commit(s) adding these notes to
jewel. we are removing this file anyway. so who cares!

qa/suites: remove 'fs' facet from all tests

The objectstore facet now covers bluestore, filestore(xfs),
and filestore(btrfs).

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 73981ad8078cba5d6efec8e67796a1dbc007063e)

Conflicts:
qa/suites/fs/recovery/xfs.yaml: in master, this file is factored
into a facet: a/suites/fs/recovery/fs/xfs.yaml, but in jewel, it still a
plain xfs.yaml. but it's good enough for us, as what we need is just
xfs.

qa/objectstore: split filestore into xfs and btrfs variants

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 208675afb131b578912649d6dbf2a34ad7f3826e)

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>

radosgw: fix awsv4 header line sort order.

The awsv4 signature calculation includes a list of header lines, which
are supposed to be sorted.  The existing code sorts by header name, but
it appears that in fact it is necessary to sort the whole header *line*,
not just the field name.  Sorting by just the field name usually works,
but not always.  The s3-tests teuthology suite includes
s3tests.functional.test_s3.test_object_header_acl_grants
s3tests.functional.test_s3.test_bucket_header_acl_grants
which include the following header lines,

x-amz-grant-read-acp:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-read:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-write-acp:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-write:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234

in this case, note that ':' needs to sort after '-'.

Fixes: http://tracker.ceph.com/issues/21607
Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit c11485e1b3a58631628644152816d9b22a17d8bd)

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>

osd: default osd_scrub_during_recovery=false

This is a more friendly behavior.  Tell users in the release notes how to
get the old behavior.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8dca17c067b51050308c5f1cb5eddd400fd6f3f0)

 Conflicts:
PendingReleaseNotes "trivial resolution"

Signed-off-by: Vikhyat Umrao <vumrao@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>

qa/tasks/thrashosds: chance_thrash_cluster_full

Induce a momentarily full cluster.

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

Conflicts:
qa/tasks/ceph_manager.py (trivial)
qa/tasks/thrashosds.py (trivial)

osdc/Objecter: resend RWORDERED ops on full

Our condition for respecting the FULL flag is complex, and involves
the WRITE | RWORDERED flags vs the FULL_FORCE | FULL_TRY flags.  Previously,
we could block a read bc of RWORDRED but not resend it later.

Fix by capturing the complex condition in a respects_full() bool and using
it both for the blocking-on-send and resending-on-possibly-notfull-later
checks.

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

osdc/Objecter: If osd full, it should pause read op which w/ rwordered flag.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 07b2a22210e26eac1b2825c30629788da05e5e12)

qa: use xfs instead of btrfs w/ filestore

Backport of work from 6369120d63ba8077f0f5bb8b4280ee72ce269568.

Fixes: http://tracker.ceph.com/issues/21481
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

systemd: Add explicit Before=ceph.target

The PartOf= and WantedBy= directives in the various systemd
unit files and targets create the following logical hierarchy:

- ceph.target
  - ceph-fuse.target
    - ceph-fuse@.service
  - ceph-mds.target
    - ceph-mds@.service
  - ceph-mgr.target
    - ceph-mgr@.service
  - ceph-mon.target
    - ceph-mon@.service
  - ceph-osd.target
    - ceph-osd@.service
  - ceph-radosgw.target
    - ceph-radosgw@.service
  - ceph-rbd-mirror.target
    - ceph-rbd-mirror@.service

Additionally, the ceph-{fuse,mds,mon,osd,radosgw,rbd-mirror}
targets have WantedBy=multi-user.target.  This gives the
following behaviour:

- `systemctl {start,stop,restart}` of any target will restart
  all dependent services (e.g.: `systemctl restart ceph.target`
  will restart all services; `systemctl restart ceph-mon.target`
  will restart all the mons, and so forth).
- `systemctl {enable,disable}` for the second level targets
  (ceph-mon.target etc.) will cause depenent services to come
  up on boot, or not (of course the individual services can
  be enabled or disabled as well - for a service to start
  on boot, both the service and its target must be enabled;
  disabling either will cause the service to be disabled).
- `systemctl {enable,disable} ceph.target` has no effect on
  whether or not services come up at boot; if the second level
  targets and services are enabled, they'll start regardless of
  whether ceph.target is enabled.  This is due to the second
  level targets all having WantedBy=multi-user.target.
- The OSDs will always start regardless of ceph-osd.target
  (unless they are explicitly masked), thanks to udev magic.

So far, so good.  Except, several users have encountered
services not starting with the following error:

  Failed to start ceph-osd@5.service: Transaction order is
  cyclic. See system logs for details.

I've not been able to reproduce this myself in such a way as to
cause OSDs to fail to start, but I *have* managed to get systemd
into that same confused state, as follows:

- Disable ceph.target, ceph-mon.target, ceph-osd.target,
  ceph-mon@$(hostname).service and all ceph-osd instances.
- Re-enable all of the above.

At this point, everything is fine, but if I then subseqently
disable ceph.target, *then* try `systemctl restart ceph.target`,
I get "Failed to restart ceph.target: Transaction order is cyclic.
See system logs for details."

Explicitly adding Before=ceph.target to each second level target
prevents systemd from becoming confused in this situation.

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 357dfa5954a3386c92dee3289a669a2c08d41eda)

Conflicts:
systemd/ceph-fuse.target (file does not exist in jewel; omitted)
systemd/ceph-mgr.target (file does not exist in jewel; omitted)

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>