test: Make sure that extra scheduled scrubs don't confuse test

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

Merge pull request #28958 from smithfarm/wip-40710-nautilus

nautilus: doc: Document more cache modes

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

Merge pull request #28919 from LenzGr/nautilus-documentation

nautilus: doc: Improved dashboard feature overview

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #28738 from smithfarm/wip-40140-nautilus

nautilus: doc: steps to disable metadata_heap on existing rgw zones

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

Merge pull request #29137 from yuriw/wip-yuriw-40832-nautilus

qa/tests: added 14.2.2 to the mix

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

Merge pull request #28768 from dzafman/wip-40265

nautilus: osd: Don't randomize deep scrubs when noscrub set

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

Merge pull request #29050 from rhcs-dashboard/fix-40768-nautilus

nautilus: mgr/dashboard: switch ng2-toastr to ngx-toastr

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

qa/tests: added 14.2.2 to the mix

Fixes: http://tracker.ceph.com/issues/40251
Fixes: http://tracker.ceph.com/issues/40832
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #28230 from ivancich/nautilus-wip-rgw-admin-unordered

nautilus: rgw: allow radosgw-admin to list bucket w --allow-unordered

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

Merge pull request #28769 from dillaman/wip-40572-nautilus

nautilus: librbd: properly track in-flight flush requests

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

Merge pull request #28816 from trociny/wip-40462-nautilus

nautilus: journal: properly advance read offset after skipping invalid range

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

Merge pull request #28817 from trociny/wip-40594-nautilus

nautilus: rbd-mirror: handle duplicates in image sync throttler queue

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

Merge pull request #28937 from smithfarm/wip-systemd-dep-suse-nautilus

nautilus: ceph.spec.in: Drop systemd BuildRequires in case of building for SUSE

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

Merge PR #29079 into nautilus

* refs/pull/29079/head:
client: do not return EEXIST for mkdirs
pybind/mgr/volumes: print exceptions in purge thread
pybind/mgr/volumes: refactor trash readdir
pybind/mgr/volumes: use existing client provided recursive mkdir
pybind/mgr/volumes: cleanup fs removal
pybind/mgr/subvolumes: use bytes for paths
pybind/mgr/volumes: remove unused property
test: cleanup removing all subvolumes before removing subvolume group
mgr / volumes: wrap rmtree() call within try..except block
mgr / volumes: use negative error codes everywhere
test: add basic purge queue validation test
mgr / volumes: schedule purge job for volumes on init
mgr / volumes: purge queue for async subvolume delete
mgr / volumes: maintain connection pool for fs volumes
mgr/volumes: do not import unused module

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

14.2.2

mgr/dashboard: Switch ng2-toastr for ngx-toastr

Fixes: https://tracker.ceph.com/issues/40768
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 67f5e5b18b71ccabcaa8d9e35c57630d17395b06)
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
Required manual (trivial) fixing of the following files:
Conflicts:
      src/pybind/mgr/dashboard/frontend/package.json
      src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.spec.ts
      src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts
      src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts
      src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts
      src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.spec.ts

client: do not return EEXIST for mkdirs

Behavior should be similar to `mkdir -p`.

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

pybind/mgr/volumes: print exceptions in purge thread

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

pybind/mgr/volumes: refactor trash readdir

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

pybind/mgr/volumes: use existing client provided recursive mkdir

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

pybind/mgr/volumes: cleanup fs removal

In Nautilus, the simplest sequence is:

    fs fail name
    fs rm name --yes-i-really-mean-it

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

pybind/mgr/subvolumes: use bytes for paths

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

pybind/mgr/volumes: remove unused property

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

test: cleanup removing all subvolumes before removing subvolume group

Test `test_subvolume_create_with_desired_mode_in_group()` creates three
subvolume in a subvolume group. During cleanup, it only removed two of
the three subvolumes. This causes failure when removing the subvolume
group since it's not empty.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit ae470a64ecf8ded8bbe3dbe02b5a470fecb7e2c3)

mgr / volumes: wrap rmtree() call within try..except block

This will be invoked by purge threads, so be sure to catch all
exceptions and return proper error codes appropriately.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 04547c92c1424c3c17aa84c49bfbfe0ffe4ac781)

mgr / volumes: use negative error codes everywhere

cephfs python binding returns positive error code. mgr/volumes
incorrectly does error code checks assuming the error codes to
be negative.

this was not an issue till now since mgr/volumes mostly does a
`raise VolumeException()` for the most part followed by the exception
being displayed to the operator (one exception is catching cephfs
ObjectNotFound error, in which case -errno.ENOENT is returned
(and checked whereever required)).

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit dd569e22e8d1b6287207fb2d1a4269d0bef20784)

test: add basic purge queue validation test

.. and since we have async subvolume deletes now, check
trash directory for emptiness in other tests.

Fixes: http://tracker.ceph.com/issues/40036
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit aec1d90b3611fec19556c9e4c639cb8abf90e4b6)

mgr / volumes: schedule purge job for volumes on init

So as to kickstart leftover subvolume purges.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 06e44be9986e7598f557d9646d7f93c9db4bc89d)

mgr / volumes: purge queue for async subvolume delete

Support asynchronous subvolume deletes by handing off the delete
operation to a dedicated set of threads. A subvolume delete operation
renames the subvolume (subdirectory) to a unique trash path entry
and signals the set of worker threads to pick up entries from the
trash directory for background removal.

This commit implements a `thread pool` strategy as a class mixin.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 483a2141fe8c9a58bc25a544412cdf5b047ad772)

mgr / volumes: maintain connection pool for fs volumes

Right now every [sub]volume call does a connect/disconnect to the
cephfs filesystem. This is unnecessary and can be optimized by
caching the filesystem handle in a connection pool and (re)using
the handle for subsequent [sub]volume operations.

This would be useful for implementing features such as purge queue
for asynchronous subvolume deletes.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 5c41e949af9acabd612b0644de0603e374b4b42a)

mgr/volumes: do not import unused module

cephfs is not used in this module, so drop its `import`

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

Merge PR #28589 into nautilus

* refs/pull/28589/head:
msg/async/ProtocolV[12]: add ms_learn_addr_from_peer

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

Merge PR #28646 into nautilus

* refs/pull/28646/head:
os/bluestore: BitmapAllocator::allocate: log new extents only
os/bluestore: distinguis request and results in bitmap alloc log
os/bluestore: fix duplicate allocations in bmap allocator

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

Merge PR #29032 into nautilus

* refs/pull/29032/head:
qa/tasks/mgr/dashboard/test_health: fix test_full_health test
mon: use per-pool stats only when all OSDs are reporting
osd: report whether we have per-pool stats
osd/osd_types: osd_stat_t: include num_per_pool_osds member

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

Merge pull request #29028 from ceph/backport-nautilus-28060

nautilus: ceph-volume: use the Device.rotational property instead of sys_api

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

qa/tasks/mgr/dashboard/test_health: fix test_full_health test

New fields!

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

mon: use per-pool stats only when all OSDs are reporting

Previously, we would start using the per-pool stat sums as soon as *any*
OSDs were reporting.  For a legacy cluster, that meant that as soon as
one bluestore instance is updated or one new bluestore OSD is created, the
usage stats per pool would become useless.

Instead, only use the per-pool stats once *all* OSDs are reporting the new
values.  This mostly aligns with the health warning when one more bluestore
OSDs are not reporting; once they are update the warning goes away.  (That
does not factor in fielstore OSDs, though; all OSDs need to be new *and*
bluestore.)

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

# Conflicts:
# src/messages/MGetPoolStatsReply.h
- ctor arguments are all weird
# src/mon/PGMap.h
- lots of std:: everywhre
# src/osdc/Objecter.h
- std:: everywhere

osd: report whether we have per-pool stats

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

osd/osd_types: osd_stat_t: include num_per_pool_osds member

Count OSDs that are reporting per-pool stats.

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

Merge pull request #29022 from smithfarm/wip-40762-nautilus

nautilus: rgw: list bucket with start marker and delimiter will miss next object with char '0'

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

ceph-volume: skip missing interpreters when running tox tests

This will skip tests for versions of python that don't exist on the node
that's running the tests.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit f1db0a864814d9b81192d89b6eebb6c624ddec3b)

ceph-volume: use the Device.rotational property instead of sys_api

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1666822

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 8ebff475dfa136c88101ef7364820fe3c5cee547)

rgw: always generate after delimiter char to skip directory

the following code also need after_delim_s to skip directory after list
1000 objects

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 8c6678387b00c862d71cffd6fed6ca6c236e3fb7)

rgw: fix list bucket with start maker and delimiter '/' will miss next object with char '0'

'/' + 1 = '0', and the start marker will be skipped, so it will miss the
'0' object.

Fixes: http://tracker.ceph.com/issues/39989
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 43b5264c7d61ae3be56d68f131b544edee307a46)

Conflicts:
src/rgw/rgw_rados.cc
- nautilus lacks "unsigned" in the line "unsigned char e = delim.back();"

Merge pull request #27723 from ceph/backport-nautilus-26957

nautilus: ceph-volume: look for rotational data in lsblk

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

doc: cover more cache modes in rados/operations/cache-tiering.rst

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

ceph-volume: look for rotational data in lsblk

Also ask lsblk if a device is rotational if no information
is found in /sys/block, default to True if nothing is found.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1666822

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit de748f9aef894b247622ee5dc49c1fbc31097ad0)

Packaging: Drop systemd BuildRequires in case of building for SUSE

There is already pkgconfig(systemd) present, which, in SUSE's packaging,
translates to the same package (systemd.pc is shipped as part of the main
systemd package). Not explicitly mentioning 'systemd' as package name allows
the openSUSE Build Service though to find shortcuts by using the
bootstrap packages, i.e. systemd-mini (ABI/API complete).

Signed-off-by: Dominique Leuenberger <dimstar@opensuse.org>
(cherry picked from commit b48ea142de50ea7b0242e7f478578b9ee8e31b8f)

Merge pull request #28923 from ceph/backport-nautilus-28294

nautilus: tests: pass --ssh-config to pytest to resolve hosts when connecting

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

Merge pull request #28925 from ceph/backport-nautilus-28866

nautilus: ceph-volume broken assertion errors after pytest changes

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

Merge pull request #28924 from ceph/backport-nautilus-28836

nautilus: ceph-volume tests add a sleep in tox for slow OSDs after booting

ceph-volume api.lvm catch IndexError when parsing dmmapper output

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit bfff70d07a1ccf7fb11a96dd7c63335cfc9b5e26)

ceph-volume tests update to use error.value instead of str(error)

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 484be7ffb1e0865ff840090a73036567a1f4f5d2)

ceph-volume tests add a sleep in tox for slow OSDs after booting

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b398f99f810d97c94af6d943aed4c11a5fd69c19)

tests: pass --ssh-config to pytest to resolve hosts when connecting

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit ed708e520999c145c3cf8a0c51e4605f275a1771)

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

nautilus: qa/rgw: more fixes for swift task

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

qa/rgw: clean up arguments for swift task

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 89fa4e71de3cdbe13cd7a5bc6162babe3016cba4)

qa/rgw: swift task filters out config for skipped clients

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit ba3c17c4fad8672d95af0f3cb9e0fb4802d712e6)

qa/rgw: swift task looks for rgw_server endpoint

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 5e667c4f73b1f064cc324bcaff9fe35ca9a4abc6)

doc: Improved dashboard feature overview

Added some newly added features, improved wording.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
(cherry picked from commit f90c1113880d05159641b6923d6e09c489b7861a)

Merge pull request #28872 from badone/wip-40670-nautilus

nautilus: qa/ceph-ansible: cephfs_pools variable pgs should be pg_num

Merge pull request #28871 from badone/wip-40669-nautilus

nautilus: qa/ceph-ansible: ceph-ansible requires ansible 2.8

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

qa/ceph-ansible: Move to ansible 2.8

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

qa/ceph-ansible: Replace pgs with pg_num

ceph-ansible expects the variable pg_num, not pgs.

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

rbd-mirror: handle duplicates in image sync throttler queue

Fixes: http://tracker.ceph.com/issues/40519
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 2f35ab70a59fc22c02c98e5aa80a1e6cde29a226)

journal: properly advance read offset after skipping invalid range

Fixes: https://tracker.ceph.com/issues/40409
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 7b8fd11fc6f49ca69a8484ee4b175b530b2dd2a3)

Merge PR #28767 into nautilus

* refs/pull/28767/head:
mgr/volumes: fix incorrect VolumeException arguments
mgr/volumes: allow setting mode
mgr/volumes: allow setting data pool layout

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

osd: Don't randomize deep scrubs when noscrub set

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

mgr/volumes: fix incorrect VolumeException arguments

Fixes: http://tracker.ceph.com/issues/40429
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 695c493257c7e9ae4c2229926393f6487a622616)

mgr/volumes: allow setting mode

... of fs subvolumes and subvolume groups during their creation.

Fixes: https://tracker.ceph.com/issues/40299
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 5c00cc30a1ad49b01e4ab84a17b62def88fc83c4)

mgr/volumes: allow setting data pool layout

... of fs subvolumes and subvolume groups during their creation.

Fixes: https://tracker.ceph.com/issues/40431
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 22ed8915281033c39df5e6ecceb5eebdc4e1c594)

librbd: remove special case for starting AioCompletion ops

All ops can be immediately started now that flush ops won't
accidentally block themselves.

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

librbd: simplify IO flush handling through AsyncOperation

Allow ImageFlushRequest to directly execute a flush call through
AsyncOperation. This will allow the flush to be directly linked
to its preceeding IOs.

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

Merge pull request #27043 from sebastian-philipp/wip-38808-nautilus

nautilus: mgr/orchestrator: Remove "(add|test|remove)_stateful_service_rule"

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>

Merge pull request #28444 from pdvian/wip-39735-nautilus

nautilus: rgw: multisite: mismatch of bucket creation times from List Buckets

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

Merge pull request #28537 from smithfarm/wip-39740-nautilus

nautilus: rgw: swift object expiry fails when a bucket reshards

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #28538 from smithfarm/wip-39745-nautilus

nautilus: rgw: fix default_placement containing "/" when storage_class is standard

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

doc: describe metadata_heap cleanup

Fixes: http://tracker.ceph.com/issues/18174
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit e76604224c0e74bbb3350743910d263c6591fd26)

Merge pull request #28723 from yuriw/wip-yuriw-40452-nautilus

qa/tests: added `bluestore_warn_on_legacy_statfs: false` setting

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

qa/tests: added `bluestore_warn_on_legacy_statfs: false` setting

Fixes: http://tracker.ceph.com/issues/40467
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #28584 from rhcs-dashboard/nautilus-object-chart

nautilus: mgr/dashboard: show degraded/misplaced/unfound objects.

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

Merge pull request #28635 from b-ranto/wip-nautilus-dashboard-push

nautilus: mgr/dashboard: Push Grafana dashboards on startup

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

Merge pull request #28698 from cbodley/wip-qa-rgw-swift-skip-client-nautilus

nautilus: qa/rgw: fix swift warning message

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

Merge pull request #28661 from yuriw/wip-yuriw-40452-nautilus

qa/tests: added ragweed coverage to stress-split* upgrade suites

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

qa/rgw: fix swift warning message

  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/swift.py", line 245, in task
    log.warning('Swift tests cannot run on rhel 7.6+, skipping client {client}'.format(client))
KeyError: 'client'

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 9b8be0584dee616af9df01b9622bf53dfde00fad)

Merge pull request #28681 from batrick/shell-py3-fixes

nautilus: cephfs-shell: misc. cephfs-shell backports

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

cephfs-shell: use consistent naming for paths

And some small changes to make some commands take variable arguments and fix
defaults.

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

cephfs-shell: remove unnecessary instances of to_bytes

cephfs binding already automatically converts paths and some arguments to
bytes.

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

cephfs-shell: refactor list_items

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

pybind/cephfs: improve user-friendliness of DirResult

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

pybind/cephfs: avoid unicode check

py3 does not have the unicode built-in. Instead, simply try to do the encoding
and catch failures appropriately. If it quacks like a duck...

(Note that cython apparently cheats and allows the unicode check but this is
simpler.)

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

cephfs-shell: Remove unnecessary empty line

This patch fixes flake8 too many blank lines error.

Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit d141adac9ae8b704884d160b5458a431321a0b2a)

cephfs-shell: Fix flake8 bare 'except' warnings

Instead of bare 'except', catch OSError and libcephfs exceptions.

Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit d063e8b1e05a23f3f15fe2080ec57fe6242e64f4)

cephfs-shell: Remove unused variable 'e'

Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 6a0a5ed83d6d3e2bb9977bda2c773d5d5b6accf7)

cephfs-shell: Fix flake8 use != to compare str literals warning

Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit db7b9306fb94efbe0c12283c614554727fbf6f1e)

cephfs-shell: Fixe flake8 line too long error

Break the line into multiple lines and add new variable wherever necessary, to
fix the line too long error.

Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit e41d467d4f482665fb09bb00edde7c03d6376b82)

cephfs-shell: Remove whitespace after '('

This patch fixes flake8 whitespace error.

Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 2136530dab1d8894c10ec63bb84752604cf6065f)

cephfs-shell: Remove unused 'flag' variable

This patch fixes flake8 unused local variable error.

Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 20c31ea2397545790154140822cc2668d85b913f)

cephfs-shell: Fix flake8 invalid escape sequence warning

Backslash-character pair is not a valid escape sequence, since Python 3.6
version. Prefixing character 'r' to the escape sequence, fixes the warning.

Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit c7d217c2afcb9cdc64356f6a6b1f8f701c7814d9)

cephfs-shell: Remove unnecessary empty lines

This patch fixes flake8 too many blank lines error.

Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit f322affda07e41996189b43ec227856076d39d26)