Merge pull request #20251 from pdvian/wip-22862-luminous

luminous: cephfs-journal-tool: Fix Dumper destroyed before shutdown

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

Merge pull request #20302 from pdvian/wip-22891-luminous

luminous: qa: synchronize kcephfs suites with fs/multimds

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

Merge pull request #20342 from batrick/i22688

luminous: client: release revoking Fc after invalidate cache

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

Merge pull request #20354 from pdvian/wip-22935-luminous

luminous: Client: setattr should drop "Fs" rather than "As" for mtime and size

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

Merge pull request #20356 from pdvian/wip-22936-luminous

luminous : Client:Fix readdir bug

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

Merge pull request #20417 from pdvian/wip-22966-luminous

luminous : qa: adjust cephfs full test for kclient

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

Merge PR #20522 into luminous

* refs/pull/20522/head:
qa: ignore full cluster warnings for mds-full

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

Merge PR #20457 into luminous

* refs/pull/20457/head:
qa: ignore bad backtrace cluster wrn
qa/cephfs: Add tests to validate scrub functionality
cephfs: Add option to load invalid metadata from disk
cephfs: Reset scrub data when inodes move

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

Merge pull request #20432 from pdvian/wip-22969-luminous

luminous: mds: fix session reference leak

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

Merge pull request #20455 from pdvian/wip-23013-luminous

luminous: mds: optimize getattr file size

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

Merge pull request #20523 from pdvian/wip-23061-luminous

luminous:qa: ignore MON_DOWN while thrashing mons

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

Merge pull request #20525 from pdvian/wip-23062-luminous

luminous: qa: ignore io pause warnings in mds-full test

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

Merge pull request #20626 from pdvian/wip-23150-luminous

luminous: mds: add uptime to MDS status

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

Merge pull request #20654 from pdvian/wip-23156-luminous

luminous: common: omit short option for id in help for clients

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

Merge pull request #20904 from pdvian/wip-23314-luminous

luminous: client: allow client to use caps that are revoked but not yet returned

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

Merge pull request #20960 from pdvian/wip-23355-luminous

luminous: client: use either dentry_invalidate_cb or remount_cb to invalidate k…

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

Merge pull request #21072 from ceph/backport-cv-vagrant-reload

luminous ceph-volume improve robustness when reloading vms in tests

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

ceph-volume tests create a retry script for vagrant reload

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

ceph-volume tests use a reload script in simple functional tests

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

ceph-volume tests use a reload script in lvm functional tests

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

Merge pull request #20253 from pdvian/wip-22857-luminous

luminous: librbd: potential crash if object map check encounters error

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

Merge pull request #20416 from pdvian/wip-22964-luminous

luminous: rbd-mirror: fix potential infinite loop when formatting status message

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

Merge pull request #20454 from pdvian/wip-23011-luminous

luminous: [journal] allocating a new tag after acquiring the lock should use on-disk committed position

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

Merge pull request #20550 from pdvian/wip-23064-luminous

luminous: test/librbd: utilize unique pool for cache tier testing

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

Merge pull request #20617 from smithfarm/wip-perms-ocf-rbd-luminous

luminous: cmake: rbd resource agent needs to be executable.

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

Merge pull request #20628 from pdvian/wip-23152-luminous

luminous: TestLibRBD.RenameViaLockOwner may still fail with -ENOENT

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

Merge pull request #20715 from pdvian/wip-23177-luminous

luminous: qa/workunits/rbd: switch devstack tempest to 17.2.0 tag

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

Merge pull request #20860 from pdvian/wip-23304-luminous

luminous: parent blocks are still seen after a whole-object discard

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Merge pull request #20967 from pdvian/wip-23407-luminous

luminous: cls/rbd: group_image_list incorrectly flagged as RW

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

Merge pull request #20991 from trociny/luminous-23423

luminous: librados/snap_set_diff: don't assert on empty snapset

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

Merge pull request #21001 from pdvian/wip-23414-luminous

luminous: PendingReleaseNotes: add note about upgrading MDS

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

PendingReleaseNotes: add note about upgrading MDS

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

Conflicts:
PendingReleaseNotes: added section 12.2.5 with cephfs release notes

Merge pull request #21031 from ceph/wip-yuriw-fix-j-x

qa/tests - Change machine type from 'vps' to 'ovh' as 'vps' does not …

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

qa/tests - Change machine type from 'vps' to 'ovh' as 'vps' does not exist anymore

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

Merge pull request #21015 from dzafman/wip-remove-bc-luminous

luminous: test: Replace bc command with printf command

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

test: Replace bc command with printf command

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

Merge pull request #20736 from pdvian/wip-23176-luminous

luminous: qa/rgw: remove some civetweb overrides for beast testing

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

Merge pull request #20859 from pdvian/wip-23302-luminous

luminous: rgw: add radosgw-admin sync error trim to trim sync error log

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

Merge pull request #20889 from pdvian/wip-23310-luminous

luminous: rgw: s3website error handler uses original object name

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

Merge pull request #20932 from pdvian/wip-23318-luminous

luminous: rgw: fix crash with rgw_run_sync_thread false

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

librados/snap_set_diff: don't assert on empty snapset

Instead treat the diff as a full-object delta.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 2be4840afd4fc54c2ad06ccc2aac903e45bd37f5)

Conflicts:
src/librbd/deep_copy/ObjectCopyRequest.cc
src/librbd/deep_copy/ObjectCopyRequest.h
            deep_copy::ObjectCopyRequest does not exist in luminous,
            fixed rbd_mirror::image_sync::ObjectCopyRequest instead

Merge pull request #20937 from pdvian/wip-23346-luminous

luminous: rgw: reject encrypted object COPY before supported

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

Merge pull request #20672 from linuxbox2/luminous-21942

luminous: rgw_log, rgw_file: account for new required envvars

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

Merge pull request #20741 from pdvian/wip-23179-luminous

luminous: rgw: can't download object with range when compression enabled

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

Merge pull request #20157 from pdvian/wip-22812-luminous

luminous: rgw: log the right http status code in civetweb frontend's access log

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

Merge pull request #20252 from pdvian/wip-22858-luminous

luminous: rgw: allow beast frontend to listen on specific IP address

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

Merge pull request #20345 from pdvian/wip-22889-luminous

luminous: rgw_file: avoid evaluating nullptr for readdir offset

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

Merge pull request #20476 from pdvian/wip-23020-luminous

luminous: rgw: fix the max-uploads parameter not work

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

Merge pull request #20477 from pdvian/wip-23022-luminous

luminous: rgw: upldate the max-buckets when the quota is uploaded

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

Merge pull request #20586 from pdvian/wip-23102-luminous

luminous: rgw: parse old rgw_obj with namespace correctly

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

Merge pull request #20072 from smithfarm/wip-22766-luminous

luminous: RGW doesn't check time skew in auth v4 http header request

Reviewed-by: Robin H. Johnson <robbat2@gentoo.org>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

cls/rbd: group_image_list incorrectly flagged as RW

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

Merge pull request #20906 from pdvian/wip-23317-luminous

luminous: doc: rgw: mention the civetweb support for binding to multiple ports

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #20242 from cbodley/wip-doc-rgw-frontends-luminous

luminous: doc/rgw: add page for http frontend configuration

Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>

client: use either dentry_invalidate_cb or remount_cb to invalidate kernel dcache

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit 6b823dc250223c2c25c341d6ffcfa64510f47bb2)

Merge pull request #20923 from ceph/backport-20910

luminous: ceph-volume: fix action plugins path in tox

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

rgw: reject encrypted object COPY before supported

Current implementation does not follow S3 spec and even
may result in data corruption silently when copying
multipart objects accorss pools. So reject COPY operations
on encrypted objects before it is fully functional.

Fixes: http://tracker.ceph.com/issues/23232
Signed-off-by: Jeegn Chen <jeegnchen@gmail.com>
(cherry picked from commit a1513efe21af694e04db466a4d1d63cfd857876e)

rgw: fix crash with rgw_run_sync_thread false

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

ceph-volume: fix action plugins path in tox

because of this commit [1] in ceph-ansible tests in ceph-volume needs to
be modified accordingly.

[1] https://github.com/ceph/ceph-ansible/commit/60d4b75f519c03fca91384f231b071793f582376

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 9fdc56717e72e79dca49fc22da37fd185369f216)

doc: rgw: mention the civetweb support for binding to multiple ports

We support binding multiple ports in civetweb after the upgrade to 1.8,
clarify this in the documentation as well

Fixes: http://tracker.ceph.com/issues/20942
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 01740c6a6c1ae523ac73c24235be0e4cef71e21c)

test: cap waits in delegation tests at 60s

This adds assertions to all of the looping wait functions that we will
not do more than 60000 loop iterations (~60s).

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit f3840ca301bff801eecdfe20a98726ab6d555ba6)

tests: add a test for doing a getattr while caps are recalled but before returned

Add a testcase to reproduce the deadlock I was seeing with delegations
in ganesha.

Tracker: http://tracker.ceph.com/issues/23028
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 91e5bfa2406dd64e6ed3e168d4cf47dee60ffff0)

client: allow getattr, lookup, fstatx, and readdir to use implemented caps

caps_issued_mask is a function that we call to see if we have all of
the caps provided in a mask. Usually this ignores caps that have been
revoked by the MDS but that have not yet been released by the client.
These caps are still valid though -- nothing else can use them until
they've been released.

These codepaths call caps_issued_mask only in order to determine
whether the client holds enough caps to trust cached attributes. They
don't take new references to the caps, so it should be safe to use the
"implemented" capset in these functions.

This helps break a deadlock that can occur when the client holds a
delegation that has been recalled, but needs to satisfy a getattr
request before releasing it.

Tracker: http://tracker.ceph.com/issues/23028
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit dacc7b6099f5c2e758e2811a7a6722bd0946eb39)

Conflicts:
src/client/Inode.cc: Resolved in Inode::caps_issued_mask

rgw: s3website error handler uses original object name

the s3website error handler needs to use the same object name for
redirect handling that retarget() does, but s->object.name may be
modified based on get_effective_key()

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

test/librados_test_stub: add mock version of `create`

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

librbd: create+truncate for whole-object layered discards

A whole-object layered discard is implemented as a truncate rather
than a delete: a dummy object is needed to prevent the CoW machinery
from kicking in.  However, a truncate on a non-existent object is
a no-op.  If the object doesn't exist in HEAD, a discard request is
effectively ignored -- parent blocks are still seen afterwards.

A non-exclusive create on an existing object is also a no-op, so the
fix is to do a compound create+truncate instead.

Fixes: http://tracker.ceph.com/issues/23285
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 0514480b16b0a1e76a9ba31cc3ba58a32b7bee18)

test/librbd: expect_object_may_exist(..., false) in DiscardRemoveTruncate

This is !is_no_op_for_nonexistent_object() test -- NONEXISTENT case is
the interesting one.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 9d6ee9a649861f1981981e41c82af8cd2914721b)

test/librbd: clone with parent features in DiscardRemoveTruncate

... otherwise object map expectations aren't actually set.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 513baf92ef010f7170719f4157f6d1a28fe5e051)

rgw: add radosgw-admin sync error trim to trim sync error log

Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com
(cherry picked from commit 233a4d237dca876aebe2891dd5f1a174f6904c62)

Conflicts:
doc/man/8/radosgw-admin.rst: Resolved for sync commands

Merge pull request #20851 from jdurgin/wip-pg-log-trim-error-luminous

osd: treat successful and erroroneous writes the same for log trimming

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

PrimaryLogPG: only trim up to osd_pg_log_trim_max entries at once

This prevents the fix for http://tracker.ceph.com/issues/22050 or
potential future bugs from causing too much latency by trimming too
many log entries at once.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 1c15458a00e64d1fd0127ae171305b8f8afa6619)

PG, PrimaryLogPG: trim log and rollback info for error log entries

Regular updates piggyback some osd state for this purpose with
MOSDRepOp[Reply]. Do the same thing for pure log entry updates (write
errors and lost/revert additions) via MOSDPGUpdateLogMissing[Reply].

Fixes: http://tracker.ceph.com/issues/22050
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit b50186bfe6c8981700e33c8a62850e21779d67d5)

Conflicts:
qa/standalone/osd/repro_long_log.sh
src/messages/MOSDPGUpdateLogMissing.h
src/messages/MOSDPGUpdateLogMissingReply.h
trival, encode/decode not namespaced

Merge pull request #20817 from tchaikov/wip-yet-another-23281-luminous

test/ceph-disk: specify the python used for creating venv

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

test/ceph-disk: specify the python used for creating venv

run-tox-ceph-disk always fails with following error

py27 runtests: commands[0] | coverage run --append --source=ceph_disk
/home/jenkins-build/build/workspace/ceph-pull-requests/src/ceph-disk/.tox/py27/bin/py.test
-vv
/home/jenkins-build/build/workspace/ceph-pull-requests/src/ceph-disk/tests/test_main.py
ERROR: InvocationError: could not find executable 'coverage'

but the log shows that coverage==3.7.1 was indeed installed in the py27
env. i tried to specify the full path of coverage in "commands" section
in tox.ini, but the problem persisted -- this time the backtrace was
printed, and the raised exception was 'OSError: [Errno 2] No such file
or directory'. so try to use the specified python for creating venv.

Fixes: http://tracker.ceph.com/issues/23281
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
        src/ceph-disk/tox.ini: the issue described above only exists
in luminous branch, so this change is not cherry-picked from master.

Merge pull request #20803 from dzafman/wip-zafman-log-trim-luminous

luminous: ceph-objectstore-tool command to trim the pg log

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

tools: Add pg log trim command to ceph-objectstore-tool

Add test script that verifies the command in qa/standalone/osd

Fixes: http://tracker.ceph.com/issues/23242
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b01e4ea5e2c1d2e9e997f53621aba73a7f7c9241)

Conflicts:
src/tools/ceph_objectstore_tool.cc
Different ops
Need ObjectStore::Sequencer
Use apply_transaction()
qa/standalone/special/ceph_objectstore_tool.py
Different ops

Merge pull request #20754 from ceph/backport-rm23163

luminous: ceph-volume tests alleviate libvirt timeouts when reloading

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

rgw: fix return value of auth v2/v4

* The return value of auth v2/v4 in RGW is different from that in AWS:
*     1. When 'Expires' is missing in auth v2 query string request, AWS
*     returns AccessDenied while RGW returns SignatureDoesNotMatch;
*     2. When 'X-Amz-Expires' is missing in auth v4 query string
*     request, AWS returns AuthorizationQueryParametersError while RGW
*     returns RequestTimeTooSkewed;
* Changes:
*     1. When 'Expires' is missing in auth v2 query string request,
*     change RGW's return value to AccessDenied;
*     2. When 'X-Amz-Expires' is missing in auth v4 query string
*     request, change RGW's return value to AccessDenied;
*     3. remove time skew check from parse_v4_query_string;

Fixes: http://tracker.ceph.com/issues/22439
Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
(cherry picked from commit ce42f1e8f51b71b242c17077d01fc3009d370e78)

rgw: share time skew check between v2 and v4 auth

this moves the new std::chrono-based v4 time skew check into a common
helper function, then uses that in place of the v2 check

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

Conflicts:
     src/rgw/rgw_auth_s3.cc - avoid C++17-ism (std::chrono::abs) in
                              is_time_skew_ok()

rgw: optimize time skew check

* Move query string check out of function is_time_skew_ok;

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
(cherry picked from commit 2c97b0ce8378dedef9296bd57273c0b9f1c1f440)

rgw: add time skew check in function parse_v4_auth_header

* In auth v4 http header request, RGW doesn't check time skew, while AWS
* does.

Fixes: http://tracker.ceph.com/issues/22418
Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
(cherry picked from commit b4e2f32206869501b808c97bcbfbbbef82eb8cf4)

ceph-volume tests alleviate libvirt timeouts when reloading

See vagrant-libvirt comment:

    https://github.com/vagrant-libvirt/vagrant-libvirt/issues/510#issuecomment-195326272

And ceph-ansible commit:

    https://github.com/ceph/ceph-ansible/commit/eae6ad6d40561f70679b4973d1bd4b39febd941c

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

Merge pull request #20716 from ceph/backport-rm22841

luminous ceph-volume be resilient to $PATH issues

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

rgw: download object might fail for local invariable uninitialized

This is an omission in #20226

Fixes: http://tracker.ceph.com/issues/23146
Signed-off-by: fang yuxiang <fang.yuxiang@eisoo.com>
(cherry picked from commit f5d2a666ed26574e2e4ec54470939e4acf29796a)

rgw: can't download object with range when compression enabled

Fixes: http://tracker.ceph.com/issues/22852
Signed-off-by: fang yuxiang <fang.yuxiang@eisoo.com>
(cherry picked from commit 1e3af175359d633c3728524396a22f9f33873ff2)

qa/rgw: remove some civetweb overrides for beast testing

these overrides were preventing frontend/beast.yaml from selecting the
beast frontend

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

ceph-volume process always try to expand the executable

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

ceph-volume tests.util ensure behavior of new which utility

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

ceph-volume util.system add a helper to find system executables

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

qa/workunits/rbd: switch devstack tempest to 17.2.0 tag

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

Merge pull request #20691 from ceph/backport-wip-rm23148

luminous docs fix ceph-volume missing sub-commands

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

Merge pull request #20679 from ceph/backport-rm22663

luminous doc: update man page to explain ceph-volume support bluestore

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

doc/rados add missing lvm subcommand for ceph-volume

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

doc/rados update bluestore-migration to use ceph-volume

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

doc: correcting typos in bluestore-config-ref and bluestore-migration

Signed-off-by: Katie Holly <git@meo.ws>
(cherry picked from commit 40e20986cddddb6bea13905a66a8b1fa554af21f)

doc: fix typo in bluestore-migration.rst

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
(cherry picked from commit ae660d902b9a57333aac87764e889c736597e557)

doc: restructure bluestore migration insructions

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

doc/rados/operations/bluestore-migration: Add instruction for evacuating
host

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit a9314f0a172b9607180a9212fbe405654365d56a)

doc/rados/operations/bluestore-migration: Fix typo in bluestore migration doc

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit f1b3d1e4bbffb1d8da99951ddfa13b2d1cb6a19d)

doc/rados/operations/bluestore-migration: use the new 'safe-to-destroy' command

Also use 'ceph osd ls-tree' to enumerate the ids.

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