ceph-volume tests/functional run lvm list after OSD provisioning

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

Merge pull request #23127 from ceph/backport-mimic-23117

mimic: ceph-volume: unmount lvs correctly before zapping

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

ceph-volume: unmount lvs correctly before zapping

If the lv found does not include the meatadata to construct an osd path,
then we should try to unmount it's path instead.

Fixes: http://tracker.ceph.com/issues/24796
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 5b175a5bb68264b80c00cb4f04026a4d19ca20ad)

Merge pull request #22845 from smithfarm/wip-24736-mimic

mimic: add unit test for cls bi list command

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

Merge pull request #21523 from smithfarm/wip-18163

mimic: ceph-detect-init: stop using platform.linux_distribution

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #22684 from pdvian/wip-24472-mimic

mimic: spdk: fix ceph-osd crash when activate SPDK

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

Merge pull request #22948 from tchaikov/mimic-pr-22871

mimic: deb/rpm: add python-six as build-time and run-time dependency

Reviewed-by:  Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #22988 from pdvian/wip-24825-mimic

mimic: tests: make test_ceph_argparse.py pass on py3-only systems

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

Merge pull request #23017 from ceph/wip-cd-fix-supp-distro

mimic: qa/tests: fix supported distro lists for ceph-deploy

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Merge pull request #23030 from smithfarm/wip-24904-mimic

mimic: qa: client socket inaccessible without sudo

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

Merge pull request #23049 from zeichenanonym/mimic

mimic: include: fix build with older clang (OSX target)

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

Merge pull request #23084 from dzafman/wip-disable-skip-dd-mimic

mimic: osd: Change osd_skip_data_digest default to false and make it LEVEL_DEV

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

Merge pull request #23094 from theanalyst/wip-mimic-24958

mimic: osd: fix deep scrub with osd_skip_data_digest=true (default) and blue…

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

Merge pull request #23096 from cbodley/wip-mimic-qa-rgw-no-ec-cache

mimic: qa/rgw: disable testing on ec-cache pools

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

Merge pull request #23024 from smithfarm/wip-24865-mimic

mimic: common: Abort in OSDMap::decode() during qa/standalone/erasure-code/test-erasure-eio.sh

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

Merge pull request #23065 from pdvian/wip-24887-mimic

mimic: os/bluestore: fix races on SharedBlob::coll in ~SharedBlob.

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #23070 from smithfarm/wip-24942-mimic

mimic: build/ops: ceph.git has two different versions of dpdk in the source tree

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

Merge pull request #22812 from smithfarm/wip-24705-mimic

mimic: cephfs: allow prohibiting user snapshots in CephFS

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

Merge pull request #22835 from batrick/i24758

mimic: test gets ENOSPC from bluestore block device

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

Merge pull request #22869 from pdvian/wip-24583-mimic

mimic: osdc: Fix the wrong BufferHead offset

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

Merge pull request #22956 from joscollin/wip-24829-mimic

mimic: qa: fix ffsb cd argument

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

Merge pull request #22981 from joscollin/wip-24861-mimic

mimic: cephfs-journal-tool: Fix purging when importing an zero-length journal.

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

Merge pull request #22933 from smithfarm/wip-24813-mimic

mimic: rgw: REST admin metadata API paging failure bucket & bucket.instance: InvalidArgument

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

Merge pull request #22466 from pdvian/wip-24313-mimic

mimic: test/rgw: fix for bucket checkpoints

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

Merge pull request #22523 from smithfarm/wip-24253-mimic

mimic: rgw: Admin OPS Api overwrites email when user is modified

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #22590 from pdvian/wip-24352-mimic

mimic: rgw: add configurable AWS-compat invalid range get behavior

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

Merge pull request #22643 from pdvian/wip-24385-mimic

mimic: objects in cache never refresh after rgw_cache_expiry_interval

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #22815 from smithfarm/wip-24700-mimic

mimic: rgw-multisite: endless loop in RGWBucketShardIncrementalSyncCR

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

Merge pull request #22818 from smithfarm/wip-24701-mimic

mimic: rgw: index complete miss zones_trace set

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

Merge pull request #22821 from smithfarm/wip-24702-mimic

mimic: rgw: meta and data notify thread miss stop cr manager

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

Merge pull request #22880 from smithfarm/wip-24783-mimic

mimic: rgw: set cr state if aio_read err return in RGWCloneMetaLogCoroutine::state_send_rest_request

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

Merge pull request #22926 from smithfarm/wip-24619-mimic

mimic: multisite: RGWSyncTraceNode released twice and crashed in reload

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

Merge pull request #22927 from smithfarm/wip-24631-mimic

mimic: cls_bucket_list fails causes cascading osd crashes

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

Merge pull request #22929 from smithfarm/wip-24633-mimic

mimic: rgw performance regression for luminous 12.2.4

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

Merge pull request #22935 from smithfarm/wip-24809-mimic

mimic: rgw: Invalid Access-Control-Request-Request may bypass validate_cors_rule_method

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

Merge pull request #22941 from joscollin/wip-24807-mimic

mimic: rgw: fix gc may cause a large number of read traffic

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

Merge pull request #23001 from pdvian/wip-24831-mimic

mimic: rgw: "radosgw-admin objects expire" always returns ok even if the pro…

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #23021 from pdvian/wip-24834-mimic

mimic: rgw: radogw-admin reshard status command should print text for reshar…

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

ceph-detect-init: stop using platform.linux_distribution

This commit introduces a new function, _extract_from_os_release, which is
used (only on Linux) to extract the ID and VERSION_ID fields from the
/etc/os-release file. This is sufficient to positively determine the OS
and version on these systems, and enable ceph-detect-init to correctly
return systemd on them.

The commit includes unit tests asserting that _extract_from_os_release really
extracts the strings that we expect it to, using the contents of
/etc/os-release from a number of different operating systems targeted by Ceph.

This commit is not cherry-picked because ceph-detect-init has been dropped in
master.

Fixes: http://tracker.ceph.com/issues/18163
Signed-off-by: Nathan Cutler <ncutler@suse.com>

qa/rgw: disable testing on ec-cache pools

Fixes: http://tracker.ceph.com/issues/23965
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7cb50b495bb878483f9b9f77b137b6b831c96ccc)

osd: fix deep scrub with osd_skip_data_digest=true (default) and bluestore

The osd_skip_data_digest is about skipping the storing and checking of a
full-object data digest.  Here it is also disabling crc checks during
deep-scrub, which prevents us from detecting crc differences across
replicas.  Fix!

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

Conflicts:
src/osd/ECBackend.cc
  drop the non existant skip_data_digest in L
  drop the non existant skip_data_digest in L

common: Fix description for osd_skip_data_digest

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

common/options: disable osd_skip_data_digest

This is flawed in that it stops doing digests based on the primary's
backend store, not the replicas.

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

common/options: make osd_skip_data_digest a DEV option

And document/warn to never turn it off after it's been on.

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

Merge pull request #22222 from pdvian/wip-24203-mimic

mimic: rbd: Prevent the use of internal feature bits from outside cls/rbd

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #22662 from pdvian/wip-24388-mimic

mimic: librbd: utilize the journal disabled policy when removing images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #22667 from pdvian/wip-24390-mimic

mimic: rbd: rbd-mirror daemon failed to stop on active/passive test case

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

Merge pull request #22754 from pdvian/wip-24496-mimic

mimic: librbd: force 'invalid object map' flag on-disk update

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

Merge pull request #22843 from smithfarm/wip-24734-mimic

mimic: build/ops: order rbdmap.service before remote-fs-pre.target

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

Merge pull request #22891 from smithfarm/wip-24476-mimic

mimic: rbd: rbd trash purge --threshold should support data pool

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

Merge pull request #22892 from smithfarm/wip-24519-mimic

mimic: rbd: rbd-mirror simple image map policy doesn't always level-load instances

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

Merge pull request #22894 from smithfarm/wip-24596-mimic

mimic: rbd: yet another case when deep copying a clone may result in invalid object map

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #22943 from pdvian/wip-24698-mimic

mimic: librbd: fix crash when opening nonexistent snapshot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

dpdk: drop dpdk submodule

we are using spdk/dpdk for async msgr's dpdk backend since 01a9f178. so
no need to keep dpdk submodule anymore.

Fixes: http://tracker.ceph.com/issues/24032
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cb8087dfac31b8490fefdfca28d389b7b9901ef8)

os/bluestore: fix races on SharedBlob::coll in ~SharedBlob.

Example scenario:
  ```
  A: BlueStore::Collection::split_cache(src, dest)
  A: std::lock(src->cache->lock, dest->cache->lock)

  B: SharedBlob::~SharedBlob
  B: waits coll->cache->lock // coll == src

  A: sb->coll := dest
  A: unlocks both src and dest's cache mutexes

  C: // any locked operation on dest's cache
  C: acquires dest->cache->lock
  C: begins the op

  B: // with the src's cache mutex acquired
  B: BufferSpace::_clear(coll->cache) // coll == dest
  B: // oops, B operates on cache already locked by C
  ```

Fixes: http://tracker.ceph.com/issues/24859
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit d1b16749c7d32eead6e326c492ef9edf0d03a2b8)

include: fix build with older clang

to fix the FTBFS on clang shipped with xcode 9.1 (based on Clang 4.0).
This fixes ceph client library builds for the OSX target
initally targetted with PR #23034.

refs: #23034

Signed-off-by: Christopher Blum <zeichenanonym@web.de>

Merge pull request #23034 from tchaikov/mimic-clang-4

include: fix build with older clang

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

qa: use 4 mds cluster for multifs tests

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

qa: add one-off clusters to qa/cephfs/clusters

To consistently handle openstack configuration.

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

include: fix build with older clang

to fix the FTBFS on clang shipped with xcode 9.1 (based on Clang 4.0).

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

Merge pull request #22997 from liewegas/wip-24597-mimic

mimic: osd: do not blindly roll forward to log.head

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

qa: use root to find client admin socket

Permissions on /var/run/ceph changed post-Mimic.

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

global/global_init: fix stdout/stderr/stdin closing for daemonization

The global_init_postfork/prefork helpers close stdout/stdin/stderr on
fork and reopen /dev/null in their place.  This ensures that if later
code writes to those descriptors (e.g., a stray cout or cerr usage) the
output/input will go nowhere instead of interfering with some other open
fd.

However, with the use of preforker, there are other threads running when
these helpers are run, which means we can race with, say, filestore
opening an object file and end up sending log output there.

Fix by atomically replacing the fds with the dup2(2) syscall, which
will implicitly close and reopen the target fd in an atomic fashion.  This
behavior is present on both Linux and FreeBSD.

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

rgw: radogw-admin reshard status command should print text for reshard status

Fixes: http://tracker.ceph.com/issues/23257
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 14d25dca343c73108dcd6a04d9695b82d4719a63)

qa/tests: fix supported distro lists for ceph-deploy to include only
centos and ubuntu.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

Merge pull request #22842 from pdvian/wip-24547-mimic

mimic: rgw: have a configurable authentication order

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

Merge pull request #22888 from smithfarm/wip-24617-mimic

mimic: ValueError: too many values to unpack due to lack of subdir

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

Merge pull request #22986 from joscollin/wip-24843-mimic

mimic: rgw: require --yes-i-really-mean-it to run radosgw-admin orphans find

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

rpm: move make check-specific build deps to appropriate conditional block

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 12ef59fdb073261e5210229c7643eb62651cd869)

rpm: remove universal requires from distro-specific conditional blocks

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3a30dd13a362ffff6d02e5116c47b5f7ace078a3)

deb/rpm: add python-six as build-time and run-time dependency

python-six is used by dashboard's controllers. please note,
${python:Depends} is able to fill the installation dependencies for
debian package. so python-six is not added to Requires of ceph-mgr.

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

rgw: "radosgw-admin objects expire" always returns ok even if the process
fails.

Fixes: http://tracker.ceph.com/issues/24592
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit f6fe07e8f549f6c54e4bc81a89558f14e71d3d9f)

Merge pull request #22291 from pdvian/wip-24204-mimic

mimic: ceph_test_rados_api_misc: fix LibRadosMiscPool.PoolCreationRace

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

Merge pull request #22412 from tchaikov/mimic-cmake-boost-1.67

mimic: cmake: bump up the required boost version to 1.67

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

Merge pull request #22492 from tchaikov/mimic-24321

mimic: qa: wait longer for osd to flush pg stats

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

Merge pull request #22777 from croit/mimic-22977

mimic:  common/hobject: improved hash calculation for hobject_t etc

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

Merge pull request #22805 from smithfarm/wip-24708-mimic

mimic: ceph osd safe-to-destroy crashes the mgr

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

Merge pull request #22813 from smithfarm/wip-24747-mimic

mimic: change default filestore_merge_threshold to -10

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

Merge pull request #22887 from smithfarm/wip-24473-mimic

mimic: cosbench stuck at booting cosbench driver

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

Merge pull request #22889 from smithfarm/wip-24618-mimic

mimic: osd: choose_acting loop

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

Merge pull request #22910 from ifed01/wip-ifed-fix-23540-mimic

mimic: os/bluestore: fix incomplete faulty range marking when doing compression

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

Merge pull request #22960 from pdvian/wip-24805-mimic

mimic: osd/PrimaryLogPG: rebuild attrs from clients

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

Merge pull request #22550 from smithfarm/wip-24296-mimic

mimic: repeated eviction of idle client until some IO happens

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

Merge pull request #22810 from smithfarm/wip-24703-mimic

mimic: PurgeQueue sometimes ignores Journaler errors

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

Merge pull request #22816 from pdvian/wip-24537-mimic

mimic: common/DecayCounter: set last_decay to current time when decoding dec…

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

Merge pull request #22884 from smithfarm/wip-24704-mimic

mimic: mds: low wrlock efficiency due to dirfrags traversal

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

qa/standalone/osd/ec-error-rollforward: reproduce bug 24597

This reproduces http://tracker.ceph.com/issues/24597

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

qa/standalone/osd/repro_long_log.sh: fix test

The log trimming case wasn't quite right.  Before HEAD^ we were
rolling forward too aggressively and miscalculating the can_rollforward_to,
which affected the trim_to calculation.

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

osd/PG: do not blindly roll forward to log.head

If we are told we can roll forward by the primary, we should only roll
forward as far as the primary says we can.

This probably came out of the similar case in append_log(), but notably
that roll_forward() only happens if !transaction_applied (i.e., backfill
target), and that condition is not checked here.

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

Merge pull request #22886 from smithfarm/wip-24707-mimic

mimic: mgr/dashboard: Float numbers incorrectly formatted

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

Merge pull request #22265 from liewegas/wip-24308-mimic

mimic: mon/MDSMonitor: do not send redundant MDS health messages to cluster log

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

Merge pull request #22707 from pdvian/wip-24475-mimic

mimic: librados: fix buffer overflow for aio_exec python binding

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

Merge pull request #22826 from smithfarm/wip-24738-mimic

mimic: Bring back diff -y for non-FreeBSD

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

Merge pull request #22851 from smithfarm/wip-24766-mimic

mimic: build/ops: Mimic build fails with -DWITH_RADOSGW=0

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>

Merge pull request #22859 from smithfarm/wip-24769-mimic

mimic: set correctly shard for existed Collection

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

Merge pull request #22861 from smithfarm/wip-24771-mimic

mimic: osd: may get empty info at recovery

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

Merge pull request #22917 from smithfarm/wip-24803-mimic

mimic: Python bindings use iteritems method which is not Python 3 compatible

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

rgw: require --yes-i-really-mean-it to run radosgw-admin orphans find

Incorrect use of orphans find can lead to data loss. Warn users to be
extra cautious.

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

cephfs-journal-tool: Fix purging when importing an zero-length journal.

When importing a zero-length purge_queue journal exported previously, the last object and
the following one are now being purged for removing potential junks. In this case,
there will be no writing performed actually, so the purged last object get lost permanently.

This can be fixed by purging the object following the last object, and by zeroing the last object
starting from the offset determined by the write_pos.

Fixes: https://tracker.ceph.com/issues/24239
Signed-off-by: yupeng chen <chenyupeng-it@360.cn>
Signed-off-by: zhongyan gu <guzhongyan@360.cn>
(cherry picked from commit b6c68dd55272f9066d7b5cf2fa30ea44f7c36533)

tests: make test_ceph_argparse.py pass on py3-only systems

On systems that do not have Python 2 installed, this test fails to
import StringIO.

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