common: fix parse_env nullptr deref

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

test: add test for parse_env

Test for https://tracker.ceph.com/issues/39599

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

Merge pull request #28369 from batrick/i40116

nautilus: qa: cannot schedule kcephfs/multimds

qa: kcephfs/multimds test latest rhel

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

qa: fix missing yaml fragment

This is preventing kcephfs/multimds from being scheduled.

Introduced-by: 2526cc6e649cded87113beae745e7c7984569c0d
Partial-revert: 2526cc6e649cded87113beae745e7c7984569c0d
Fixes: http://tracker.ceph.com/issues/40116
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #28218 from bk201/wip-39993-nautilus

nautilus: mgr/dashboard: inconsistent result when editing a RBD image's features

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #28022 from Devp00l/wip-39560-nautilus

 nautilus:  mgr/dashboard: Queue notifications as default

Reviewed-by:  Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #27884 from smithfarm/wip-39530-nautilus

nautilus: tests: mgr: tox failures when running make check

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #27998 from smithfarm/wip-39540-nautilus

nautilus: monitoring: Provide a base set of Prometheus alert manager rules that notify the user about common Ceph error conditions

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #28098 from pdvian/wip-39425-nautilus

nautilus: mgr: deadlock

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

Merge pull request #28189 from votdev/fix_dialog_title

nautilus: mgr/dashboard: Display correct dialog title

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge pull request #28262 from jecluis/nautilus-fix-backport-mon-min-release

mon/Monitor: allow probe if MMonProbe::mon_release == 0

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

Merge pull request #28101 from jan--f/wip-39932-nautilus

nautilus: monitoring: update Grafana dashboards

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by:  Kanika Murarka <kmurarka@redhat.com>

Merge pull request #27864 from sebastian-philipp/wip-39312-nautilus

nautilus: mgr/rook: Added missing rgw daemons in service ls

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

Merge pull request #27863 from sebastian-philipp/wip-39313-nautilus

nautilus: mgr/rook: Fix RGW creation

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

Merge pull request #27862 from sebastian-philipp/wip-39356-nautilus

nautilus: mgr/rook: Remove support for Rook older than v0.9

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

Merge pull request #27918 from pdvian/wip-39273-nautilus

nautilus: rgw: Evaluating bucket policies also while reading permissions for an…

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

Merge pull request #27921 from cbodley/wip-38918

nautilus: rgw multisite: add perf counters to data sync

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

Merge pull request #27924 from Vicente-Cheng/wip-39410-nautilus

nautilus: rgw: inefficient unordered bucket listing

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

Merge pull request #27944 from smithfarm/wip-39577-nautilus

nautilus: build/rgw: unittest_rgw_dmclock_scheduler does not need Boost_LIBRARIES #26799

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #27952 from Vicente-Cheng/wip-39414-nautilus

nautilus: multisite: period pusher gets 403 Forbidden against other zonegroups

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

Merge pull request #27953 from Vicente-Cheng/wip-39503-nautilus

nautilus: rgw: clean up some logging

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

Merge pull request #27954 from Vicente-Cheng/wip-39574-nautilus

nautilus: rgw: cloud sync module logs attrs in the log

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #27955 from Vicente-Cheng/wip-39575-nautilus

nautilus: librgw: unexpected crash when creating bucket

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

Merge pull request #28064 from theanalyst/nautilus-cloud-sync-fixes

nautilus: rgw: cloud sync module fails to sync multipart objects

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

Merge pull request #27630 from pdvian/wip-39018-nautilus

nautilus: rgw admin: add tenant argument to reshard cancel

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #27660 from pdvian/wip-39048-nautilus

nautilus: rgw: beast: set a default port for endpoints

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

Merge pull request #27664 from pdvian/wip-39178-nautilus

nautilus: rgw: limit entries in remove_olh_pending_entries()

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

Merge pull request #27779 from s0nea/wip-39479-nautilus

nautilus: test/rgw: fix race in test_rgw_reshard_wait and test_rgw_reshard_wait uses same clock for timing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #27800 from pdvian/wip-39202-nautilus

nautilus: rgw: race condition between resharding and ops waiting on resharding

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

Merge pull request #27814 from ashishkumsingh/wip-39417-nautilus

nautilus: rgw: multisite log trimming only checks peers that sync from us

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

Merge pull request #27826 from ashishkumsingh/wip-39502-nautilus

nautilus: rgw: bucket stats report mtime in UTC

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

Merge pull request #27827 from ashishkumsingh/wip-39496-nautilus

nautilus: rgw: admin: handle delete_at attr in object stat output

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

Merge pull request #27904 from pdvian/wip-39228-nautilus

nautilus: rgw_file: save etag and acl info in setattr

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

Merge pull request #27890 from Devp00l/wip-39534-nautilus

 nautilus: mgr/dashboard: RBD snapshot name suggestion with local time suffix

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #28021 from Devp00l/wip-39558-nautilus

 nautilus: mgr/dashboard: KV-table transforms dates through pipe

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #28091 from pdvian/wip-39423-nautilus

nautilus: test/librbd: drop 'ceph_test_librbd_api' target

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

Merge pull request #28120 from dillaman/wip-38869-nautilus

nautilus: librbd: make flush be queued by QOS throttler

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

Merge pull request #28121 from dillaman/wip-39428-nautilus

nautilus: librbd: async open/close should free ImageCtx before issuing callback

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

Merge pull request #28122 from dillaman/wip-39462-nautilus

nautilus: rbd-mirror: clear out bufferlist prior to listing mirror images

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

Merge pull request #28203 from dzafman/wip-39699

nautilus: osd: Don't include user changeable flag in snaptrim related assert

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

Merge pull request #28258 from pdvian/wip-39672-nautilus

nautilus: os/bluestore: fix missing discard in BlueStore::_kv_sync_thread

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #27746 from LenzGr/wip-39345-nautilus

nautilus: mgr/dashboard: code documentation

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #27760 from ricardoasmarques/wip-39454-nautilus

nautilus: mgr/dashboard: Validate if any client belongs to more than one group

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>

Merge pull request #27868 from LenzGr/wip-39467-nautilus

nautilus: mgr/dashboard: Admin resource not honored

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Wido den Hollander <wido@widodh.nl>

Merge pull request #28011 from ricardoasmarques/wip-39616-nautilus

nautilus: mgr/dashboard: iSCSI should allow exporting an RBD image with Journaling enabled

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>

Merge pull request #28026 from ricardoasmarques/wip-39631-nautilus

nautilus: mgr/dashboard: iSCSI form does not support IPv6

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>

pybind/tox: handle possible WITH_PYTHON3 values other than "3"

WITH_PYTHON3 might be set to "ON" or to the python3 RPM version number
prevailing on the system - e.g. "3", "36"

Fixes: 9426f1f2045d0ae0f319530c3dc3a9240d838d07
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit f8aac6f69b2d5e28f428e9f7a64beac5878452ff)

pybind/tox: pass additional command line arguments through to tox

Fixes: 9426f1f2045d0ae0f319530c3dc3a9240d838d07
Fixes: https://tracker.ceph.com/issues/39579
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d04b44816028079ee65564d8244fe2b56c49047e)

tests: mgr/tox: make run-tox.sh scripts more robust

Also take into account that, following a recent code change, WITH_PYTHON3 now
gets set to "3" instead of "ON".

Fixes: http://tracker.ceph.com/issues/39323
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 9426f1f2045d0ae0f319530c3dc3a9240d838d07)

Merge pull request #27920 from sebastian-philipp/wip-39536-nautilus

nautilus: mgr/test_orchestrator: AttributeError: 'TestWriteCompletion' object has no attribute 'id'

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

mgr/dashboard: Display correct dialog title

The dialog to create a new S3 key shows the title 'Show S3 key' instead of 'Create S3 key'.

Fixes: https://tracker.ceph.com/issues/40047
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit c87e21da7729c395f9ff12486d38fceaf106a37c)

Merge pull request #28035 from pdvian/wip-39375-nautilus

nautilus: osd/OSD.cc: make osd bench description consistent with parameters

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

Merge pull request #28072 from pdvian/wip-39421-nautilus

nautilus: osd/OSDMap: Replace get_out_osds with get_out_existing_osds

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

Merge pull request #28088 from dzafman/wip-39721

nautilus: osd: Include dups in copy_after() and copy_up_to()

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

Merge pull request #28160 from pdvian/wip-39512-nautilus

nautilus: osd/PG: do not use approx_missing_objects pre-nautilus

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

Merge pull request #28164 from pdvian/wip-39514-nautilus

nautilus: osd: take heartbeat_lock when calling heartbeat()

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

Merge pull request #28205 from pdvian/wip-39519-nautilus

nautilus: osd: Don't evict after a flush if intersecting scrub range

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

Merge pull request #28219 from pdvian/wip-39539-nautilus

nautilus: osd/PG: fix last_complete re-calculation on splitting

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

Merge pull request #27632 from pdvian/wip-39043-nautilus

nautilus: osd/PGLog: preserve original_crt to check rollbackability

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

Merge pull request #27699 from liewegas/wip-39335-nautilus

nautilus: mgr/BaseMgrModule: run MonCommandCompletion on the finisher

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

Merge pull request #27711 from pdvian/wip-39184-nautilus

nautilus: osd: Primary won't automatically repair replica on pulling error

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

Merge pull request #27744 from ashishkumsingh/wip-39432-nautilus

nautilus: osd/PG: discover missing objects when an OSD peers and PG is degraded

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

Merge pull request #27771 from smithfarm/wip-39419-nautilus

nautilus: mon/Elector: format mon_release correctly

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

Merge pull request #27839 from pdvian/wip-39219-nautilus

nautilus: osd: FAILED ceph_assert(attrs || !pg_log.get_missing().is_missing(soid) || (it_objects != pg_log.get_log().objects.end() && it_objects->second->op == pg_log_entry_t::LOST_REVERT)) in PrimaryLogPG::get_object_context()

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

Merge pull request #27876 from liewegas/wip-autoscaler-fixes-nautilus

nautilus: mgr: fix pgp_num adjustments

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

mon/Monitor: allow probe if MMonProbe::mon_release == 0

Mimic doesn't set this, but we still need to allow them to probe us.

(and so does luminous)

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

mon: fix min_mon_release print

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

os/bluestore: fix missing discard in BlueStore::_kv_sync_thread

Discard comand should be issued before space released.

Signed-off-by: Junhui Tang <tangjunhui@sangfor.com.cn>
Fixes: https://tracker.ceph.com/issues/39621
(cherry picked from commit f6205d2eb2b8297b914afbaf54a8311f087eec90)

Merge pull request #28215 from smithfarm/wip-40003-nautilus

nautilus: do_cmake.sh: source not found

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge pull request #28062 from bk201/wip-39664-nautilus

nautilus: mgr/dashboard: incorrect help message for minimum blob size

Reviewed-by: Laura Paduano <lpaduano@suse.com>

mgr/dashboard: fix some performance data are not displayed

Several Grafana dashboards were updated and their uids are changed.
Update corresponding uids in angular templates. Also fix that when a user
clicks performance details of an OSD, wrong OSD metrics are displayed.

Fixes: http://tracker.ceph.com/issues/39971
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit acf90c5512678c43b4424d592c2212e4f45d3c0c)

mgr/dashboard: fix backend error when updating RBD interlocked features

Now object-map and fast-diff features are interlocked. Allow
enabling/disabling these two features together without raising an already
enabled/disabled error.

Fixes: http://tracker.ceph.com/issues/39933
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit d654e8c620537718cb85ccd4c327faedb001ad02)

osd/PG: fix last_complete re-calculation on splitting

We add hard-limit for pg_logs now, which means we might keep trimming
old log entries irrespective of pg's current missing_set. This as a
result can cause the last_complete pointer moving far ahead of the real
on-disk version (the oldest need of missing_set, for instance) the
corresponding pg should have on splitting:

```
2019-04-19 06:41:52.559247 7efd4725c700 10 osd.2 271 Splitting pg[5.6( v 270'943 lc 0'0 (238'300,270'943] local-lis/les=250/251 n=943 ec=223/223 lis/c 250/223 les/251/224/0 250/271/229) [5,2] r=1 lpr=271 pi=[223,271)/4 crt=270'943 unknown NOTIFY m=518 mbc={}] into 5.16
2019-04-19 06:41:52.561413 7efd4725c700 10 osd.2 pg_epoch: 271 pg[5.6( v 270'943 lc 238'300 (238'300,270'943] local-lis/les=250/251 n=943 ec=223/223 lis/c 250/223 c/f 251/224/0 250/271/229) [5,2] r=1 lpr=271 pi=[223,271)/4 crt=270'943 lcod 0'0 unknown NOTIFY m=261 mbc={}] release_backoffs [MIN,MAX)
```

For the above example, parent's last_complete cursor changed from **0'0** to
**238'300** directly due to the effort of trying to catch up the oldest
log entry changing when splitting was done. However, back into v12.2.9 primary
would still reference shard's last_complete field when trying to figure out all
possible locations of a currently missing object (see PG::MissingLoc::add_source_info):

```c++
  if (oinfo.last_complete < need) {
    if (omissing.is_missing(soid)) {
      ldout(pg->cct, 10) << "search_for_missing " << soid << " " << need
                         << " also missing on osd." << fromosd << dendl;
      continue;
    }
  }
```

Hence a wrongly calculated last_complete could then make primary mis-consider
that a specific shard might have the authoritative object it currently
looking for:

```
2019-04-19 06:41:52.904163 7fd4cfb5a700 10 osd.5 pg_epoch: 271 pg[5.6( v 270'943 lc 238'300 (238'300,270'943] local-lis/les=250/251 n=471 ec=223/223 lis/c 250/223 les/
c/f 251/224/0 250/271/229) [5,2] r=0 lpr=271 pi=[223,271)/4 crt=270'943 lcod 226'77 mlcod 0'0 peering m=16 mbc={}] proc_replica_log for osd.2: 5.6( v 270'943 lc 238'30
0 (238'300,270'943] local-lis/les=250/251 n=471 ec=223/223 lis/c 250/223 les/c/f 251/224/0 250/271/229) log((249'563,270'943], crt=270'943) missing(261 may_include_del
etes = 1)
2019-04-19 06:41:52.904645 7fd4cfb5a700 20 osd.5 pg_epoch: 271 pg[5.6( v 270'943 lc 238'300 (238'300,270'943] local-lis/les=250/251 n=471 ec=223/223 lis/c 250/223 les/
c/f 251/224/0 250/271/229) [5,2] r=0 lpr=271 pi=[223,271)/4 crt=270'943 lcod 226'77 mlcod 0'0 peering m=16 mbc={}]  after missing 5:624c3a7a:::benchmark_data_smithi190
_39968_object1382:head need 226'110 have 0'0
2019-04-19 06:41:53.567820 7fd4d035b700 10 osd.5 pg_epoch: 272 pg[5.6( v 270'943 lc 0'0 (238'300,270'943] local-lis/les=271/272 n=471 ec=223/223 lis/c 250/223 les/c/f
251/224/0 250/271/229) [5,2] r=0 lpr=271 pi=[223,271)/4 crt=270'943 lcod 226'77 mlcod 0'0 unknown m=16 u=13 mbc={255={(1+0)=220,(2+0)=28}}] search_for_missing 5:624c3a
7a:::benchmark_data_smithi190_39968_object1382:head 226'110 is on osd.2
```

note that ```5:624c3a7a:::benchmark_data_smithi190_39968_object1382:head 226'110```
was actually missing on both primary and shard osd.2 whereas primary insisted that
object should exist on shard osd.2!

https://github.com/ceph/ceph/pull/26175 posted an indirect fix
for the above problem by ignoring last_complete when checking the missing set,
but it should generally make more sense to fill in the last_complete field correctly
whenever possible.
Hence coming this additional fix.

Fixes: http://tracker.ceph.com/issues/26958
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit aad5d47be64ed7feba79f540ec1debc45625a74f)

Merge pull request #27937 from pdvian/wip-39288-nautilus

nautilus: [rbd-mirror] image replayer should periodically flush IO and commit positions

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

Merge pull request #27989 from smithfarm/wip-39590-nautilus

nautilus: qa/tasks/rbd_fio: fixed missing delimiter between 'cd' and 'configure'

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

Merge pull request #27882 from pdvian/wip-39224-nautilus

nautlius: librbd: do not allow to deep copy migrating image

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

Merge pull request #27903 from pdvian/wip-39226-nautilus

nautilus: librbd: support EC data pool images sparsify

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #27988 from smithfarm/wip-39541-nautilus

nautilus: tests: rbd: qemu-iotests tests fail under latest Ubuntu kernel

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

Merge pull request #28019 from pdvian/wip-39315-nautilus

nautilus: krbd: fix rbd map hang due to udev return subsystem unordered

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

Merge pull request #28128 from dillaman/wip-39729-nautilus

nautilus: qa/workunits/rbd: use https protocol for devstack git operations

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

Merge pull request #28132 from dillaman/wip-39195-nautilus

nautilus: librbd: fixed several race conditions related to copyup

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

do_cmake.sh: use bash

Fixes: http://tracker.ceph.com/issues/39981
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ac8d7c5fd4045d79ab6caacc0b72d64866fcc5c8)

osd: Don't evict after a flush if intersecting scrub range

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

osd: Don't include user changeable flag in snaptrim related assert

Caused by: a53ba7314c53e75d1e0b8a0edd29181db3c93863

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

Merge pull request #27752 from liewegas/wip-devices-doc-nautilus

nautilus: doc/rados/operations/devices: document device prediction

Reviewed-by: Sébastien Han <seb@redhat.com>

Merge pull request #27488 from sebastian-philipp/wip-39169-nautilus

nautilus: doc/mgr/orchestrator_cli: Rook orch supports mon update

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

Merge pull request #28163 from smithfarm/wip-39962-nautilus

nautilus: mgr/dashboard: openssl exception when verifying certificates of HTTPS requests

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>

ceph.spec.in: package prometheus default alerts for SUSE

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

monitoring: add a few prometheus alerts

Alerts are from
https://github.com/SUSE/DeepSea/blob/SES5/srv/salt/ceph/monitoring/prometheus/files/ses_default_alerts.yml
but updated for the mgr module and node_exporter >= 0.15.

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

monitoring/grafana: fix typo in README

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

osd: take heartbeat_lock when calling heartbeat()

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

systemd: ceph-mgr: set MemoryDenyWriteExecute to false

Fixes: http://tracker.ceph.com/issues/39628
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 1d7506fdce4924fb30bbabc65e26dafa06aab24f)

osd/PG: do not use approx_missing_objects pre-nautilus

We changed async recovery cost calculation in nautilus to also take
into account approx_missing_objects in ab241bf7e927cda2d0ed1698383d18dc4a4b601c
This commit depends on https://github.com/ceph/ceph/pull/23663, hence
wasn't backported to mimic.

Mimic only uses the difference in length of logs as the cost. Due to this,
the same OSD might have different costs in a mixed mimic and nautilus(or above)
cluster. This can lead to choose_acting() cycling between OSDs, when trying
to select the acting set and async_recovery_targets.

Fixes: https://tracker.ceph.com/issues/39441
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 4c617ecf1cf6f25cca42e5d59fa162dbc60f4de8)

Conflicts:
src/osd/PG.cc : Resolved in choose_async_recovery_ec and
choose_async_recovery_replicated

librbd: copyup read stats were incorrectly tied to child

The parent IO stats should be updated when reading from the parent
image for a copyup.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9b615c30753ad35636c875696ed951e807fd694c)

librbd: force a copyup object map update if migration completes

If a live-migration copyup was in-progress when the copyup completes,
force the object map to be updated.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e18e413b602208b38f432f4ba5bcb187fe102cb1)

librbd: cleaned up snap/parent lock release in read-from-parent path

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b7f6ba710d2855ea8f223d205a55a1e425167afd)

test/librbd: initial unit test for copyup state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ea4901f539c7404c07e72f5c42fc8abcf840dafa)

librbd: copyup should restart delayed ops against the same object

This avoids the potential for a race condition where an in-flight
copyup is removed from the in-flight copyup list and a subsequent
IO against the same object causes a second in-flight copyup.

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

librbd: merge copyup object map update states

The object map HEAD and HEAD/snapshot update states have been
simplified and merged into a single state. This also fixes
several potential race conditions and an issue where CoR might
incorrectly mark the HEAD object has exists+dirty.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5b90dbe0ae4be3dccfc3fbc0c8d5eb1ed7bb3168)