tests: upgrade/hammer-x/v0-94-6-mon-overload: tweak packages list

Include some hammer dependencies that aren't in the jewel default packages
list, and exclude some java packages that may not be in the hammer repo and are
not needed for the upgrade test in any case.

N.B.: This cannot be cherry-picked from master because upgrade/hammer-x was
dropped in master.

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

tests: upgrade/hammer-x: new v0-94-6-mon-overload subsuite

This is not a cherry-pick from master because direct upgrades
from hammer to kraken+ are not supported.

Fixes: http://tracker.ceph.com/issues/19829
References: http://tracker.ceph.com/issues/19508
Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #15936 from batrick/i20412

qa: enable quotas for pre-luminous quota tests

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

qa: enable quotas for pre-luminous quota tests

This cannot be cherry-picked from master because the config option is removed
since 0f250a889dba2100d3afcea0a18e4f6a8d086b86.

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

Merge pull request #15933 from smithfarm/wip-hammer-jewel-x

jewel: tests: drop upgrade/hammer-jewel-x

tests: drop upgrade/hammer-jewel-x

This suite doesn't have any test logic in it. Its existence in the jewel branch
appears to be an oversight.

This cannot be cherry-picked from master because the upgrade/hammer-jewel-x
suite is present (and justified) in master and is not currently being dropped
there.

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

Merge pull request #15438 from Vicente-Cheng/wip-20027-jewel

jewel: mds: issue new caps when sending reply to client

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #15000 from jan--f/wip-19846-jewel

jewel: cephfs: normalize file open flags internally used by cephfs

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #15383 from asheplyakov/20014-bp-jewel

jewel: cls/rgw: list_plain_entries() stops before bi_log entries

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

Merge pull request #15870 from smithfarm/wip-swift-task-move-jewel

tests: move swift.py task from teuthology to ceph, phase one (jewel)

Merge pull request #15842 from smithfarm/wip-sortbitwise-jewel

qa/suites/upgrade/hammer-x: set "sortbitwise" for jewel clusters

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

Merge pull request #15468 from smithfarm/wip-20140-jewel

jewel: cephfs: Journaler may execute on_safe contexts prematurely

Reviewed-by: John Spray <john.spray@redhat.com>

tests: swift.py: tweak imports

The ".." form only works within the teuthology repo. With swift.py now in the
Ceph repo, we have to be explicit.

Error message was: "ValueError: Attempted relative import beyond toplevel
package

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

tests: swift.py: clone the ceph-jewel branch

The master branch of ceph/swift.git contains tests that are incompatible with
Jewel and Hammer. The ceph-jewel branch omits these tests.

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

Merge pull request #15472 from smithfarm/wip-20148-jewel

jewel: mds: Too many stat ops when trying to probe a large file

Reviewed-by: John Spray <john.spray@redhat.com>

Merge branch 'master' of /home/smithfarm/src/ceph/upstream/teuthology into wip-swift-task-move-jewel

tests: move swift.py task to qa/tasks

In preparation for moving this task from ceph/teuthology.git into ceph/ceph.git

The move is necessary because jewel-specific changes are needed, yet teuthology
does not maintain a separate branch for jewel. Also, swift.py is a
Ceph-specific task so it makes more sense to have it in Ceph.

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

Merge pull request #15529 from badone/wip-async-sleep-timer-fix-jewel

jewel:  osd: Implement asynchronous scrub sleep

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

qa/suites/upgrade/hammer-x: set "sortbitwise" for jewel clusters

Inspired by 3734280522a913ca8340ebc98b80978f63bade6f

This cannot be cherry-picked from master because master does not have
qa/suites/upgrade/hammer-x

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

Merge pull request #15824 from tchaikov/jewel

qa/workunits/rados/test-upgrade-*: whitelist tests the right way

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

qa/workunits/rados/test-upgrade-*: whitelist tests the right way

--gtest_filter=POSTIVE_PATTERNS[-NEGATIVE_PATTERNS], so we cannot add
multiple exclusive patterns using -pattern:-pattern, instead, we should
use: -pattern:pattern

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
        qa/workunits/rados/test-upgrade-v11.0.0.sh: this change is not
    cherry-picked from master, because the clone-range op was removed
    from master. and only supported in pre-luminous releases.

Merge pull request #14661 from smithfarm/wip-19575-jewel

jewel: rgw: unsafe access in RGWListBucket_ObjStore_SWIFT::send_response()

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

Merge pull request #15778 from tchaikov/wip-upgrade-without-clone-range-jewel

qa/workunits/rados/test-upgrade-*: whitelist tests for master

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

qa/workunits/rados/test-upgrade-*: whitelist tests for master

The jewel-x upgrade test now runs this script against a mixed cluster on
a machine with code from master installed.  That means we have to
skip any new tests that will fail on a mixed cluster. CloneRange was
removed in 0d7b0b7.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
    qa/workunits/rados/test-upgrade-v11.0.0.sh: this change is not
cherry-picked from master, because the clone-range op was removed from
master. and only supported in pre-luminous releases.

mds: issue new caps when sending reply to client

After Locker::issue_new_caps() adds new Capability data struct,
do not issue caps immediately. Let CInode::encode_inodestate()
do the job instead. This can avoid various races that early reply
is not allowed, caps that haven't been sent to client gets revoked.

Fixes: http://tracker.ceph.com/issues/19635
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 799703a4acb49db0b6cc99a23e4326767e694c3a)

rgw: fix crash when listing objects via swift

Fixes: http://tracker.ceph.com/issues/19249
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a9ec5e8ce184e19c009863db4d3519f9d8af91bd)

Conflicts:
        src/rgw/rgw_rest_swift.cc ("key" element of RGWObjEnt struct
           is not a reference; fix)

(cherry picked from commit 92b35155ff7b7492f3c50bf4f2ff0ffef2ca1c55)

Merge pull request #14752 from cbodley/wip-19474

jewel: rgw: allow system users to read SLO parts

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

client: update the 'approaching max_size' code

The old 'approaching max_size' code expects MDS set max_size to
'2 x reported_size'. This is no longer true. The new code reports
file size when half of previous max_size increment has been used.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 9316b0442c6f828dcf8da952e4c7a63c4db1398d)

Conflicts:
        src/client/Client.cc - in jewel, second argument to check_caps() is
            a bool (see 0df562a8e13 which is not in jewel)

mds: limit client writable range increment

For very large file, setting the writable range to '2 * file_size'
causes file recovery to run a long time. To recover a 1T file, Filer
needs to probe 2T~1T range.

Fixes: http://tracker.ceph.com/issues/19955
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 538f35bef944b18e9bca2b15ed7f4e8807ef0554)

Conflicts:
        src/mds/Locker.h - in jewel, file_update_finish() has different
            arguments than it does in master

osdc/Journaler: avoid executing on_safe contexts prematurely

Journaler::_do_flush() can skip flushing some data when prezered
journal space isn't enough. Before updating Journaler::next_safe_pos,
we need to check if Journaler::_do_flush() has flushed enough data.

Fixes: http://tracker.ceph.com/issues/20055
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 6511e7a9e35a14216c03cd6921ca4d232274f953)

osdc/Journaler: make header write_pos align to boundary of flushed entry

This can speed up the process that detects and drops partial written
entry in the log tail.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 8ae2962b79903e217fda83cea4140af64b5d6883)

Conflicts:
src/osdc/Journaler.cc - 8d4f6b92cba is not being backported to jewel
src/osdc/Journaler.h - Journaler::Journaler initializer list is different in jewel, compared to master

Merge pull request #14672 from smithfarm/wip-19334-jewel

jewel: MDS heartbeat timeout during rejoin, when working with large amount of caps/inodes

Reviewed-by: John Spray <john.spray@redhat.com>

pybind: fix cephfs.OSError initialization

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "cephfs.pyx", line 672, in cephfs.LibCephFS.open (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:10160)
  File "cephfs.pyx", line 155, in cephfs.OSError.__init__ (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:1889)
TypeError: __init__() takes exactly 3 positional arguments (2 given)

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit e6493f64ba4592b8dca54ece4464efa6c7f331a7)

pybind: fix open flags calculation

(O_WRONLY | O_RDWR) is invaild open flags

Fixes: http://tracker.ceph.com/issues/19890
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 2c25c99cb4572ffae97555a56b24a4c4097dcdec)

Merge pull request #14677 from smithfarm/wip-19665-jewel

jewel: mds: C_MDSInternalNoop::complete doesn't free itself

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #15466 from smithfarm/wip-19762-jewel

jewel: cephfs: non-local quota changes not visible until some IO is done

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14700 from smithfarm/wip-19709-jewel

jewel: mds: enable start when session ino info is corrupt

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14685 from smithfarm/wip-19675-jewel

jewel: cephfs: Test failure: test_data_isolated (tasks.cephfs.test_volume_client.TestVolumeClient)

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14684 from smithfarm/wip-19673-jewel

jewel: cephfs: mds is crushed, after I set about 400 64KB xattr kv pairs to a file

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14683 from smithfarm/wip-19671-jewel

jewel: cephfs: MDS assert failed when shutting down

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14682 from smithfarm/wip-19668-jewel

jewel: cephfs: MDS goes readonly writing backtrace for a file whose data pool has been removed

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14679 from smithfarm/wip-19666-jewel

jewel: cephfs: The mount point break off when mds switch hanppened.

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14676 from smithfarm/wip-19619-jewel

jewel: cephfs: MDS server crashes due to inconsistent metadata.

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14674 from smithfarm/wip-19482-jewel

jewel: cephfs: No output for ceph mds rmfailed 0 --yes-i-really-mean-it command

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14671 from smithfarm/wip-19044-jewel

jewel: tests: buffer overflow in test LibCephFS.DirLs

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14670 from smithfarm/wip-18949-jewel

jewel: mds: avoid reusing deleted inode in StrayManager::_purge_stray_logged

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14669 from smithfarm/wip-18900-jewel

jewel: cephfs: Test failure: test_open_inode

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14668 from smithfarm/wip-18705-jewel

jewel: mds: fragment space check can cause replayed request fail

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14698 from smithfarm/wip-19677-jewel

jewel: cephfs: ceph-fuse does not recover after lost connection to MDS

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14766 from smithfarm/wip-19757-jewel

jewel: rgw: fix failed to create bucket if a non-master zonegroup has a single zone

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #14787 from linuxbox2/jewel-rgw-shard-limit-ck

jewel: rgw: add bucket size limit check to radosgw-admin

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #14789 from mdw-at-linuxbox/wip-jewel-rgw-rvk

jewel: rgw: swift: disable revocation thread if sleep == 0 || cache_size == 0

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #14815 from smithfarm/wip-19786-jewel

jewel: rgw: failure to create s3 type subuser from admin rest api

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #15312 from theanalyst/wip-20078

jewel: rgw: only append zonegroups to rest params if not empty

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

Merge pull request #15382 from theanalyst/wip-mem-leak2

jewel: rgw:fix memory leaks in data/md sync

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

osd: Move scrub sleep timer to osdservice

PR 14886 erroneously creates a scrub sleep timer for every pg resulting
in a proliferation of threads. Move the timer to the osd service so
there can be only one.

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

Conflicts:
        src/osd/PG.cc - ceph_clock_now requires a CephContext argmunent
        in Jewel

osd: Implement asynchronous scrub sleep

Rather than blocking the main op queue just do an async sleep.

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

Client.cc: adjust Client::_getattr calls

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

qa/cephfs: use getfattr/setfattr helpers

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

Conflicts:
        qa/tasks/cephfs/test_data_scan.py: difference in the
            self._mount.run_shell() call in NonDefaultLayout::write (which is
            being dropped by this commit) - in jewel it has "sudo", and in
            master it doesn't

tasks/cephfs: fix race while mounting

This could fail if the mount hadn't finished
coming up.

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

qa: add test for reading quotas from different clients

Fixes: http://tracker.ceph.com/issues/17939
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 61617f8f10a6322603a9add77980865cd972ef97)

client: _getattr on quota_root before using in statfs

...so that after someone adjusts the quota settings
on an inode that another client is using as its mount root,
the change is visible immediately on the other client.

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

client: getattr before read on ceph.* xattrs

Previously we were returning values for quota, layout
xattrs without any kind of update -- the user just got
whatever happened to be in our cache.

Clearly this extra round trip has a cost, but reads of
these xattrs are fairly rare, happening on admin
intervention rather than in normal operation.

Fixes: http://tracker.ceph.com/issues/17939
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 532dc4b68e538c189ef828f67cecd0d647a62250)

Merge pull request #15416 from dzafman/wip-20126

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

osd: Object level shard errors are tracked and used if no auth available

Shards with object mismatch are tracked to mark them inconsistent
Fix test because storing omap_digest in object_info not behaving as before

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

Conflicts:
src/test/osd/osd-scrub-repair.sh (no alloc_hint in object_info)

rgw:fix memory leaks

Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 73e5be2b6133cf4caa0e5e5c8c9eae748b785dbf)

cls/rgw: list_plain_entries() stops before bi_log entries

list_plain_entries() was using encode_obj_versioned_data_key() to set
its end_key, which gives a prefix of BI_BUCKET_OBJ_INSTANCE_INDEX[=2]

that range between start_key and end_key would not only span the
BI_BUCKET_OBJS_INDEX[=0] prefixes, but BI_BUCKET_LOG_INDEX[=1] prefixes
as well. this can result in list_plain_entries() trying and failing to
decode a rgw_bi_log_entry as a rgw_bucket_dir_entry

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

Merge pull request #15360 from liewegas/wip-jewel-master-mixed

qa/workunits/rados/test-upgrade-*: whitelist tests for master

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

qa/workunits/rados/test-upgrade-*: whitelist tests for master

The jewel-x upgrade test now runs this script against a mixed cluster on
a machine with code from master installed.  That means we have to skip
any new tests that will fail on a mixed cluster.

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

Merge pull request #15208 from liewegas/wip-sortbitwise-jewel

mon: fix 'sortbitwise' warning on jewel

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

Merge pull request #14851 from yehudasa/wip-rgw-support-ragweed-jewel

jewel: rgw: add apis to support ragweed suite

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

rgw: rest conn functions cleanup, only append zonegroup if not empty

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 4e41af19846db75081cb0ddb7b33dc2bb9321ace)

rgw: rest and http client code to use param vectors

Replaces param/header lists with vectors. In these cases, we're only ever
adding to the back of the list, so a vector should be more efficient.
Also moves param_pair_t/param_vec_t higher up the include chain for
cleaner function signatures.

Signed-off-by: Karol Mroz <kmroz@suse.com>
(cherry picked from commit d4a2527872e0f5c3ae2874bb7d0ff459ae83cfd4)

Conflicts:
src/rgw/rgw_http_client.cc
trivial ws conflict on rebase

Merge pull request #14765 from smithfarm/wip-18972-jewel

jewel: ceph-disk does not support cluster names different than 'ceph'

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

qa/suites/rados/singleton-nomsgr/*: set sortbitwise after upgrade

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

mon/OSDMonitor: fixup sortbitwise flag warning

"ceph -s" does not report warning when using
command "ceph osd unset sortbitwise" to drop
sortbitwise flag.
we should use "osdmap.get_up_osd_features() &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT"
instead of "(osdmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL) &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT)",
because osdmap.get_features only get local "features"

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
(cherry picked from commit c25ee187e28724846d0011cd8145e16956d3636e)

mon: remove config option to disable no sortbitwise warning

We'll require this soon.

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

Merge pull request #13450 from dreamhost/wip-18887-jewel

jewel: msg: IPv6 Heartbeat packets are not marked with DSCP QoS - simple messenger

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

fs: normalize file open flags internally used by cephfs

The file open flags (O_foo) are platform specific. Normalize these flags
before they are send to the MDS. For processing of client messages the
MDS should only compare to these normalized flags.
Otherwise this can lead to bogus flags getting transmitted on ppc64.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 88d2da5e93198e69435e288ce00d216d5fe27f80)

Conflicts:
src/client/Client.cc
          Conflicts can be resolved by choosing changes from HEAD and
          adding a call to ceph_flags_sys2wire where flags are logged.
src/mds/Server.cc
          Conflicts can be resolved by choosing changes from HEAD and
          while making sure that the MDS compares request O_ flags the
          the CEPH_O_ flags, since all wire O_ flags are normalized.

msg/simple/Pipe: manual backport of fix in PR#14795

Manual backport of errno fixup from PR#14795
(6f1037e22c2a304795895498cdc955e0ef80f8e3), as noted by
https://github.com/ceph/ceph/pull/13450#discussion_r114696885.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Merge pull request #14667 from smithfarm/wip-18699-jewel

jewel: client: fix the cross-quota rename boundary check conditions

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>

Merge pull request #14332 from shinobu-x/wip-19396-jewel

 jewel: Objecter::epoch_barrier isn't respected in _op_submit()

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

Merge pull request #14204 from dzafman/wip-18533-jewel

jewel: core: two instances of omap_digest mismatch

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

Merge pull request #13884 from shinobu-x/wip-19119-jewel

jewel: pre-jewel "osd rm" incrementals are misinterpreted

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

Merge pull request #13647 from mslovy/wip-19083-jewel

jewel: osd: preserve allocation hint attribute during recovery

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>

Merge pull request #14791 from smithfarm/wip-19774-jewel

jewel: osd: promote throttle parameters are reversed

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

Merge pull request #14763 from smithfarm/wip-19562-jewel

jewel: api_misc: [  FAILED  ] LibRadosMiscConnectFailure.ConnectFailure

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

rgw: new rest api to retrieve object layout

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2768583dc486109e49d209243675b99fdd39e92c)

rgw: rest api to read zone config params

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a220a2efbfd675e6abf14ae33c21005bcbf6dadf)

Merge pull request #14481 from dillaman/wip-19468-jewel

jewel: librbd: is_exclusive_lock_owner API should ping OSD

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

Merge pull request #14666 from smithfarm/wip-19612-jewel

jewel: librbd: Issues with C API image metadata retrieval functions

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

Merge pull request #14664 from smithfarm/wip-19325-jewel

jewel: rbd: [api] temporarily restrict (rbd_)mirror_peer_add from adding multiple peers

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

Merge pull request #14694 from ceph/wip-bp-systemd

[backport] qa/tasks: systemd test backport to jewel

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

Merge pull request #13544 from shinobu-x/wip-18932-jewel

jewel: tests: 'ceph auth import -i' overwrites caps, should alert user before overwrite

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

filestore, tools: Fix logging of DBObjectMap check() repairs

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

osd: Simplify DBObjectMap by no longer creating complete tables

Bump the version for new maps to 3
Make clone less efficient but simpler
Add rename operation (use instead of clone/unlink)
For now keep code that understands version 2 maps

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

No ghobject_t::operator>() so use Kraken cmp_bitwise() instead
Need to use MIN_GHOBJ/MAX_GHOBJ instead of std::min/std::max

ceph-osdomap-tool: Fix seg fault with large amount of check error output

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

osd: Add automatic repair for DBObjectMap bug

Add repair command to ceph-osdomap-tool too

Under some situations the previous rm_keys() code would
generated a corrupt complete table.  There is no way to
figure out what the table should look like now.  By removing
the entries we fix the corruption and aren't much worse off
because the corruption caused some deleted keys to re-appear.

This doesn't breaking the parent/child relationship during
repair because some of the keys may still be contained
in the parent.

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

Conflicts:
src/os/filestore/DBObjectMap.h (trivial)

ceph-osdomap-tool: Fix tool exit status

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

DBObjectMap: rewrite rm_keys and merge_new_complete

Leverage the updated in_complete_region and needs_parent to simplify
these methods.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit c4dffb68eaafe724f7fdae93a4285a7f8003ea29)