Merge pull request #11899 from SUSE/wip-17840-hammer

hammer: rgw: the value of total_time is wrong in the result of 'radosgw-admin log show' opt

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

Merge pull request #11927 from SUSE/wip-17764-hammer

hammer: osd: fix collection_list shadow return value

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #12071 from SUSE/wip-17957-hammer

hammer: RWLock.h: 124: FAILED assert(r == 0) in rados-jewel-distro-basic-smithi

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11929 from SUSE/wip-17359-hammer

hammer: tools: ceph-objectstore-tool crashes if --journal-path <a-directory>

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

Merge pull request #11930 from SUSE/wip-17346-hammer

hammer: cephx: Fix multiple segfaults due to attempts to encrypt or decrypt

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

Merge pull request #11931 from SUSE/wip-17333-hammer

hammer: tools: crushtool --compile generates output despite missing item

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

Merge pull request #11932 from SUSE/wip-17146-hammer

hammer: PG::choose_acting valgrind error or ./common/hobject.h: 182: FAILED assert(!max || (*this == hobject_t(hobject_t::get_max())))

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11933 from SUSE/wip-17142-hammer

hammer: osd: PG::_update_calc_stats wrong for CRUSH_ITEM_NONE up set items

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11934 from SUSE/wip-17120-hammer

hammer: mon: %USED of ceph df is wrong

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

Merge pull request #11935 from SUSE/wip-16870-hammer

hammer: osd: crash on EIO during deep-scrubbing

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11937 from SUSE/wip-16428-hammer

hammer: mon: prepare_pgtemp needs to only update up_thru if newer than the existing one

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11938 from SUSE/wip-14323-hammer

hammer: msg: OpTracker needs to release the message throttle in _unregistered

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11939 from SUSE/wip-13927-hammer

hammer: mds: fix cephfs-java ftruncate unit test failure

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

Merge pull request #11946 from SUSE/wip-17883-hammer

hammer: mon: OSDs marked OUT wrongly after monitor failover

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

Merge pull request #11948 from SUSE/wip-17671-hammer

hammer: rbd: export diff should open image as read-only

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #11949 from SUSE/wip-17374-hammer

hammer: librbd: image.stat() call in librbdpy fails sometimes

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

Merge pull request #11950 from SUSE/wip-17123-hammer

hammer: rgw: COPY broke multipart files uploaded under dumpling

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

Merge pull request #11951 from SUSE/wip-16594-hammer

hammer: rgw: swift: ranged request on a DLO provides wrong values in Content-Range HTTP header

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

Merge pull request #11952 from SUSE/wip-16318-hammer

hammer: rgw: fix inconsistent uid/email handling in radosgw-admin

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

Merge pull request #12018 from trociny/wip-17068-hammer

hammer: librbd: request exclusive lock if current owner cannot execute op

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

Merge pull request #11045 from SUSE/wip-17150-hammer

hammer: rgw: Anonymous user is able to read bucket with authenticated read ACL

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

Merge pull request #11809 from SUSE/wip-17631-hammer

hammer: rgw: fix crash when client posts object with null condition

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

Merge pull request #12006 from SUSE/wip-17905-hammer

hammer: mon: MonmapMonitor should return success when MON will be removed

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

os/ObjectStore: fix _update_op for split dest_cid

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

rbd: this command should be EXPORT_DIFF

Fixes: http://tracker.ceph.com/issues/17671
Signed-off-by: liyankun <lioveni99@gmail.com>

mon: update mon(peon)'s down_pending_out when osd up

Fixes: http://tracker.ceph.com/issues/17719
Signed-off-by: Dong Wu <archer.wudong@gmail.com>
(cherry picked from commit 664254a17afbad86983ea5b5b8d385662d89e65e)

Conflicts:
    src/mon/OSDMonitor.cc (auto declaration for variable "found" is a C++11ism,
        replace with the full verbose C++98 type)

librbd: request exclusive lock if current owner cannot execute op

This is a direct commit to hammer due to librbd code has evolved
significantly in the master.

Fixes: http://tracker.ceph.com/issues/17068
Signed-off-by: Mykola Golub <mgolub@mirantis.com>

mon: MonmapMonitor: return success when monitor will be removed

Fixes: http://tracker.ceph.com/issues/17725
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)

Conflicts:
src/mon/MonmapMonitor.cc (just inserted the "err = 0" assignment
        immediately after the error message line)

rgw-admin: return error on email address conflict (add user)

Fixes the error return inconsistency documented in upstream
Ceph issue #13598

Revised after upstream review, permits changing email address as
originally (but use case-insensitive comp).

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

Conflicts:
src/rgw/rgw_user.cc (there is no op_state.found_by_email
        conditional in hammer)

rgw-admin: convert user email addresses to lower case

Fixes the email address inconsistency documented in upstream
Ceph BUG #13598

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

rgw: fix wrong length in Content-Range HTTP header of Swift's DLO.

Fixes: #13452
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit b48f3d774129e0b37531fccda513626bd8ef07e5)

rgw: fix wrong first byte pos in Content-Range HTTP header of Swift's DLO.

Fixes: #13452
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 66f47f35bbb4966cb289811672938b90ae6d44ae)

rgw: adjust manifest head object

adjust the manifest head object:
 - when reading manifest, set the head object to the object
   we read the manifest from (and its size). Some manifests are
   broken and point at a different object
 - when copying multipart object, set the manifest head object to
   point at the new head object

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

rgw: adjust objs when copying obj with explicit_objs set

If the head object contains data, need to set it in the list of
objs (in addition to being pointed at by head_obj).

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

rgw: patch manifest to handle explicit objs copy issue

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

librbd: block name prefix might overflow fixed size C-string

The issue which resulted in too large v2 image ids was fixed
under #16887.

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

OpRequest: release the message throttle when unregistered

We don't want messages in the OpTracker history hanging on to
message throttle.

Fixes: #14248
Backport: hammer, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 67be35cba7c384353b0b6d49284a4ead94c4152e)

Conflicts:
    src/msg/Message.h (s/nullptr/0/ because C++98)

OSDMonitor::prepare_pgtemp: only update up_thru if newer

Fixes: http://tracker.ceph.com/issues/16185
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5f2bd7b6b28aad96d68444b22c04b8b24564616b)

Conflicts:
src/mon/OSDMonitor.cc (master uses C++11 "auto" for new_up_thru
        iterator, replace with explicit type)
src/mon/OSDMonitor.h (trivial resolution)

crush/CrushCompiler: error out as long as parse fails

do not output compiled crush map if anything goes wrong when parsing
crush map.

Fixes: http://tracker.ceph.com/issues/17306
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b2c0a079dc074c907e1bc429861230096534f597)

Conflicts:
    src/test/cli/crushtool/compile-decompile-recompile.t (hammer needs $TESTDIR/ prefix)

mds: fix out-of-order messages

When MDS is no longer laggy, it should process deferred messages
first, then process newly received messages.

Fix: #11258
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit ccdeaf87df8b66e09f6b20950b57ac61bf213086)

pg: restore correct behavior of read() callers

This patch is inspired by fabd6357e42e526d2704d7cb80375c12d731df8d but is not a
cherry-pick.

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

mon/PGMonitor: calc the %USED of pool using used/(used+avail)

we were using
"the raw space used by this pool" / "the raw space of the whole cluster"
as the %USED. but it's wrong:

- there is chance that not all OSDs are assigned to the pool in question
- we can not utilize all the raw space for the pool: there is overhead.
  and the size of available space for a pool is capped by the assigned
  OSD with minimal free space.

so we should use
 USED / (USED + AVAIL)
as the %USED. so once we have no AVAIL space left, %USED will be 100%.

Fixes: http://tracker.ceph.com/issues/16933
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 08532ea166dfd97c548d9f1fb478e163021cdda3)

Conflicts:
src/test/mon/CMakeLists.txt (file does not exist in hammer)

mon/PGMonitor: mark dump_object_stat_sum() as static

so we can test this method without create an instance of PGMonitor.

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

Conflicts:
src/mon/PGMonitor.cc ("const" suffix of function definition was removed
            in master, but in hammer it wasn't there, so no change necessary)
src/mon/PGMonitor.h (added static prefix to function declaration; did
            not remove "const" suffix because it wasn't there in hammer)

PG: use upset rather than up for _update_calc_stats

Fixes: http://tracker.ceph.com/issues/16998
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 200cae8c9db99b3dede377f74413cc0b15033e1f)

PG: introduce and maintain upset

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

Cleanup: delete find_best_info again

After called find_best_info find a auth_pg_shard, it must be not incomplete,
so it will not enter find_best_info again.

Signed-off-by: Tao Chang <changtao@hihuron.com>
(cherry picked from commit a25cfc4d46c03d8d78e0254c728ea5c29e2246e1)

Conflicts:
src/osd/PG.cc (trivial resolution)

cephx: Fix multiple segfaults due to attempts to encrypt or decrypt
an empty secret and a null CryptoKeyHandler

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

os/filestore/FileJournal: fail out if FileJournal is not block device or regular file

otherwise JournalingFileStore will assert when deleting FileJournal
which still has the non block/regular file opened.

Fixes: http://tracker.ceph.com/issues/17307
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7431eec6fd24cd08ca6c76a9893e3f6e8c63a916)

osd/PGBackend: fix collection_list shadow return value

Fixes: http://tracker.ceph.com/issues/17713
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit 8a53a604f375eb568a6fc88a402a6afd83fa151a)

Conflicts:
src/osd/PGBackend.cc (master is using store->collection_list and ch;
            hammer is using store->collection_list_partial and coll)

13207: Rados Gateway: Anonymous user is able to read bucket with authenticated read ACL

Signed-off-by: root <rahul.1aggarwal@gmail.com>
(cherry picked from commit 99ba6610a8f437604cadf68cbe9969def893e870)

rgw: fix the field 'total_time'  of log entry in log show opt

Fixes: http://tracker.ceph.com/issues/17598
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 8f4825c5f012c77a3a91e22706dcab9c6067d77e)

rgw: handle empty POST condition

Fixes: http://tracker.ceph.com/issues/17635
Before accessing json entity, need to check that iterator is valid.
If there is no entry return appropriate error code.

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

Merge pull request #11372 from ceph/wip-17386-hammer

hammer: doc: add "Upgrading to Hammer" section

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

doc: add "to Hammer" upgrade section

Fixes: http://tracker.ceph.com/issues/17534
Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11253 from ceph/wip-offline-split-hammer2

ceph-objectstore-tool: add a way to split filestore directories offline

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

ceph-objectstore-tool: add a way to split filestore directories offline

Use the usual split code, and split each dir that meets the
usual split criteria.

This can be run with lower than usual split settings, to avoid costly
online splits. To make sure the directories are not merged again, use
a load merge threshold (e.g. filestore merge threshold = 1), and
adjust the split multiplier accordingly.

Fixes: http://tracker.ceph.com/issues/17220
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit e7b0428e0e8d8f5459311dc698d94a3ac4f04684)

Conflicts:
src/tools/ceph_objectstore_tool.cc
* remove c++11 auto usage
* change HashIndex::list_subdirs() call to use set instead of vector
* adjust to hammer signature of coll_t::is_pg()

Merge pull request #11140 from cbodley/wip-radosgw-admin-man-hammer

hammer: add orphan options to radosgw-admin --help and man page

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

man: add orphan options to radosgw-admin.8

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

Add two options to radosgw-admin.rst manpage

Add '--job-id' and '--max-concurrent-ios' to Orphan Search Options

Fixes: http://tracker.ceph.com/issues/17281
Signed-off-by: Thomas Serlin <tserlin@redhat.com>
(cherry picked from commit 697f30d86f49b73c981c06375ab2937570b1db01)

radosgw-admin: add "--orphan-stale-secs" to --help

The radosgw-admin --help did not include the description of the
`--orphan-stale-secs` option of the `orphans find` command. The option
sets the number of seconds to wait before declaring an object to be an
orphan.

Fixes: http://tracker.ceph.com/issues/17280
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 354059ae43b4f4cc797da1669715399cd96a4738)

rgw_admin: improve the orphans find help

Adding  a few missing commandline switches and improve the help message

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 27e4c46f741a5f908d5c8ca1af227b3581c697f6)

doc: add "--orphan-stale-secs" to radosgw-admin(8)

The radosgw-admin(8) manual page did not include the description of the
`--orphan-stale-secs` option of the `orphans find` command. The option sets
the number of seconds to wait before declaring an object to be an
orphan.

Fixes: http://tracker.ceph.com/issues/17280
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit a676c516069cc448591018ecf4f7d1f7f7bc3bfd)

Merge pull request #10839 from oritwas/hammer-default-quota

Hammer default quota

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

0.94.9

Merge pull request #10913 from ceph/wip-revert-random-uuid-hammer

hammer: revert use of boost for uuids

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

rgw: Add documentation for RGW default quota

Fixes http://tracker.ceph.com/issues/16447
Cherry picked from e3ab3476146cf0fe604783e9e5a0d63237271735

This was modified to use size in kB, rather than size in bytes, since
Jewel has not yet been converted to use size in bytes.

Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 11328d7dcc6634ab81ebce4801ebc243a27b84b0)

rgw: Do not bother to check against conf values during quota handling

Fixes http://tracker.ceph.com/issues/16447
Cherry picked from 17d2c1712a5b72315a47ab0f8380331bfd478c0b

This was modified to use size in kB, rather than size in bytes, since
Jewel has not yet been converted to use size in bytes.

Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit c85e9d4e1e3f367150314c08995c7a4d418910ff)

rgw: Let the default quota settings take effect during user creation

Fixes http://tracker.ceph.com/issues/16447
Cherry picked from 400d7c982f18efd7cf96acfc3a63078791d1ec0a

Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit e07fa1befabd56a3f353bcca50229620abd08dec)

Merge pull request #10898 from SUSE/wip-release-notes-hammer

doc: release-notes: add missing hammer releases

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

Revert "moved to use boost uuid implementation, based on commit 4fe89a7b14c97b2ed7f357132901beb2bdcec551"

This reverts commit 174de7fce8080df6e02b363e7821e8cca6f8157f.

Revert "uuid: use boost::random:random_device"

This reverts commit 187d308b5b0cb0512b442bbad1bddfda8ef9203f.

This breaks precise builds.

doc: release-notes.rst: add missing line to v0.94.8

see 46264a3b6cb7f490680c79bf0957c36aeaea5f6c and
b83d25d2918cbd880fbaeec976bffcea8868d5d9 in master

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

doc: add missing changelogs up to 0.94.8

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

doc: release-notes: add missing hammer releases

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

0.94.8

Merge pull request #10750 from ceph/wip-14799-hammer

hammer: rocksdb do not link against tcmalloc if it's disabled

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

rocksdb: disable tcmalloc if disabled

the rocksdb/configure.ac does not support --with-tcmalloc before,
and the updated rocksdb commit has the change for '--with-tcmalloc'
option, so let's pick it up.

Fixes: http://tracker.ceph.com/issues/14799
Signed-off-by: Kefu Chai <kchai@redhat.com>

ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 51abff11688f0201b8f4076ac515e4515929d4cb)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #10718 from oritwas/wip-14328-hammer

hammer: rgw: the swift key remains after removing a subuser

Merge pull request #10509 from yehudasa/wip-15557-hammer

rgw: Have a flavor of bucket deletion to bypass GC and to trigger

rgw: fix subuser rm command failure

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

rgw: add a method to purge all associate keys when removing a subuser

Fixes: #12890
When removing a subuser, make sure all of its keys, including the swift key and possible s3 keys, are also deleted.

Signed-off-by: Sangdi Xu <xu.sangdi@h3c.com>
(cherry picked from commit e7b7e1afc7a81c3f97976f7442fbdc5118b532b5)

Merge pull request #10291 from badone/wip-13829-hammer

hammer: config set with negative value results in "error setting 'filestore_merge_threshold' to '-40': (22) Invalid argument"

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #10699 from ktdreyer/wip-15867-nroff

jewel: doc: fix by-parttypeuuid in ceph-disk(8) nroff

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

doc: fix by-parttypeuuid in ceph-disk(8) nroff

Commit 221efb0b893adbfd7a19df171cf967fee87afcc7 altered the rST source
for the ceph-disk man page. In Hammer, we also have to modify the nroff
sources, because static copies of the generated man pages are stored in
Git.

Fixes: http://tracker.ceph.com/issues/15867
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #9741 from SUSE/wip-16343-hammer

hammer: boost uuid makes valgrind complain

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #10554 from Vicente-Cheng/wip-16815-hammer

hammer: radosgw-admin region-map set is not reporting the bucket quota correctly
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #10555 from Vicente-Cheng/wip-16317-hammer

hammer: rgw: bucket listing following object delete is partial
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #10530 from yehudasa/wip-16412-hammer

rgw: remove bucket index objects when deleting the bucket
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #8755 from kmroz/wip-hammer-convert-plain-object-to-versioned

hammer: rgw: convert plain object to versioned (with null version) when removing
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9271 from XinzeChi/wip-fix-digest-hammer

osd: fix omap digest compare when scrub

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #8805 from SUSE/wip-15482-hammer

hammer: is_split crash in handle_pg_create

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

Merge pull request #8593 from renhwsky/wip-15478-hammer

hammer: Pool quota alarm is not in effect

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

Merge pull request #7542 from SUSE/wip-14668-hammer

hammer: Wrong ceph get mdsmap assertion

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

Merge pull request #8042 from ukernel/hammer-15050

hammer: mds: fix stray purging in 'stripe_count > 1' case

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

Merge pull request #8804 from SUSE/wip-15512-hammer

hammer: Double decreased the count to trim caps which will cause failing to respond to cache pressure

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

Merge pull request #9404 from SUSE/wip-16082-hammer

hammer: mds: wrongly treat symlink inode as normal file/dir when symlink inode is stale on kcephfs

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

Merge pull request #10198 from SUSE/wip-16626-hammer

hammer: Failing file operations on kernel based cephfs mount point leaves unaccessible file behind on hammer 0.94.7

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

rgw: reset return code in when iterating over the bucket the objects

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

rgw: fix compilation

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