Merge pull request #10004 from dachary/wip-16374-jewel

jewel: AsyncConnection::lockmsg/async lockdep cycle: AsyncMessenger::lock, MDSDaemon::mds_lock, AsyncConnection::lock

Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #10003 from dachary/wip-16380-jewel

jewel: msg/async: connection race hang

Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #10036 from liewegas/wip-16297-jewel

mon: Monitor: validate prefix on handle_command()

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

Merge pull request #9547 from jcsp/wip-jewel-15705

jewel backport: mds: fix mdsmap print_summary with standby replays

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

Merge pull request #10293 from theanalyst/wip-16589-jewel

jewel: multisite sync races with deletes

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

Merge pull request #10453 from ajarr/wip-manila-backports-jewel

jewel: essential backports for OpenStack Manila

Reviewed-by: John Spray <john.spray@redhat.com>

ceph_volume_client: version on-disk metadata

Version on-disk metadata with two attributes,
'compat version', the minimum CephFSVolume Client
version that can decode the metadata, and
'version', the version that encoded the metadata.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 1c1d65a45f4574ca5f33cc9d949089a5c956e363)

ceph_volume_client: add versioning

Add class attributes to CephFSVolumeClient to version
its capabilities.

'version' attribute stores the current version number
of CephFSVolumeClient.

'compat_version' attribute stores the earliest version
number of CephFSVolumeClient that the current version is
compatible with.

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

ceph_volume_client: disallow tenants to share auth IDs

Restrict an auth ID to a single OpenStack tenant to enforce
strong tenant isolation of shares.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 82445a20a258a4c8800f273dc5f2484aace0e413)

ceph_volume_client: cleanup auth meta files

Remove auth meta files on last rule for an auth ID deletion

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit ec2e6e37d01c961d269d83661d0b95ada6a8449e)

ceph_volume_client: fix log messages

Log the path of the volume during creation and deletion of volumes.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 7731287761f91e1fdee0e6306d9ecf9b04ad363c)

ceph_volume_client: create/delete VMeta for create/delete volume

Create and delete volume meta files during creation and deletion of
volumes.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 37fbfc7aa8f10d37f5202603a906425507271ff5)

ceph_volume_client: modify locking of meta files

File locks are applied on meta files before updating the meta
file contents. These meta files would need to be cleaned up
sometime, which could lead to locks being held on unlinked meta
files. Prevent this by checking whether the file had been deleted
after lock was acquired on it.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit f7c037229bcf3f5a3d06897ec7fe0c5419dd7143)

cephfs.pyx: implement python bindings for fstat

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit f58403f3d19e22edeb8f91b6f87a0b7947b0ff21)

ceph_volume_client: restrict volume group names

Prevent craftily-named volume groups from colliding with meta files.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 7f7d2a76ae9b556c1de418f0eab8461c538f91d9)

ceph_volume_client: use fsync instead of syncfs

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 27eb51baab4cda6b385aef53fc7c3962a9debae5)

pybind: expose fsync in cephfs binding.

So we don't necessary to syncfs when want to persistent
some file.

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
(cherry picked from commit 1c952fbaf0fd393ef2dcb83a3db721a077b4274e)

ceph_volume_client: recover from dirty auth and auth meta updates

Check dirty flag after locking something and call recover() if we are
opening something dirty (racing with another instance of the driver
restarting after failure) -- only required if someone running multiple
manila-share instances with Ceph loaded.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 647a2447f0c4354dc21d1083043591d2b6f6f94f)

ceph_volume_client: modify data layout in meta files

Notable changes to data layout in auth meta and volume meta files:

In the auth meta files, add a 'dirty' flag to track the status of auth
updates to a single volume.

In the volume meta file, make the 'dirty' flag track the status of
auth updates for a single ID.

Optimize the recovery of partial auth update changes to auth meta,
volume meta, and the Ceph backend, facilitated by changes in the
data layout in the meta files.

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 7c8a28a7e817d030a4d419b0cc627c30c1064270)

pybind: ceph_volume_client authentication metadata

Store a two-way mapping between auth IDs and volumes.

Enables us to record some metadata on auth ids (which
openstack tenant created it) so that we can avoid exposing
keys to other tenants who try to use the same ceph
auth id.

Enables us to expose the list of which auth ids have access
to a volume, so that Manila's update_access() can be
implemented efficiently.

DNM: see TODOs inline.

Fixes: http://tracker.ceph.com/issues/15615
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit d2e9eb55ca6ed5daa094cf323faf143615b9380b)

pybind: enable integer flags to libcephfs open

The 'rw+' style flags are handy and convenient, but
they don't capture all possibilities.  Change to
optionally accept an integer here for advance users
who want to specify arbitrary combinations of
flags.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 5678584f4176d07301acd7f57acc4efd7fb20e43)

ceph_volume_client: allow read-only authorization for volumes

Allow clients to be restricted to read-only mount of the volume
by restricting their ceph auth ID's MDS and OSD caps to read-only.

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

Merge pull request #10373 from ceph/jewel-mds-snap-failover

Jewel mds snap failover

Reviewed-by: John Spray <john.spray@redhat.com>

client: fix MetaRequest::set_other_inode()

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 265f96bda7e106883063f074133450ce39ee262c)

client: close directory's snapdir when deleting directory

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 3099cabd11a16d22c6707631861bef0aa176ed02)

client: invalidate snap inodes after removing snapshot

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit f180ad149ab510626fcd6cbd8221f550f9858126)

mds: fix incorrect "unconnected snaprealm xxx" warning

If a snaprealm has no child/parent snaprelam, and the snaprealm inode
is not in the cache while client reconnects. The snaprealm does not
get properly removed from MDCache::reconnected_snaplrealm. This causes
incorrect "unconnected snaprealm xxx" warning

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 85e687de876ca7e0174734ba81130949c4ab6a40)

qa/workunits/fs: fix expect_failure function in test scripts

The origin expect_failure function return 0 regardness of command's
return value.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 16f7d7c71e65cd68cecde3e5b89d189ab5950548)

client: make sure snapflush is sent before normal cap message

MDS does null snapflush when it receives normal cap message. So client
must send snapflush first.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit d3916717e2edc8000400f678fa7134ca1406a074)

client: unify cap flush and snapcap flush

This patch includes following changes
- assign flush tid to snapcap flush
- remove session's flushing_capsnaps list. add inode with snapcap
  flushes to session's flushing_caps list instead.
- when reconnecting to MDS, re-send one inode's snapcap flushes and
  cap flushes at the same time.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit a05e996b2a2c36496abd8538829ac4897392f6eb)

mds: handle partly purged directory

For a snapshoted direcotry whose snaprealm parents are being opened,
MDS does not know if the directory is purgeable. So MDS can't skip
committing dirfrags of the directory. But if the direcotry is purgeale,
some dirfrags could have already been deleted during MDS failover.
Committing them could return -ENOENT.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit bc50e0309280c08c3ca79dfa5514ac3a15f81a23)

mds: do files recovery after processing cap flushes

File recovery may update inode and trigger inode COW. MDS relies on
client caps to setup CInode::client_need_snapflush. But for a given
client, the reconnected caps may not include the flushing caps.
(Before MDS failover, client released and flushed some caps at the
same time. When MDS recovers, client re-send the cap flush and send
cap reconnect to the MDS.) This may cause later snapflush to get
dropped.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit dd98448d3d0bbb7d338f03f7ad1e40f217eebe0d)

mds: combine MDCache::{reconnected_caps,cap_imports_dirty}

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 57067e032e84bbdb69c499aa7ea93ca68082569b)

mds: remove CEPH_LOCK_IFLOCKL from cinode_lock_info

Currently we don't support dirty CEPH_CAP_FLOCK_EXCL

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit cfc3ec17b6f245e6d8a0be4fdf6cfa64d2fb725f)

mds: rebuild the internal states that tracking pending snapflush

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 1b7d198f633a8608b704f82f01a3f4a4a3a4892b)

mds: using cap_reconnect_t to track cap recconect

Previous commit extended cap_reconnect_t to include snapflush
related information. This information are needed in various
places

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 25b6011dcf07c1fc663cbe29ffd119b66545a0ac)

mds: add 'follows' of first pending snapflush to cap reconnect message

This helps the recovering MDS to reconstruct the internal states that
tracking pending snapflush.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit dd3963a878d4bb2fb5992278ccbc9f7633fb8786)

mds: journal snap inodes that need flush when expiring log segment

Treat snap inodes that need flush in the same way as open files.
When MDS recovers, this make sure that journal replay bring snap
inodes that need flush into the cache

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 306153b3d012832bdfa20402077fa60a9a5d626c)

mds: properly update client_snap_caps when splitting snap inode

update the new snap inode's client_snap_caps according to the old
snap inode.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 4883779935219817c7e391940a025be1679daeb5)

install-deps: Get the latest virtualenv in a temporary folder
to work around a bug in old virtualenv

Signed-off-by: Oleh Prypin <oleh@pryp.in>
(cherry picked from commit 2699b6d89b8c1c193fd86b5233d1ea86458753a0)

Merge remote-tracking branch 'upstream/pull/10298/head' into jewel

* upstream/pull/10298/head:
  doc: fix standby replay config

doc: fix standby replay config

I tried using these settings in tests without success. The correct config names
are prefixed with "mds".

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

rgw: add pg_ver to tombstone_cache

a tombstone cache was added to remember the mtime of deleted objects for
use with the HTTP_IF_MODIFIED_SINCE header, but the comparison was still
failing because of a missing pg_ver. added pg_ver to the tombstone cache
so it can be passed with HTTP_DEST_PG_VER

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

rgw: add obj tombstone cache

The obj tombstone cache is used in multi-zone environmet to keep
track of removed objects' mtime. This is then used to fetch remote
object only if its newer than the object that was removed, otherwise
we're just fetching ghost of the past.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit eb10214920c23b24edd94ca53d0f36c85404644d)

rgw: rgw_obj comparison also accounts for bucket id

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a7f32c4b1bd951b1a18b7d13013dc8e2822d6ffc)

cls/rgw: reduce tag_timeout significantly

The tag timeout is used for applying dir_suggest changes. Shorten it
so that changes will be reported early and can be used in data sync.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 99efdc673b7aed439eebdaa92ff117ba9646dd7c)

cls_rgw: dir_suggest entries bucket index logging

Fixes: http://tracker.ceph.com/issues/16222
Log entries that were set through the dir_suggest mechanism in
the bucket index log.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit ae00c5529219d81987425160dbb2a4e937661a6c)

cls/rgw: fix timespan comparison

Fixes: http://tracker.ceph.com/issues/16220
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e0a07f70f7740a66ffa2646e0a57e8bdc0285373)

rgw: data sync squash, prioritize object removal

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2fcd8b1d49aae2fd03b986dd10bb3f98d3b8f32e)

rgw: squash bi complete bi log entries

only process the newest complete operation in a bilog listing.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit f69db8e455f07c5594363c5beac329cb964be1ff)

rgw: stop bucket lease only after draining object sync operations

Fixes: http://tracker.ceph.com/issues/16143
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit be6ad9a76c3008ea25a737c0de718faab8fca611)

rgw: don't leak RGWRados::cr_registry on error

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

rgw: dont need atomic RGWRados::next_rados_handle

next_rados_handle is only accessed under an exclusive handle_lock

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

rgw: remove unneeded RGWRados::num_rados_handles

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

rgw: use vector for librados handles

using a vector instead of an array of pointers cleans up our
initialization/shutdown logic

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

Merge pull request #9268 from theanalyst/wip-15992-jewel

jewel: radosgw-admin: EEXIST messages for create operations

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

Merge pull request #8497 from sabaini/jewel

ceph-disk: Accept bcache devices as data disks

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

Merge pull request #9545 from Abhishekvrshny/wip-16117-jewel

jewel: rgw: aws4 parsing issue

Merge pull request #9568 from dreamhost/wip-16182

jewel: rgw: backport merge of static sites fixes

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

Merge pull request #9099 from Abhishekvrshny/wip-15841-jewel

jewel: s3website: x-amz-website-redirect-location header returns malformed HTTP response
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9265 from Abhishekvrshny/wip-15965-jewel

jewel: No Last-Modified, Content-Size and X-Object-Manifest headers if no segments in DLO manifest
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9267 from Abhishekvrshny/wip-15960-jewel

jewel: rgw: custom metadata aren't camelcased in Swift's responses
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9316 from Abhishekvrshny/wip-15954-jewel

jewel: rgw: initial slashes are not properly handled in Swift's BulkDelete
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9390 from vumrao/wip-vumrao-16071

jewel: rgw : cleanup radosgw-admin temp command as it was deprecated
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9542 from Abhishekvrshny/wip-15967-jewel

jewel: rgw: account/container metadata not actually present in a request are deleted during POST through Swift API
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9543 from Abhishekvrshny/wip-16040-jewel

jewel: rgw: updating CORS/ACLs might not work in some circumstances
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #9631 from dillaman/wip-16232

jewel: test: improve rbd-mirror test case coverage

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

mon: Monitor: validate prefix on handle_command()

Fixes: http://tracker.ceph.com/issues/16297
Signed-off-by: You Ji <youji@ebay.com>
(cherry picked from commit 7cb3434fed03a5497abfd00bcec7276b70df0654)

Merge pull request #9294 from theanalyst/wip-16009-jewel

jewel: radosgw-admin: failure for user create after upgrade from hammer to jewel

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

Merge pull request #9721 from trociny/wip-16289-jewel

jewel: qa/workunits/rbd: respect RBD_CREATE_ARGS environment variable

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

msg/async/AsyncConnection: make verify auth callback without connection lock

Fixes: http://tracker.ceph.com/issues/16237
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit 2b7776545c3f87d7f54a53190e65ec48378eaa05)

AsyncConnection: create writable event for in progress connection

Previously we use a tricky with ceph msgr protocol, if initiator side got
in progress connection state, it will wait until read event. Because if
tcp session built successfully server side will send the banner firstly
and initiator side will get read event. Otherwise, if connection failed,
read event also be called.

But actually man(2)[http://man7.org/linux/man-pages/man2/connect.2.html]
specify if we want to get notification whether connection built, we need
to listen writable event. It means when connection built, send buffer
is ready to be written.

This patch follow the strict nonblock connect process. Not fully sure fix
http://tracker.ceph.com/issues/15849

Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit a74ce419133881ff8618733a0501c4a47e1368e3)

Merge pull request #9425 from cbodley/wip-rgw-sync-retry-jewel

jewel: rgw: retry on bucket sync errors

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

Merge pull request #9327 from cbodley/wip-rgw-zone-modify-master-jewel

jewel: rgw: add_zone only clears master_zone if --master=false

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

Merge pull request #9242 from yehudasa/wip-15911-jewel

jewel: rgw: don't unregister request if request is not connected to manager

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

Merge pull request #9883 from dillaman/wip-16422

jewel: librbd: flag image as updated after proxying maintenance op

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

Merge pull request #9105 from Abhishekvrshny/wip-15768-jewel

jewel: FileStore: umount hang because sync thread doesn't exit

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

Merge pull request #9633 from liewegas/wip-async-jewel

msg/async: backports of all asyncmsgr fixes to jewel

Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #9576 from Abhishekvrshny/wip-16148-jewel

jewel: Scrub error: 0/1 pinned

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

Merge pull request #9575 from Abhishekvrshny/wip-16150-jewel

jewel: crash adding snap to purged_snaps in ReplicatedPG::WaitingOnReplicas

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

Merge pull request #8754 from kmroz/wip-backport-fix-run-dir-chown

jewel: global-init: fixup chown of the run directory along with log and asok files

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

Merge pull request #9578 from Abhishekvrshny/wip-16080-jewel

jewel: osd:sched_time not actually randomized

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

Merge pull request #9574 from Abhishekvrshny/wip-16153-jewel

jewel: Missing export for rados_aio_get_version in src/include/rados/librados.h

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

Merge pull request #9565 from dzafman/wip-15767-jewel

jewel: Fixes for list-inconsistent-*

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

Merge pull request #8904 from SUSE/wip-15700-jewel

jewel: rados/test.sh workunit timesout on OpenStack

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

librbd: flag image as updated after proxying maintenance op

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

Merge branch 'wip-dmick-install-deps-jewel' into jewel

install-deps.sh: use mk-build-deps instead of processing control

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

install-deps.sh: use mk-build-deps instead of processing control

mk-build-deps is designed to handle installing build dependencies;
use that instead, so '|' indications are handled properly.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 99bca09b8d09c41077a9d2141ff556b74328e57a)

xio: add MNop.h to dist tarball

This file is needed when we want to build a package with xio messenger
but was not added to dist tarball.

Signed-off-by: Roi Dayan <roid@mellanox.com>
(cherry picked from commit ac50842d81d271569d4149737834ac53b2f51db2)

qa/workunits/rbd: respect RBD_CREATE_ARGS environment variable

Fixes: http://tracker.ceph.com/issues/16289
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 3048d3c7ce800a6174c54946b838e4e4079ec609)

rados: Improve list-inconsistent json format

Use array "errors" of strings for the error bits
Change snapshot number to integer instead of hex

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

test: Fix test to not use jq -S which isn't avail in all distributions

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

test: Add testing of new scrub commands in rados

Test list-inconsistent-pg
Test list-inconsistent-obj
Test inconsistent-snapset

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

rados: Don't bother showing list-inconsistent-* errors that aren't set

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

osd, rados: Fixes for list-inconsistent-snapset

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

include, rados: Fixes for list-inconsistent-obj and librados

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

rados: Balance format sections in same do_get_inconsistent_cmd()

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

rados: Include epoch in the list-inconsistent-* command output

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

rados: Improve error messages for list-inconsistent commands

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

10.2.1