Merge pull request #31683 from smithfarm/wip-42840-nautilus

nautilus: rgw: when resharding store progress json

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

Merge pull request #32058 from smithfarm/wip-43161-nautilus

nautilus: rgw: url encode common prefixes for List Objects response

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

Merge remote-tracking branch 'origin/nautilus-saved' into nautilus

14.2.6

qa/tasks/cbt: install python3 deps

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

Conflicts:
qa/tasks/cbt.py: install python36-* instead of python3-*
packages. as in EL7, python packages is still versioned using minor
version, and they don't "Provide" python3-*.

mon/PGMap.h: disable network stats in dump_osd_stats

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

 Conflicts:
src/mon/PGMap.h - trivial resolution

osd_stat_t::dump: Add option for ceph-mgr pythonn callers to skip ping network

Due to the overhead of this on large clusters, we removed the network
information was wasn't getting used anyway.

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

 Conflicts:
src/mon/PGMap.cc - trivial resolution
src/mon/PGMap.h - trivial resolution
src/osd/osd_types.h  - trivial resolution

Merge pull request #32466 from neha-ojha/wip-43364-2-nautilus

nautilus: mon/PGMap.h: disable network stats in dump_osd_stats

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

Merge pull request #32064 from smithfarm/wip-42997-nautilus

nautilus: osd/PeeringState: do not exclude up from acting_recovery_backfill

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

Merge pull request #32062 from smithfarm/wip-42853-nautilus

nautilus: mon/OSDMonitor: fix format error ceph osd stat --format json

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

Merge pull request #31740 from smithfarm/wip-42885-nautilus

nautilus: core: mon/OSDMonitor: Fix pool set target_size_bytes (etc) with unit suffix

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

Merge pull request #31736 from SUSE/wip-42846-nautilus

nautilus: msg: async/net_handler.cc: Fix compilation

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

Merge pull request #32067 from smithfarm/wip-42899-nautilus

nautilus: mgr/pg_autoscaler: only generate target_* health warnings if targets set

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

Merge pull request #31862 from smithfarm/wip-43012-nautilus

nautilus: rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers

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

Merge pull request #31684 from smithfarm/wip-42841-nautilus

nautilus: rgw: fix an endless loop error when to show usage

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

Merge pull request #31298 from smithfarm/wip-42555-nautilus

nautilus: rgw: prevent bucket reshard scheduling if bucket is resharding

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

Merge pull request #31289 from smithfarm/wip-42386-nautilus

nautilus: rgw: fix compile errors with boost 1.70

Merge pull request #31182 from croit/nautilus-rgw-bucket-stats-num-shards

nautilus: rgw: add num_shards to radosgw-admin bucket stats

Merge pull request #32050 from joke-lee/rgw-sts-crash-token-not-base64-nautilus

nautilus: rgw: fix rgw crash when token is not base64 encode

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

Merge pull request #31844 from smithfarm/wip-42994-nautilus

nautilus: mon: remove the restriction of address type in init_with_hosts

Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>

Merge pull request #31028 from smithfarm/wip-42197-nautilus

nautilus: osd/PrimaryLogPG: skip obcs that don't exist during backfill scan_range

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

Merge pull request #31852 from sseshasa/wip-41810-nautilus

nautilus: os/bluestore: Add config observer for osd memory specific options.

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

mon/PGMap.h: disable network stats in dump_osd_stats

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

 Conflicts:
src/mon/PGMap.h - trivial resolution

osd_stat_t::dump: Add option for ceph-mgr pythonn callers to skip ping network

Due to the overhead of this on large clusters, we removed the network
information was wasn't getting used anyway.

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

 Conflicts:
src/mon/PGMap.cc - trivial resolution
src/mon/PGMap.h - trivial resolution
src/osd/osd_types.h  - trivial resolution

Merge pull request #31295 from smithfarm/wip-42537-nautilus

nautilus: ceph-volume/zfs: add the inventory command

Merge pull request #32028 from smithfarm/wip-43140-nautilus

nautilus: core: mon: keep v1 address type when explicitly set

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>

Merge pull request #31779 from rhcs-dashboard/wip-42900-nautilus

nautilus: mgr/dashboard: show "Rename" in header & button when renaming RBD

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

nautilus: mgr/dashboard: fix RGW subuser auto-generate key. (#32240)

nautilus: mgr/dashboard: fix RGW subuser auto-generate key.

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #32216 from smithfarm/wip-43233-nautilus

nautilus: tests: radosgw-admin: remove dependency on bunch package

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

Merge pull request #31089 from smithfarm/wip-41634-nautilus

nautilus: rgw: add bucket permission verify when copy obj

Merge pull request #30743 from smithfarm/wip-41978-nautilus

nautilus: rgw: fix list versions starts with version_id=null

Merge pull request #30733 from less-is-morr/wip-41636-nautilus

nautilus: rgw: gc remove tag after all sub io finish

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

Merge pull request #30741 from smithfarm/wip-41714-nautilus

nautilus: rgw: fix refcount tags to match and update object's idtag

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

Merge pull request #31301 from smithfarm/wip-42134-nautilus

nautilus: core: auth/Crypto: fallback to /dev/urandom if getentropy() fails

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

Merge pull request #31359 from smithfarm/wip-42203-nautilus

nautilus: osd: set affinity for *all* threads

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

Merge pull request #31735 from SUSE/wip-42739-nautilus

nautilus: mgr/devicehealth: ensure we don't store empty objects

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

Merge pull request #31367 from jan--f/wip-42400-nautilus

nautilus: ceph.in: check ceph-conf returncode

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

Merge pull request #32283 from neha-ojha/wip-42913-nautilus

nautilus: os/bluestore: default bluestore_block_size 1T -> 100G

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>

nautilus: mgr/dashboard: A block-manager can not access the po… (#31570)

nautilus: mgr/dashboard: A block-manager can not access the pool page

Reviewed-by: Ricardo Marques <rimarques@suse.com>

Merge pull request #32254 from ideepika/wip-43316-nautilus

nautilus: doc: wrong datatype describing crush_rule

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

Merge pull request #32035 from cbodley/wip-qa-rgw-swift-nautilus

qa/rgw: add missing force-branch: ceph-nautilus for swift tasks

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

Merge pull request #32229 from alimaredia/wip-s3-tests-branch-name-refactor-nautilus

nautilus: update s3-test download code for s3-test tasks

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

nautilus: update s3-test download code for s3-test tasks

Fixes: https://tracker.ceph.com/issues/43077
- Ensure the download code for all tasks running
s3-tests is consistent.
- Simplify download code to only use the config
variable 'force-branch' for the branch being
cloned.
- Make ceph-nautilus the force-branch for all
suites using s3-tests.
- Add force-branch to suites running s3readwrite
& s3roundtrip tasks

Signed-off-by: Ali Maredia <amaredia@redhat.com>

os/bluestore: default bluestore_block_size 1T -> 100G

This makes vstart *way* faster.  This option is only really relevant
for dev test environments.  We bumped it up back in dbdd1d9b6ec286982b5e86d4c51f831cc16afc12
from 10G just to make ENOSPC less common in dev/test.  Let's see if 100G
is a better balance.

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

 Conflicts:
src/common/options.cc: we did not cherry-pick
        dbdd1d9b6ec286982b5e86d4c51f831cc16afc12 to nautilus, so we'll directly
        go from 10G->100G

nautilus: mgr/dashboard: Use serial RGW Admin OPS API calls (#31569)

nautilus: mgr/dashboard: Use serial RGW Admin OPS API calls

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

nautilus: mgr/dashboard: Disable event propagation in the help… (#31566)

nautilus: mgr/dashboard: Disable event propagation in the helper icon

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

nautilus: mgr/dashboard: Remove title from sparkline tooltips (#31737)

nautilus: mgr/dashboard: Remove title from sparkline tooltips

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

doc/rados/operations: crush_rule is a name

like
```
ceph osd pool set <pool-name> crush_rule <rule-name>
```
where `<rule-name>` is a string instead of a number.

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

Merge pull request #32248 from neha-ojha/wip-32197-nautilus

nautilus: doc/_templates/page.html: redirect to etherpad

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

doc/_templates/page.html: redirect to etherpad

This simplifies things for users who are not able to add cards to
https://github.com/ceph/ceph/projects/4 due to insufficient permissions.

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

Merge pull request #31116 from smithfarm/wip-42462-nautilus

nautilus: doc/cephfs: improve add/remove MDS section

Reviewed-by: Jos Collin <jcollin@redhat.com>

nautilus: mgr/dashboard: Fix e2e chromedriver problem (#32241)

nautilus: mgr/dashboard: Fix e2e chromedriver problem

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

mgr/dashboard: Fix e2e chromedriver problem

New version of Chrome/ChromeDriver seems to have a problem with insecure
certificates.

Since we use a vStart cluster with no real certificate,
we always face this problem when running e2e tests.

This will fix the current problem and hopefully any future problems related to
certificates.

Fixes: https://tracker.ceph.com/issues/43254
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit f0f718f1770bf48028274c100406e0a564710174)

mgr/dashboard: fix RGW subuser auto-generate key.

Fixes: https://tracker.ceph.com/issues/43263
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 07a08aacea51aae04ba8607688ac4b75a8ee3b3f)

Merge pull request #31810 from bk201/wip-42948-nautilus

nautilus: mgr/dashboard: fix restored RBD image naming issue

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

nautilus: mgr/dashboard: Update translations nautilus (#31759)

nautilus: mgr/dashboard: Update translations nautilus

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

Merge pull request #31300 from smithfarm/wip-42259-nautilus

nautilus: doc, qa: remove invalid option mon_pg_warn_max_per_osd

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

qa: radosgw-admin: remove dependency on bunch package

Fixes: https://tracker.ceph.com/issues/43184
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 1bf21326aa7f8eaafd7049b44eb73aeb36bcc5d7)

rgw: fix rgw crash when token is not base64 encode

Fixes: https://tracker.ceph.com/issues/43018
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit b8fca700b52683931052d1567aa259647f977b59)
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>

os/bluestore: Add config observer for osd memory specific options.

Add config observer to enable changes to the following osd memory specific
options at runtime,
 - osd_memory_target
 - osd_memory_base
 - osd_memory_cache_min
 - osd_memory_expected_fragmentation

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 0d3609a2b7a88ae236335df9ea5d9854aa4de7ad)

 Conflicts:
src/os/bluestore/BlueStore.cc
- removed config changed detection of bluestore_max_defer_interval
  as it is not present in nautilus
src/os/bluestore/BlueStore.h
- removed declaration of max_defer_interval.

14.2.5

Merge pull request #32082 from liewegas/workaround-py2-strptime-nautilus

nautilus: mgr/devicehealth: import _strptime directly

mgr/devicehealth: import _strptime directly

On some machines (in my case, ubuntu 18.04 with 2.7.15+), I see

MGR_MODULE_ERROR Module 'devicehealth' has failed: Failed to import _strptime because the import lockis held by another thread.
    Module 'devicehealth' has failed: Failed to import _strptime because the import lockis held by another thread.

This is apparently an issue with datetime on py2, see

https://www.raspberrypi.org/forums/viewtopic.php?t=166912

Doing the import explicitly is a simple workaround (and resolves the
warning in my test case).

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

mgr/pg_autoscaler: only generate target_* health warnings if targets set

We may get into a situation where the pool stats appear to exceed the
cluster capacity.  If that happens, don't generate confusing health
messages about the target_{ratio,bytes} pool settings when they aren't
actually set at all.

Fixes: https://tracker.ceph.com/issues/42301
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4e5c4cdeb4e88d034e2fed7d6de97a4322a57adc)

osd/PeeringState: do not exclude up from acting_recovery_backfill

If we choose a primary that does not belong to the current up set,
and all up peers are still recoverable, then we might end up excluding
some up peer from the acting_recovery_backfill set too due to the
"want size <= pool size" constraint (since https://github.com/ceph/ceph/pull/24035),
as a result of which all up peers might not get recovered in one go.

Fix by falling through any oversized want set to async recovery, which
should be able to handle it nicely.

Fixes: https://tracker.ceph.com/issues/42577
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 22c8cdad8ee1d7376c7d200bdb6ec94ed6d3b5e6)

Conflicts:
    src/osd/PeeringState.cc
- file does not exist in nautilus; made changes manually in src/osd/PG.cc
- used dout(10) instead of psdout(10)

Revert "osd/PG: avoid choose_acting picking want with > pool size items"

This reverts commit c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3.

This commit is not cherry-picked from master because the corresponding
master commit - 82bb83f0ba930d7f83bea5a5397629b3e334bae2 - reverted changes
in a file - src/osd/PeeringState.cc - that doesn't exist in nautilus.

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

osd/OSDMap: fix format error ceph osd stat --format json

Fixes: https://tracker.ceph.com/issues/42501
Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
(cherry picked from commit a85499ca57dd22e61bcad614897dc5fd57196353)

rgw: url_encode prefixes if requested for List Objects

Also doesn't encode "/" similar to S3

Fixes: https://tracker.ceph.com/issues/41870
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 4cae7a26184b98f1fb11ef180a90c5db695ea2d8)

Conflicts:
src/rgw/rgw_rest_s3.cc
- trivial difference in white-space

rgw: make encode_key a member of ListBucket

So that it can be reused for other member functions that need to determine if
encoding is necessary

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

Conflicts:
src/rgw/rgw_rest_s3.cc
- trivial difference in white-space

Merge pull request #32045 from liewegas/fix-mon-autotune-leveldb-nautilus

nautilus: mon/OSDMonitor: make memory autotune disable itself if no rocksdb

mon/OSDMonitor: make memory autotune disable itself if no rocksdb

Currently, we crash (failed assertion). Instead, just disable autotuning.

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

Merge pull request #32018 from dzafman/wip-revert-verify-upmap-nautilus

nautilus: Revert "crush: remove invalid upmap items"

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

qa/rgw: add missing force-branch: ceph-nautilus for swift tasks

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

ceph-mon: keep v1 address type when explicitly set

Fixes: https://tracker.ceph.com/issues/42906
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit a97893e409050afcedb6e77c06e09d5b8a11b8d0)

Revert "crush: remove invalid upmap items"

This reverts commit d6b3025a279c3876df035b02c7b8ec13e0590d7f.

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

Merge pull request #31985 from liewegas/wip-fix-telemetry-log-typo-nautilus

nautilus: mgr/telemetry: fix typo

mgr/telemetry: fix log typo

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

Merge pull request #31974 from liewegas/wip-fix-crash-sorting-nautilus

nautilus: mgr/crash: fix 'crash ls[-new]' sorting

Merge pull request #31894 from smithfarm/wip-43030-nautilus

nautilus: doc: mention --namespace option in rados manpage

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

mgr/crash: fix 'crash ls[-new]' sorting

Broken by c691f2f8763a9db081a0b61294c5eedf4e9c2cee

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

doc: mention --namespace option in rados manpage

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

remove the restriction of address type in init_with_hosts when build initial monmap

Signed-off-by: Hao Xiong <hxiaong@ebay.com>
(cherry picked from commit 0c2da4b21a4df379f580472dc418809eb7622ee0)

Conflicts:
src/mon/MonMap.cc
- bf7490bf7c0e11e7f7630ddc4f0f831a42ba4c12 ("mon/MonMap: add weight to
  mon_info_t") will not be backported

rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers

Permit the existing logic for encrypton by a global master key
to take effect when a client has requested AES256 server-side encryption
with S3 managed keys, as well as SSE-KMS.

Fixes: https://tracker.ceph.com/issues/41670
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 80bffd9ae12f6b5846cf8efbffda71e9f921e18f)

Merge pull request #31833 from dillaman/wip-42891-nautilus

nautilus: cls/rbd: sanitize the mirror image status peer address after reading from disk

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

Merge pull request #31822 from neha-ojha/wip-31657-nautilus

nautilus: osd: release backoffs during merge

cls/rbd: sanitize the mirror image status peer address after reading from disk

RADOS upgrade tests were failing when OSDs were partially upgraded since the
entity_addr_t::type overload wasn't being recovered when re-read. Now we will
always sanitize the on-disk entity address after reading it to avoid such
issues of on-disk encoding/decoding.

Fixes: https://tracker.ceph.com/issues/42891
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1542d12e1b893166a5bc7b7a4c9a4474078a98be)

Conflicts:
src/cls/rbd/cls_rbd(_types).[h|cc]: the MirrorImageStatusOnDisk struct has moved

Merge pull request #31812 from jan--f/wip-42965-nautilus

nautilus: ceph-volume: check if we run in an selinux environment

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

osd: release backoffs during merge

When we merge PGs, ensure that backoffs release messages are sent to
the client before the victim PG is destroyed.  This is /almost/ handled
by on_shutdown(), except that the shutdown code is aggressive about
tearing down backoff state in order to manage the PGRef lifecycle
carefully--and because in the shutdown (or normal PG/pool deletion) case
it doesn't matter what (if anything) we tell the client.

Fix this by simply queuing the backoff release prior to shutting down the
merge source PG.

An alternative appraoch would be to rejigger the PGRef release timing, but
that code is very fragile and this is a more targetted fix for this issue.
We might consider a more careful look in the future... or not!

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

ceph-volume: add mock dependency to tox.ini

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

 ceph-volume: python2 raises OSError on Popen with missing binary.

For compatibility alias FileNotFoundError to OSError.

Fixes: 72b79f71fa84fe0d56b2fd1745f5bb130380cc38
Fixes: https://tracker.ceph.com/issues/42967
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 12c5f89ddb51a1db9399e03591e1db6c429b9c9e)

ceph-volume: py2 compatibility for selinux test

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

ceph-volume: don't assume SELinux

Expect selinux related binaries to not be present.

Fixes: 33c8a64a54d9ea8962091caf8564cea3f603c5f5
Fixes: https://tracker.ceph.com/issues/42957
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 72b79f71fa84fe0d56b2fd1745f5bb130380cc38)

ceph-volume: fix test test_selinuxenabled_doesnt_exist

Popen does not open a shell by default, so A FileNotFoundError is
raised instead of returning a 127 return code.

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

mgr/dashboard: fix restored RBD image naming issue

The new image name in the POST data should not be URL encoded.

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

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.ts
        - Dashboard support of RBD namespace feature is not available in nautilus

mgr/dashboard: Update translation

Updates the following translations:

- Czech
- German
- Spanish
- French
- Indonesian
- Italian
- Japanese
- Korean
- Polish
- Portuguese (Brazil)
- Chinese (China)
- Chinese (Taiwan)

I committed directly to the nautilus branch, because the differences of the
translation files between master and nautilus is too huge. We also track the
translations for each ceph version as a seperate resource on transifex.

Signed-off-by: Sebastian Krah <skrah@suse.com>

mgr/dashboard: show Rename in modal header & button when renaming RBD snapshot

Fixes: https://tracker.ceph.com/issues/42762
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit fa478ce4aed66013cee10864546715b1ce8d93a1)

Merge PR #30521 into nautilus

* refs/pull/30521/head:
qa: have kclient tests use new mount.ceph functionality
doc: document that the kcephfs mount helper will search keyring files for secrets
mount.ceph: fork a child to get info from local configuration
mount.ceph: track mon string and path inside ceph_mount_info
mount.ceph: add name and secret to ceph_mount_info
mount.ceph: add ceph_mount_info structure
mount.ceph: clean up debugging output and error messages
mount.ceph: clean up return codes
mount.ceph: add comment explaining why we need to modprobe
mount.ceph: use bools for flags
common: have read_secret_from_file return negative error codes

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

Merge pull request #31733 from epuertat/wip-42677-nautilus

nautilus: mgr/dashboard: Fix grafana dashboards

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

Merge pull request #30229 from vumrao/wip-vumrao-bluefs-shared-alloc-with-log-level-change-nautilus

nautilus: os/bluestore: apply shared_alloc_size to shared device with log level change

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #31704 from smithfarm/wip-42858-nautilus

nautilus: mon/PGMap: fix incorrect pg_pool_sum when delete pool

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