Merge pull request #24872 from trociny/wip-36642-luminous

luminous: osdc: reduce ObjectCacher's memory fragments

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

Merge pull request #25569 from batrick/i24929

luminous: qa: test_recovery_pool tries asok on wrong node

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #25752 from alfredodeza/luminous-better-devid

luminous common/blkdev, ceph-volume: improve get_device_id

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

ceph-volume: Micron SSDs don't include vendor name in ID_SERIAL

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

ceph-volume: update get_device_id to match in-tree implementation

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

Merge pull request #25532 from smithfarm/wip-37643-luminous

luminous: ceph-create-keys: fix octal notation for Python 3 without losing compatibility with Python 2

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

Merge pull request #25609 from joscollin/wip-37685-luminous

luminous: doc/user-management: Remove obsolete reset caps command

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

doc/user-management: Remove obsolete reset caps command

This command has not worked since hammer and makes no sense in an
environment where we do not allow empty caps

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

 Conflicts:
doc/rados/operations/user-management.rst
Dropped the allow empty caps paragraph, as done in master.

Merge pull request #25552 from jan--f/25203-luminous

luminous ceph-volume: fix Batch object in py3 environments

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

qa: add status option

From: 333444e8aac065058c0a2353beff8005044659f7
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

qa: remove dead code

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit a2ff87d4e25bc891fbfce4b0bdeb1a308ec22cb5)

qa: run asok command on correct machine

The MDS may not be on the same machine where the cluster command is run.

Fixes: http://tracker.ceph.com/issues/24858
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit fa25d6c8d1890bed2082b5c14f1c62a3db9ec27e)

ceph-volume: add Batch smoketest

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

ceph-volume: fix Batch object in py3 environments

Fixes: https://tracker.ceph.com/issues/37356
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 851c7693daa315b7972702bedf09dd66a37667d8)

Merge pull request #25500 from joscollin/wip-37600-luminous

luminous: doc: broken link on troubleshooting-mon page

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

ceph-create-keys: Misc Python 3 fixes

Use octal notation for file permissions.

Switch file() calls to open().

Signed-off-by: James Page <james.page@ubuntu.com>
(cherry picked from commit 107579196eb4b52b1965fec6dcc53eba9d314b97)

Merge pull request #25418 from xiexingguo/wip-luminous-upmap-fixes

luminous: osd: backport recent upmap fixes

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #25286 from smithfarm/wip-37397-luminous

luminous: tests: /usr/bin/ld: cannot find -lradospp in rados mimic

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

Merge pull request #25041 from smithfarm/wip-36750-luminous

luminous: mgr: [restful] deep_scrub is not a valid OSD command

Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #25047 from swinds24/fix_36764

luminous: mgr: hold lock while accessing the request list and submitting request

Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #25216 from k0ste/luminous_backports

luminous: mgr: prometheus: added bluestore db and wal devices to ceph_disk_occupation metric.//

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #25259 from k0ste/luminous_backports4

luminous: mgr/balancer: add cmd to list all plans

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

Merge pull request #25326 from theanalyst/wip-luminous-reshard-fixes-1

luminous: bucket resharding fixes

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #24547 from linuxbox2/luminous-24595

luminous: rgw: apply quota config to users created via external auth

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

Merge pull request #24621 from cbodley/wip-24358

luminous: rgw: add ssl support to beast frontend

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

Merge pull request #24909 from smithfarm/wip-36414-luminous

luminous: rgw: librgw: crashes in multisite configuration

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

Merge pull request #24944 from jonsger/luminous-backport-pr#24700

luminous: rgw: SSE encryption does not detect ssl termination in proxy

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

Merge pull request #25088 from jonsger/wip-36757-luminous

luminous: rgw: rgw-admin: reshard add can add a non-existent bucket

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

Merge pull request #25195 from pdvian/wip-37284-luminous

luminous: rgw: radosgw-admin: translate reshard status codes (trivial)

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

Merge pull request #25320 from theanalyst/wip-luminous-zone-deletion

luminous: rgw: fixes for zone deletion

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

doc: broken link on troubleshooting-mon page
Fixes: https://tracker.ceph.com/issues/37451
This fix involves adding :ref: labels to the add-or-rm-mons.rst
page. I also added :ref: labels for other headings within
add-or-rm-mons.rst (for future reference).

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
(cherry picked from commit ca05e456969a721631f5e9882c896cab76a4a3dc)

Conflicts:
doc/rados/troubleshooting/troubleshooting-mon.rst
Fixed the :ref: sentence and removed the _replace line.

Merge pull request #25284 from jdurgin/wip-osd-memory-target-docs-luminous

luminous: doc/rados: update bluestore provisioning and autotuning docs

Reviewed-by: Mark Nelson <mnelson@redhat.com>

rgw: fix typo

This fixes a typo in a log message. It's a separate commit so
downstream commits point to the right upstream commits via
cherry-pick.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 7d1768f2a332c5ac389cbb4bbeda28752e4f17bc)

rgw: perf -- remove bucket shards asynchronously rather than synchronously

We can now take advantage of the new asynchronous bucket shard removal
code and where we used to remove each shard synchronously now remove
them asynchronously. This would be a huge win when we have tens of
thousands of shards.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit cb0da45c5d6e4dff6514919b3b894df0eea7c1e4)

 Conflicts:
src/rgw/rgw_rados.cc
conflicts with placement set and rgw rados refactor

rgw: clean up unused bucket index shards

Clean up old bucket index shards when a resharding is complete. Also,
when a resharding fails, clean up unfinished bucket index shards. Do
both clean-ups asynchronously.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit f84f70d451036ee99011b8e2c7b974f15d3a005a)

 Conflicts:
src/rgw/rgw_rados.h
merge conflict as bucket_placement functions were moved after the rgw rados
refactor

rgw: a little code clean-up by adding const

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 48e22fb76feffb551074f274986bc4125a02003f)

rgw: remove never-called RGWRados member function

Because RGWRados::cls_rgw_init_index is never called, remove it.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 4593778c6d830a1a0d33528507f1795aee019ce4)

rgw: rename function for clarity

The function cls_rgw_bucket_init was renamed to
cls_rgw_bucket_init_index in order to better describe its
functionality.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 20868bd3b893ba2e17d2bfdc63d6544dbe677a9b)

rgw: fix bug in error codes returned

Fixes two bugs where positive error code was returned rather than
negative error code, which is the RGW norm.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit dc0732c524c2d8fb5b423f8cce8c6cc9aa7ca44a)

osd/OSDMap: fix upmap mis-killing for erasure-coded PGs

The up-set of erasure-coded PGs may include CRUSH_ITEM_NONE,
which as a result causes mis-killing of valid upmap items.

Fixes: https://tracker.ceph.com/issues/37493
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: ningtao <ningtao@sangfor.com.cn>
(cherry picked from commit f043dcc6d8663ed960a354b2441fd3f8dd66c62d)

Conflicts:
        - *maybe_remove_pg_upmaps* input changed, in master
          we now have a passed in *nextmap* parameter

mon: auto clean up stale upmap items

See https://www.spinics.net/lists/ceph-users/msg49518.html

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 4181aa86906886423af80e478e45554606fc7cf6)

Conflicts:
        - *nextmap* has been renamed to *tmpmap*
        - add the *have_pg_upmaps* wrapper which is necessary for unittest

osd/OSDMap: add pg-existence sanity check

The reason why __get_pg_pool_size(pg)__ or __get_pg_pool_crush_rule(pg)__ fails is
that the pg does not exist anymore. So it generally makes sense to check __pg_exists(pg)__
before moving further.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 79ef3bea7550559b7ea4e2b68dc407c7eb25defa)

Conflicts:
- *nextmap* has been renamed to *tmpmap*

osd/OSDMap.cc: move sanity checks to the proper place

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 3dcd4eaf867369437720a21daf3c344cc4b9844e)

osd/OSDMap.cc: remove pg_upmap/pg_upmap_items too if osd is gone

If an osd is gone or moved out from the specific crush rule,
we should cancel any pg_upmap/pg_upmap_items still bound to
that osd too.

The original code does not work for the above case because
get_parent_of_type() will fail if that osd does not belong
to the crush_rule passed in and hence hits the assert below:

```
src/osd/OSDMap.cc: 4078: FAILED assert(target > 0)
```

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 8a11ed479d7ea95f76170e74123ca2c48e3a3963)

Merge pull request #25350 from alfredodeza/luminous-c-v-inventory-add-device_id

luminous ceph-volume add device_id to inventory listing

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

ceph-volume: add test for disk.udevadm_property

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

ceph-volume: add device_id field to inventory output

This intends to mimic the C++ implementation in src/common/blkdev.cc.

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

Merge pull request #24914 from smithfarm/wip-36429-luminous

luminous: tests: rbd: move OpenStack devstack test to rocky release

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

Merge pull request #24917 from smithfarm/wip-36554-luminous

luminous: rbd: [rbd-mirror] periodic mirror status timer might fail to be scheduled

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

Merge pull request #24975 from dillaman/wip-36568-luminous

luminous: qa/tasks/qemu: use unique clone directory to avoid race with workunit

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

Merge pull request #25006 from dillaman/wip-36407-luminous

luminous: rbd: pybind: added missing RBD_FLAG_FAST_DIFF_INVALID constant

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #25253 from pdvian/wip-37364-luminous

luminous:librbd: fix missing unblock_writes if shrink is not allowed

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

rgw: batch and process bucket instances

Sort through and batch bucket instances so that multiple calls to reading
current bucket info and locking can be avoided. For the most trivial case when
the bucket is already deleted we exit early with all the stale instances. When
the bucket reshard is in progress we only process the stale entries with status
done, if the bucket is available for locking then we lock down and mark the
other instances as well.

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

 Conflicts:
src/rgw/rgw_bucket.cc
Get rid of the following c++17isms:
- split_tenant auto return type -> trailing return type
- tuple destructuring bind for split tenant with std::tie

cli: use rgw-admin reshard stale-instances list/delete

Add a delete command as well that clears the resharded instances. We print out
the json status to indicate success or error state

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

 Conflicts:
src/rgw/rgw_admin.cc:
  ceph::util::match_str and the related rm/delete normalizations introduced in
  mimic are not backported

rgw: implement listing stale instances from a reshard

Dynamic resharding used to leave behind stale bucket instances; walk through the
metadata pool and identify these instances by comparing the reshard status. If
the reshard status is done, these instances are ok to be cleared. For reshard
status of none we compare against the bucket entry point to ensure that we don't
match the current entry point.

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

rgw: recover from incomplete reshard attempt

In case a reshard attempt is left in an incomplete state, i.e., flags
still show resharding even though the bucket reshard lock isn't being
held, try to recover by taking the bucket reshard lock and clearing
flags associated with resharding.

This change requires access to an RGWBucketInfo object. So call stack
into this function should provide that to prevent unnecessary
work. Changes were made to provide this object.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 4891ae59314041802da0f6dc249ccbeb761616dc)

rgw: move RGWReshardBucket lock to its own separate class

There are other processes beyond resharding that would need to take a
bucket reshard lock (e.g., correcting bucet resharding flags in event
of crash, tools to remove bucket shard information from earlier
versions of ceph). Pulling this logic outside of RGWReshardBucket
allows this code to be re-used.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 18ab99cd542cc253d62719a18a9d13e7a312eb15)

rgw: failed resharding clears resharding status from shard heads

Previously, when resharding failed, we restored the shard status on
the bucket info object. However the status on each of the shards was
left indicating a reshard was underway. This prevented some write
operations from taking place, as they would wait for resharding to
complete. This adds the missing functionality. It also makes the
functionality available to other classes via static functions in
RGWBucketReshard.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 4577801271454b147cb3b1f3169d268d1c14948b)

rgw: change the bucket reshard lock to exclusive-ephemeral

The bucket reshard lock was simply an exclusive lock that existed on
an object solely for the purpose of representing the lock. This is now
changed to exclusvie-ephemeral lock, so as not to leave these objects
behind.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit bc0a5ff95247b41b5a8336a8c4ed83c4315c1966)

cls: add exclusive ephemeral locks that auto-clean

Add a new type of cls lock -- exclusive ephemeral for which the
object only exists to represent the lock and for which the object
should be deleted at unlock. This is to prevent the accumulation of
unneeded objects in the cluster by automatically cleaning them up.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit a289f2d8654cf4b865430465b87299d3618b41c8)

rgw: renew resharding locks to prevent expiration

Fix lock expiration problem with resharding. The resharding process
will renew its bucket lock (and logshard lock if necessary) when half
the remaining time is left on the lock. If the lock is expired and
cannot renew the process fails and errors out appropriately.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 8cebffa1d8ad4df6fdae4e10e782aad0753545ce)

cls: add semantics for cls locks to require renewal without expiring

Add ability to *require* renewal of an existing lock in addition
toexisting ability to *allow* renewal of an existing lock. The key
difference is that a MUST_RENEW will fail if the lock has expired
(where a MAY_RENEW) will succeed. This provides calling code with the
ability to verify that a lock is held continually and that it was
never lost/expired.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 479c90993cc80b140af010a72ff9a34ecb7b3b32)

rgw: use the same lock when resharding

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

rgw: renew resharding lock during bucket resharding

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

Merge pull request #25030 from smithfarm/wip-36464-luminous

luminous: core: mgr crash on scrub of unconnected osd

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

Merge pull request #24648 from liewegas/wip-warning-fixes-luminous

luminous: common: shut up some warnings

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

Merge pull request #25025 from smithfarm/wip-36556-luminous

luminous: osd: RBD client IOPS pool stats are incorrect (2x higher; includes IO hints as an op)

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

Merge pull request #25028 from smithfarm/wip-36646-luminous

luminous: tests: librados api aio tests race condition

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

Merge pull request #25032 from smithfarm/wip-36575-luminous

luminous: cephfs: mgr/status: fix fs status subcommand did not show standby-replay MDS' perf info

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

Merge pull request #25035 from smithfarm/wip-36636-luminous

luminous: osd: race condition opening heartbeat connection

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

Merge pull request #25074 from jonsger/wip-36657-luminous

luminous: core: Objecter: add ignore cache flag if got redirect reply

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

Merge pull request #25184 from smithfarm/wip-25201-luminous

luminous: mgr: Module 'influx' has failed

Reviewed-by: Wido den Hollander <wido@widodh.nl>

Merge pull request #24501 from dzafman/wip-remove-luminous

luminous: core: enable the pg deletion process to be throttled

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

Merge pull request #24649 from liewegas/wip-pr-23273-luminous

luminous: os/bluestore: handle spurious read errors

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #24705 from smithfarm/wip-36145-luminous

luminous: fsck: cid is improperly matched to oid

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #24833 from trociny/wip-36630-luminous

luminous: osd: potential deadlock in PG::_scan_snaps when repairing snap mapper

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #24989 from jonsger/wip-36638-luminous

luminous: core: bluestore: rename does not old ref to replacement onode at old name

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #24992 from jonsger/wip-26943-luminous

luminous: os/bluestore/BlueStore.cc: 1025: FAILED assert(buffer_bytes >= b->length) from ObjectStore/StoreTest.ColSplitTest2/2

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #25018 from smithfarm/wip-36436-luminous

luminous: core: rados rm --force-full is blocked when cluster is in full status

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #25267 from noahdesu/luminous-docs

luminous: doc: show edit on github links and version warnings

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

doc/_templates/page.html: add link to report doc bugs

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit de30c4d3c5927bb58b49b44b391647e397e1fe4f)

luminous: doc: show edit on github links and version warnings

backport of #24452 that adds edit on
github links to documentation and notification banners that display
warnings when old documentation is being viewed.

this is not a cherry-pick: it removes from the original patch the
dynamic generation of the releases schedule from a yaml database file.
backporting this portion requires modifying the patch to deal with a
different file / directory structure [in luminous] with no real added value.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>

Merge pull request #25049 from gregsfortytwo/luminous-readable-failures

luminous: test: make readable.sh fail if it doesn't run anything

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #25001 from MrStupnikov/luminous-docfix-1358

luminous: doc: Put command template into literal block

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

Merge pull request #24752 from joscollin/wip-36309-luminous

luminous: doc: Fix typo error on cephfs/fuse/

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>

Merge pull request #24434 from joscollin/wip-36312-luminous

luminous: doc: fix broken fstab url in cephfs/fuse

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

qa/workunits/rados/test_librados_build.sh: grab files from explicit git branch

Fixes: https://tracker.ceph.com/issues/37392
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6c6ae9e30d02a0844289f249269e7dcc0058ab88)

Conflicts:
    qa/workunits/rados/test_librados_build.sh
- use luminous as the branch in luminous
- similar change in the comment line, below

doc/rados: Add bluestore memory autotuning docs.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit 9e2d1a52abacbab2b4dab24bd209dc12d26fe2db)

Conflicts:
doc/rados/configuration/bluestore-config-ref.rst

Deployment docs updated in master, pulled in those here too

12.2.10

mgr/balancer: add cmd to list all plans

Signed-off-by: Yang Honggang <yanghonggang@umcloud.com>
(cherry picked from commit 99245c69829c53dab6790da5502420c7183c6bcd)

librbd: fix missing unblock_writes if shrink is not allowed

Fixes: http://tracker.ceph.com/issues/36778
Signed-off-by: runsisi <luo.runbing@zte.com.cn>
(cherry picked from commit 3899bee9f5ea2c4b19fb1266a8b59f6e04e99926)

tests: rgw: test_multi: python 2-3 compatibility

Adding the usual six libraries for python3 compat

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

Conflicts:
 src/test/rgw/rgw_multi/zone_cloud.py
- this file isn't a part of luminous

tests: tests for master zone deletion

Adding a basic test in test_multi that creates a new zonegroup and zone and
removes them, period update after zone deletion will fail now lessening the
chance for the period referring to a non existant master_zone. Subsequent
zonegroup deletion will allow things to pass.

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

rgw: period update: check for dangling master zone references

If we are deleting a master zone of a zonegroup fail on period update, if this
was intentional, either creating / modifying a zone as master or in case of
deletions, deletion of the zonegroup itself will correct the period update to
work correctly. Without the check, while period commit will be successful a
subsequent RGWRados::init_complete() will fail.

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

src/rgw/rgw_zone.cc
Changes made to corresponding function rgw_rados

rgw: allow init complete to proceed in case of erroneus zone deletes

Currently a master zone delete in a zonegroup followed by a period commit would
render RGWRados to be unusable, check if the zonegroup is empty and continue
initialization in these cases so that removal can proceed.

Fixes: http://tracker.ceph.com/issues/37328
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 58eb3545e4db2c9208fbc09789b89dd9d2ff7a71)

* src/rgw/services/svc_zone.cc
Changes are made to the same function in  rgw_rados.cc
as the rgw_rados refactor is post mimic

mgr: prometheus: added bluestore db and wal devices to ceph_disk_occupation metric.

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
(cherry picked from commit 12fbf48e637ca807d4d489eebdfe64bb8cd1909d)

radosgw-admin: translate reshard status codes (trivial)

Fixes: http://tracker.ceph.com/issues/36486
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 731fca4f921e8227e907b204dec9f1016d66b8c3)

Merge pull request #25170 from badone/wip-luminous-ceph_ansible-specify-branch-stable-3.2

luminous: qa/ceph-ansible: Specify stable-3.2 branch

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

mgr: Ignore daemon if no metadata was returned

It can happen that the Mgr does not return any metadata for a given
daemon as it might not be available at that moment.

None is returned by the get_metadata() method at that moment and both
the Influx and Telegraf module should then ignore the daemon in their
statistics and continue on to the next daemon.

Signed-off-by: Wido den Hollander <wido@42on.com>
(manual cherry-pick of 02569c88341a6dcc8aee5626f10ac2927c2cf064)

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

qa/ceph-ansible: Specify stable-3.2 branch

Ceph-ansible no longer supports luminous post stable-3.2.

Fixes: https://tracker.ceph.com/issues/37331
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>