Merge pull request #16137 from smithfarm/wip-20024-kraken

kraken: tests: HEALTH_WARN pool rbd pg_num 244 > pgp_num 224 during upgrade

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

Merge pull request #14734 from smithfarm/wip-19670-kraken

kraken: build/ops: logrotate is missing from debian package (kraken, master)

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

Merge pull request #16166 from smithfarm/wip-19840-kraken

kraken: rgw: civetweb frontend segfaults in Luminous

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #13871 from smithfarm/wip-19162-kraken

kraken: rgw: rgw_file: fix marker computation

Merge pull request #16133 from smithfarm/wip-18378-kraken

kraken: msg/simple/SimpleMessenger.cc: 239: FAILED assert(!cleared)

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

Merge pull request #16134 from smithfarm/wip-19340-kraken

kraken: An OSD was seen getting ENOSPC even with osd_failsafe_full_ratio passed

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

Merge pull request #16131 from smithfarm/wip-swift-kraken

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

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

Merge pull request #16493 from smithfarm/wip-suppress-upgrade-fail

tests: run certain upgrade/jewel-x tests on Xenial only

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

Merge pull request #14597 from gregsfortytwo/wip-kraken-snaptrim

kraken: core: improve control and throttling of the snap trimmer

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

tests: upgrade/jewel-x/parallel: drop duplicate kraken.yaml

This yaml file has the effect of re-running "ceph osd set require_kraken_osds"
at the very end of the test. Drop it.

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

tests: run certain upgrade/jewel-x tests on Xenial only

This PR drops two upgrade/jewel-x test cases that are not compatible with
https://github.com/ceph/ceph/pull/14597

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>
(cherry picked from commit a86ce728954a765797ce634025d43650d990e480)

Conflicts:
    qa/tasks/swift.py: clone ceph-kraken branch instead of ceph-jewel

Merge pull request #16111 from smithfarm/wip-20497-kraken

kraken: tests: insufficient timeout in radosbench task

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

Merge pull request #16178 from smithfarm/wip-20268-kraken

kraken: rgw: get wrong content when download object with specific range when compression was enabled

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

Merge pull request #16114 from smithfarm/wip-20500-kraken

kraken: cephfs: src/test/pybind/test_cephfs.py fails

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16108 from smithfarm/wip-19763-kraken

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16107 from smithfarm/wip-19710-kraken

kraken: mds: enable daemon to start when session ino info is corrupt

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16106 from smithfarm/wip-19680-kraken

kraken: mds: damage reporting by ino number is useless

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16105 from smithfarm/wip-19678-kraken

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16104 from smithfarm/wip-19676-kraken

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16103 from smithfarm/wip-19674-kraken

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16102 from smithfarm/wip-19672-kraken

kraken: mds: assert fail when shutting down

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16101 from smithfarm/wip-19669-kraken

kraken: mds: daemon goes readonly writing backtrace for a file whose data pool has been removed

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16100 from smithfarm/wip-19667-kraken

kraken: cephfs: mount point break off problem after mds switch

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16099 from smithfarm/wip-19664-kraken

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #14998 from jan--f/wip-19845-kraken

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16168 from smithfarm/wip-20031-kraken

kraken: rgw: Swift's at-root features (/crossdomain.xml, /info, /healthcheck) are broken

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #16164 from smithfarm/wip-19777-kraken

kraken: rgw: swift: disable revocation thread under certain circumstances

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #16191 from smithfarm/wip-20028-kraken

kraken: cephfs: Deadlock on two ceph-fuse clients accessing the same file

Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #16183 from smithfarm/wip-20405-kraken

kraken: rgw: Lifecycle thread will still handle the bucket even if it has been removed

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

Merge pull request #16181 from smithfarm/wip-20363-kraken

kraken: rgw: VersionIdMarker and NextVersionIdMarker are not returned when listing object versions

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

Merge pull request #16179 from smithfarm/wip-20269-kraken

kraken: rgw: wrong object size after copy of uncompressed multipart objects

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

Merge pull request #16174 from smithfarm/wip-20261-kraken

kraken: rgw: 'radosgw-admin usage show' listing 0 bytes_sent/received

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

Merge pull request #16173 from smithfarm/wip-20156-kraken

kraken: fix: rgw crashed caused by shard id out of range when listing data log

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

Merge pull request #16165 from smithfarm/wip-19839-kraken

kraken: rgw: reduce log level of 'storing entry at' in cls_log

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

Merge pull request #16163 from smithfarm/wip-19766-kraken

kraken: rgw: when uploading the objects continuesly in the versioned bucket, some objects will not sync

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

Merge pull request #16162 from smithfarm/wip-19725-kraken

kraken: rgw: S3 v4 authentication issue with X-Amz-Expires

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

Merge pull request #16161 from smithfarm/wip-19614-kraken

kraken: multisite: rest api fails to decode large period on 'period commit'

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

Merge pull request #16139 from smithfarm/wip-20147-kraken

kraken: rgw: 'gc list --include-all' command infinite loop the first 1000 items

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

Merge pull request #16096 from smithfarm/wip-19336-kraken

kraken: rbd: refuse to use an ec pool that doesn't support overwrites

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

Merge pull request #16097 from smithfarm/wip-19609-kraken

kraken: tests: [librados_test_stub] cls_cxx_map_get_XYZ methods don't return correct value

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

Merge pull request #16184 from smithfarm/wip-20154-kraken

kraken: rbd: Potential IO hang if image is flattened while read request is in-flight

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

Merge pull request #16187 from smithfarm/wip-20266-kraken

kraken: rbd: [api] is_exclusive_lock_owner shouldn't return -EBUSY

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

Merge pull request #16195 from dillaman/wip-20351-kraken

kraken: tests: test/librbd: decouple ceph_test_librbd_api from libceph-common

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

Merge pull request #15486 from dillaman/wip-20022-kraken

kraken: rbd-mirror: ensure missing images are re-synced when detected

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

Merge pull request #14540 from smithfarm/wip-18910-kraken

kraken: rbd-nbd: check /sys/block/nbdX/size to ensure kernel mapped correctly

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

Merge pull request #16140 from smithfarm/wip-20271-kraken

kraken: tests: LibRadosMiscConnectFailure.ConnectFailure hang

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

Merge pull request #16112 from smithfarm/wip-20499-kraken

kraken: tests: ObjectStore/StoreTest.OnodeSizeTracking/2 fails on bluestore

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

Merge pull request #14960 from yehudasa/wip-19704

kraken: civetweb: move to post 1.8 version

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

osd: do not default-abort on leaked pg refs

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 4caf2df0c380a1281db9509b3feb342705512b58)

osd: shutdown our reserver_finisher earlier in the process

This finisher thread has a lot of callbacks which can hold PGRefs. Make
sure we drain them out before checking that all the PGs have finished
and have no outstanding references.

Moving this should be safe; we've already stopped the op thread et al
and the only things still running are the OSDService's objecter_finisher,
recovery_request_timer, and snap_sleep_timer (which has definitely been emptied
by the time we get here as it's synchronously cleared out on PG shutdown).

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 66ea9c1f66ae31035e62bd4335b08948b1e8e5e2)

osd: Reset() the snaptrimmer on shutdown

We were failing to exit various wait states which held PGRefs. Error!

Fixes: http://tracker.ceph.com/issues/19931
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit b0e9deeea8a8e90f6d7e9d56b6b4aed890e01d7b)

osd: print out pg debug ref counts on acquire/drop

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit a3b028a6d1ba74ed975ebd665b1b50fb7e5039a4)

mon: Fix status output warning for mon_warn_osd_usage_min_max_delta

Fixes: http://tracker.ceph.com/issues/20544
Caued by: 489e810c37ed6fb9d32d1015634041a577501ee4

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

Conflicts:
    src/mon/PGMap.cc:
        kraken has no daa0793c393a21bd2dd2ec52a0efd181e1032400 so we manually
        apply the changes from 56f9808016ab289bdc0ce7cfbb0503c78b509593 to
        src/mon/PGMonitor.cc instead of to src/mon/PGMap.cc

mon/PGMonitor: clean up min/max span warning

Clean up option naming.

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

bluestore: Fix BlueStore::statfs available amount to not include bluefs min reserved

This fixes OSD crashes because checking osd_failsafe_full_ratio won't work
without accurate statfs information.

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

osd: Round fullness in message to correspond to df -h

This really only works after journal drains because
we adjust for the journal.

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

filestore: Account for dirty journal data in statfs

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

mon: Add warning if diff in OSD usage > config mon_warn_osd_usage_percent (10%)

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

mon: Bump min in ratio to 75%

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

osd: Fix ENOSPC crash message text

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

Merge pull request #16143 from smithfarm/wip-20365-kraken

kraken: mon: osd crush set crushmap need sanity check

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

Merge pull request #16138 from smithfarm/wip-20034-kraken

kraken: ceph-disk: Racing between partition creation & device node creation

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

Merge pull request #16135 from smithfarm/wip-20010-kraken

kraken: ceph-disk: separate ceph-osd --check-needs-* logs

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

osd: repair the PG_DEBUG_REFS build

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit ec4185d1980b48b01687a177248d0894f326dc37)

Conflicts:
src/osd/OSD.cc
src/osd/Session.h

osd: use PGRef instead of boost::intrusive_ptr<PG> everywhere

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 306ad85f0fb4597ba3bb3c04a67abdaba556ba74)

Merge pull request #16215 from liewegas/wip-17743

kraken: CMakeLists.txt: disable memstore make check test

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

CMakeLists.txt: disable memstore make check test

This fails frequently on kraken, but is probably a wontfix.

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

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

rbd-mirror: ensure missing images are re-synced when detected

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

Conflicts:
src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc: trivial resolution
src/tools/rbd_mirror/image_replayer/BootstrapRequest.h: trivial resolution

Merge pull request #14067 from asheplyakov/19322-bp-kraken

kraken: rgw: fix break inside of yield in RGWFetchAllMetaCR

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

Merge pull request #14509 from smithfarm/wip-18499-kraken

kraken: rgw: Realm set does not create a new period

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

Merge pull request #14511 from smithfarm/wip-18772-kraken

kraken: rgw: crash when updating period with placement group

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

Merge pull request #14513 from smithfarm/wip-18843-kraken

kraken: rgw: usage stats and quota are not operational for multi-tenant users

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

Merge pull request #14515 from smithfarm/wip-18904-kraken

kraken: rgw: first write also tries to read object

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

Merge pull request #14516 from smithfarm/wip-18909-kraken

kraken: rgw: the swift container acl does not support field .ref

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #14517 from smithfarm/wip-19047-kraken

kraken: rgw: fix use of marker in List::list_objects()

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

Merge pull request #14524 from smithfarm/wip-19477-kraken

kraken: rgw: S3 v4 authentication issue with X-Amz-Expires

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #14525 from smithfarm/wip-19479-kraken

kraken: rgw: zonegroupmap set does not work

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

Merge pull request #14528 from smithfarm/wip-19534-kraken

kraken: rgw: Error parsing xml when get bucket lifecycle

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

Merge pull request #14606 from asheplyakov/19608-kraken

kraken: rgw: multisite: fetch_remote_obj() gets wrong version when copying from remote

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

Merge pull request #15384 from asheplyakov/20015-bp-kraken

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

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

Merge pull request #14522 from smithfarm/wip-19472-kraken

kraken: rgw: add the remove-x-delete feature to cancel swift object expiration

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #14523 from smithfarm/wip-19475-kraken

kraken: rgw: multisite: EPERM when trying to read SLO objects as system/admin user

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #14519 from smithfarm/wip-19175-kraken

kraken: swift API: cannot disable object versioning with empty X-Versions-Location

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #14526 from smithfarm/wip-19524-kraken

kraken: rgw: 'radosgw-admin zone create' command with specified zone-id creates a zone with different id

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #14529 from smithfarm/wip-19573-kraken

kraken: rgw: Response header of swift API returned by radosgw does not contain x-openstack-request-id. But Swift returns it.

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

test/librbd: decouple ceph_test_librbd_api from libceph-common

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

Conflicts:
src/test/librbd/CMakeLists.txt: trivial resolution

test/librbd: replace libcommon classes using standard library

so ceph_test_librbd_api has less dependencies on libcommon

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

Conflicts:
src/test/librbd/test_librbd.cc: trivial resolution

test/librados: extract functions using libcommon in test.cc into test_common.cc

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

Conflicts:
src/test/librados/CMakeLists.txt: trivial resolution
src/test/librados/test.cc: trivial resolution

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)

librbd: filter expected error codes from is_exclusive_lock_owner

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

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)

radosgw-admin: warn that 'realm rename' does not update other clusters

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

rgw: fix for zonegroup redirect url

local dest_url variable was shadowing the one in the enclosing scope, so
the changes were not applied and no Location header was written on redirect

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

rgw: use zonegroup's master zone endpoints for bucket redirect

if no zonegroup endpoints are set, fall back to master zone endpoints

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

rgw: allow larger payload for period commit

testing with 3 zonegroups and 3 zones each, the period json grew larger
than 4k and caused decode failures on period commit

updated to use the new config variable rgw_max_put_param_size

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

rgw: make a configurable size for requests with xml params

We currently read all user input for a few apis accepting xml, avoid
doing this and error out early, most s3 apis limit to about 1000 xml
entries, make this configurable via a new config param,
`rgw_max_put_param_size` defaulting to 1MB. Also modified
`rgw_rest_read_all_input` with an additional param to not allow for
chunked uploads, though we error out in a better way by responding with
content length required rather than S3's 501 if chunked is set.

This also adds the same behavior in RGWPutCORS reusing
`rgw_rest_read_all_input`, and using a data_deleter to manage the char*

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
rgw: rgw_rest_s3: make PUT CORS accept only a configured max input

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

librbd: potential read IO hang when image is flattened

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

rgw: lifecycle thread shouldn't process the bucket which has been deleted.

Fixes: http://tracker.ceph.com/issues/20285
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit a2b042fe9f7e6503273fa4c2a4c56e399d7c338f)

rgw: VersionIdMarker and NextVersionIdMarker should be returned when listing
object versions if necessary.

Fixes: http://tracker.ceph.com/issues/19886
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit f805c3e08948e379b7d2c4f2faf9e7f550e4cb23)