git.apps.os.sepia.ceph.com Git

Alfredo Deza [Tue, 20 Feb 2018 19:38:11 +0000 (14:38 -0500)]

ceph-volume tests verify exclude_group_options works with groups of flags

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

commit | commitdiff | tree

Alfredo Deza [Mon, 19 Feb 2018 21:31:29 +0000 (16:31 -0500)]

ceph-volume tests add exclusion checks in prepare

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

commit | commitdiff | tree

Alfredo Deza [Mon, 19 Feb 2018 21:31:04 +0000 (16:31 -0500)]

ceph-volume tests add exclusion checks in create

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

commit | commitdiff | tree

Alfredo Deza [Mon, 19 Feb 2018 21:28:52 +0000 (16:28 -0500)]

ceph-volume util.arg_validators create an arg group exclusion check

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

commit | commitdiff | tree

Alfredo Deza [Mon, 19 Feb 2018 21:26:36 +0000 (16:26 -0500)]

ceph-volume lvm.create use the new group option exclution

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

commit | commitdiff | tree

Alfredo Deza [Mon, 19 Feb 2018 21:26:21 +0000 (16:26 -0500)]

ceph-volume lvm.prepare use the new group option exclution

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

commit | commitdiff | tree

Alfredo Deza [Mon, 19 Feb 2018 20:13:04 +0000 (15:13 -0500)]

ceph-volume lvm.common remove --journal-size as it is not used/supported

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

commit | commitdiff | tree

Alfredo Deza [Mon, 19 Feb 2018 20:10:47 +0000 (15:10 -0500)]

ceph-volume lvm.common define arg groups for objectstores

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

commit | commitdiff | tree

Andrew Schoen [Fri, 23 Feb 2018 14:34:10 +0000 (15:34 +0100)]

Merge pull request #20559 from ceph/backport-wip-rm23080

luminous ceph-volume correctly normalize mount flags

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

commit | commitdiff | tree

Alfredo Deza [Thu, 22 Feb 2018 18:47:53 +0000 (13:47 -0500)]

ceph-volume tests.util update tests for mount flags

Include parametrized flags for ensuring a combination of values will
still be normalized regardless on how they are on ceph.conf

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

commit | commitdiff | tree

Alfredo Deza [Thu, 22 Feb 2018 18:47:11 +0000 (13:47 -0500)]

ceph-volume util.prepare normalize mount flags for CLI

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

commit | commitdiff | tree

Alfredo Deza [Thu, 22 Feb 2018 23:44:56 +0000 (18:44 -0500)]

Merge pull request #20545 from ceph/backport-20537

luminous: ceph-volume: adds support to zap encrypted devices

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

commit | commitdiff | tree

Andrew Schoen [Thu, 22 Feb 2018 17:01:10 +0000 (11:01 -0600)]

ceph-volume: use lv.encrypted property with lvm zap

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

commit | commitdiff | tree

Andrew Schoen [Thu, 22 Feb 2018 17:00:15 +0000 (11:00 -0600)]

ceph-volume: adds an encrypted property to api.lvm.Volume

This property will return a boolean indicating if the lv
is encrypted or not.

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

commit | commitdiff | tree

Andrew Schoen [Wed, 21 Feb 2018 22:03:03 +0000 (16:03 -0600)]

ceph-volume: add zapping to lvm dmcrypt tests

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

commit | commitdiff | tree

Andrew Schoen [Wed, 21 Feb 2018 20:44:09 +0000 (14:44 -0600)]

ceph-volume: test zapping for both lvm create and lvm dmcrypt

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

commit | commitdiff | tree

Andrew Schoen [Wed, 21 Feb 2018 20:28:06 +0000 (14:28 -0600)]

ceph-volume: adds support to zap encrypted devices, lvs, and partitions

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

commit | commitdiff | tree

Jenkins Build Slave User [Mon, 19 Feb 2018 23:14:46 +0000 (23:14 +0000)]

commit | commitdiff | tree

Kefu Chai [Mon, 19 Feb 2018 22:40:14 +0000 (06:40 +0800)]

cmake: disable DOWNLOAD_NO_PROGRESS if cmake ver is lower than 3.1

see https://cmake.org/cmake/help/v3.1/module/ExternalProject.html and
https://cmake.org/cmake/help/v3.0/module/ExternalProject.html. the
former has DOWNLOAD_NO_PROGRESS, while the latter does not.

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

commit | commitdiff | tree

Alfredo Deza [Fri, 16 Feb 2018 13:06:00 +0000 (08:06 -0500)]

Merge pull request #20452 from ceph/backport-wip-rm22785

luminous ceph-volume consume mount/format options from ceph.conf

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

commit | commitdiff | tree

Alfredo Deza [Fri, 16 Feb 2018 11:51:12 +0000 (06:51 -0500)]

ceph-volume tests remove unused import

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

commit | commitdiff | tree

Abhishek L [Fri, 16 Feb 2018 10:15:57 +0000 (11:15 +0100)]

Merge pull request #20451 from ceph/wip-yuri-PR20053-luminous

qa/tests: Applied PR 20053 to stress-split tests

Reviewed-By: Jason Dillaman <jdillaman@redhat.com>

commit | commitdiff | tree

Yuri Weinstein [Thu, 15 Feb 2018 18:26:46 +0000 (10:26 -0800)]

qa/tests: Applied PR 20053 to stress-split tests

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

commit | commitdiff | tree

Alfredo Deza [Mon, 12 Feb 2018 21:47:36 +0000 (16:47 -0500)]

ceph-volume util.prepare extend flags when found

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

commit | commitdiff | tree

Alfredo Deza [Mon, 12 Feb 2018 21:47:17 +0000 (16:47 -0500)]

ceph-volume util.constants update mount flags to include rw, normalize on list

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

commit | commitdiff | tree

Alfredo Deza [Mon, 12 Feb 2018 21:46:47 +0000 (16:46 -0500)]

ceph-volume configuration normalize underscore vs. whitespace named options

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

commit | commitdiff | tree

Alfredo Deza [Mon, 12 Feb 2018 21:46:06 +0000 (16:46 -0500)]

ceph-volume tests check for mount/format usage from ceph.conf

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

commit | commitdiff | tree

Alfredo Deza [Mon, 12 Feb 2018 21:44:45 +0000 (16:44 -0500)]

ceph-volume tests add ceph.conf stub for custom conf files

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

commit | commitdiff | tree

Andrew Schoen [Wed, 14 Feb 2018 15:59:11 +0000 (16:59 +0100)]

Merge pull request #20429 from ceph/backport-wip-rm22988

luminous ceph-volume use realpath when checking mounts

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

commit | commitdiff | tree

Alfredo Deza [Tue, 13 Feb 2018 18:22:41 +0000 (13:22 -0500)]

ceph-volume tests verify realpath usage in mounts

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

commit | commitdiff | tree

Alfredo Deza [Tue, 13 Feb 2018 17:59:48 +0000 (12:59 -0500)]

ceph-volume util.system optionally use realpath on devices

To check a mounted device it is needed to verify on a combination of
realpath and plain devices against realpath and plain paths. In LVM, two
different paths might refer to the same devices

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

commit | commitdiff | tree

Andrew Schoen [Wed, 14 Feb 2018 13:13:59 +0000 (14:13 +0100)]

Merge pull request #20438 from ceph/backport-wip-rm22876

luminous: ceph-volume: lvm zap will unmount osd paths used by zapped devices

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

commit | commitdiff | tree

Andrew Schoen [Mon, 12 Feb 2018 21:23:08 +0000 (15:23 -0600)]

ceph-volume: use terminal.MultiLogger in `lvm zap`

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

commit | commitdiff | tree

Andrew Schoen [Wed, 7 Feb 2018 15:06:45 +0000 (09:06 -0600)]

ceph-volume: use api helper methods for pvs and lvs in lvm zap

This is just a cleaner way of doing this instead of using PVolumes
and Volumes directly.

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

commit | commitdiff | tree

Andrew Schoen [Wed, 7 Feb 2018 14:35:47 +0000 (08:35 -0600)]

ceph-volume: fix documentation typos for lvm zap

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

commit | commitdiff | tree

Andrew Schoen [Thu, 1 Feb 2018 20:52:46 +0000 (14:52 -0600)]

ceph-volume: when zapping unmount osd directories

If you zap an lv, device or partition and it's currently mounted as a
ceph osd directory then it will be unmounted so the zap can complete.

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

commit | commitdiff | tree

Andrew Schoen [Thu, 1 Feb 2018 20:29:30 +0000 (14:29 -0600)]

ceph-volume: adds a util.system.unmount function

This function will unmount the given path

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

commit | commitdiff | tree

Casey Bodley [Tue, 13 Feb 2018 21:43:14 +0000 (16:43 -0500)]

Merge pull request #20407 from cbodley/wip-qa-multisite-trim-luminous

luminous: qa/rgw: disable log trim in multisite suite

Reviewed-by: Yuri Weinstein <yuri.weinstein@gmail.com>

commit | commitdiff | tree

Casey Bodley [Mon, 11 Dec 2017 21:14:05 +0000 (16:14 -0500)]

qa/rgw: disable log trim in multisite suite

the multisite tests run manual trim operations with radosgw-admin, which
can race with internal log trimming to produce tests failures

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

commit | commitdiff | tree

Andrew Schoen [Thu, 8 Feb 2018 17:56:12 +0000 (18:56 +0100)]

Merge pull request #20368 from ceph/backport-20367

luminous: ceph-volume: adds custom cluster name support to simple

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

commit | commitdiff | tree

Abhishek L [Thu, 8 Feb 2018 17:08:49 +0000 (18:08 +0100)]

Merge pull request #20357 from pdvian/wip-22938-luminous

luminous: rgw: unlink deleted bucket from bucket's owner

Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>

commit | commitdiff | tree

Andrew Schoen [Thu, 8 Feb 2018 13:09:57 +0000 (07:09 -0600)]

ceph-volume: use a custom cluster name in simple functional tests

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

commit | commitdiff | tree

Andrew Schoen [Wed, 7 Feb 2018 20:42:24 +0000 (14:42 -0600)]

ceph-volume: set conf.cluster name during simple activate

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

commit | commitdiff | tree

Orit Wasserman [Thu, 8 Feb 2018 10:43:44 +0000 (12:43 +0200)]

Merge pull request #20338 from cbodley/wip-22930

luminous: rgw: fix for empty query string in beast frontend
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

commit | commitdiff | tree

Casey Bodley [Thu, 18 Jan 2018 19:53:35 +0000 (14:53 -0500)]

rgw: unlink deleted bucket from bucket's owner

if a bucket is deleted by an admin/system user instead of its
owner, the unlink would fail and the deleted bucket remained
visible to the original owner

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:49:36 +0000 (14:49 -0800)]

Merge pull request #20204 from tchaikov/wip-pr-18614-luminous

luminous: osd,mgr: report pending creating pgs to mgr

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:45:33 +0000 (14:45 -0800)]

Merge pull request #20249 from pdvian/wip-22864-luminous

luminous: mds: fix scrub crash

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:45:07 +0000 (14:45 -0800)]

Merge pull request #20256 from pdvian/wip-22860-luminous

luminous: osdc: "FAILED assert(bh->last_write_tid > tid)" in powercycle-wip-yuri-master-1.19.18-distro-basic-smithi

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:44:39 +0000 (14:44 -0800)]

Merge pull request #20299 from pdvian/wip-22859-luminous

luminous: mds: set higher priority for some perf counters

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:44:03 +0000 (14:44 -0800)]

Merge pull request #20300 from pdvian/wip-22867-luminous

luminous: MDS : Avoid the assert failure when the inode for the cap_export from other…

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:41:45 +0000 (14:41 -0800)]

Merge pull request #20339 from batrick/i22242

luminous: mds: limit size of subtree migration

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:41:14 +0000 (14:41 -0800)]

Merge pull request #20340 from batrick/i22240

luminous: mds: prevent filelock from being stuck at XSYN state

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:40:33 +0000 (14:40 -0800)]

Merge pull request #20341 from batrick/i22089

luminous: mds: don't report repaired backtraces in damagetable, write back after repair, clean up scrub log

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

commit | commitdiff | tree

Yuri Weinstein [Wed, 7 Feb 2018 22:38:58 +0000 (14:38 -0800)]

Merge pull request #20337 from liewegas/wip-bluestore-aio-read

luminous: os/bluestore: propagate read EIO errors up the stack

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

commit | commitdiff | tree

Andrew Schoen [Wed, 7 Feb 2018 18:02:31 +0000 (19:02 +0100)]

Merge pull request #20350 from ceph/backport-20264

luminous: ceph-volume dmcrypt support for simple

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

commit | commitdiff | tree

Andrew Schoen [Tue, 6 Feb 2018 17:36:03 +0000 (11:36 -0600)]

ceph-volume: do not test custom cluster names with simple

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

commit | commitdiff | tree

Andrew Schoen [Tue, 6 Feb 2018 16:46:44 +0000 (10:46 -0600)]

ceph-volume: sleep 2 minutes after reboot in simple tests

This will allow for some time for OSD services to start back up after
reboot. If not we see race conditions where tests fail because they
were run before the OSD finished startup.

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

commit | commitdiff | tree

Andrew Schoen [Mon, 5 Feb 2018 20:18:28 +0000 (14:18 -0600)]

ceph-volume: adds the simple dmcrypt_plain and dmcrypt_luks tests

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

commit | commitdiff | tree

Andrew Schoen [Mon, 5 Feb 2018 19:53:13 +0000 (13:53 -0600)]

ceph-volume: fix ceph-volume simple scan help menu test

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:11:09 +0000 (09:11 -0500)]

ceph-volume tests.functional add simple xenial filestore dmcrypt plain support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:10:56 +0000 (09:10 -0500)]

ceph-volume tests.functional add simple xenial filestore dmcrypt luks support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:10:36 +0000 (09:10 -0500)]

ceph-volume tests.functional add simple xenial bluestore dmcrypt plain support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:10:12 +0000 (09:10 -0500)]

ceph-volume tests.functional add simple centos7 filestore dmcrypt plain support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:09:57 +0000 (09:09 -0500)]

ceph-volume tests.functional add simple centos7 filestore dmcrypt luks support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:09:41 +0000 (09:09 -0500)]

ceph-volume tests.functional add simple centos7 bluestore dmcrypt plain support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:09:21 +0000 (09:09 -0500)]

ceph-volume tests.functional add simple centos7 bluestore dmcrypt luks support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 14:08:23 +0000 (09:08 -0500)]

ceph-volume tests.functional add simple bluestore dmcrypt luks support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:36:45 +0000 (08:36 -0500)]

doc/ceph-volume lvm prepare fully supports encryption now

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:36:02 +0000 (08:36 -0500)]

doc/ceph-volume scan update for encryption support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:28:40 +0000 (08:28 -0500)]

doc/ceph-volume remove notice that dmcrypt is not supported

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:26:58 +0000 (08:26 -0500)]

doc/man/ceph-volume add simple documentation

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:15:36 +0000 (08:15 -0500)]

ceph-volume simple.scan update help menu to indicate device support

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:13:12 +0000 (08:13 -0500)]

ceph-volume tests for keyring parsing

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:12:51 +0000 (08:12 -0500)]

ceph-volume tests for validate_devices

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

commit | commitdiff | tree

Alfredo Deza [Fri, 2 Feb 2018 13:12:05 +0000 (08:12 -0500)]

ceph-volume simple.activate b64decode keys for activation as well

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 21:17:19 +0000 (16:17 -0500)]

ceph-volume tests add validation for lsblk parsers

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 20:51:41 +0000 (15:51 -0500)]

ceph-volume tests validate parsing of cryptsetup

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 20:51:12 +0000 (15:51 -0500)]

ceph-volume tests add a stub for process.call

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 20:35:11 +0000 (15:35 -0500)]

ceph-volume util.encryption add notes about extra b64decode call for ceph-disk

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 20:34:09 +0000 (15:34 -0500)]

ceph-volume util.encryption parse legacy encrypted with dirs too

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 20:32:54 +0000 (15:32 -0500)]

ceph-volume terminal create a logger to get terminal+log messages in one call

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 20:32:16 +0000 (15:32 -0500)]

ceph-volume simple.activate support dmcrypted devices for both plain and luks

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

commit | commitdiff | tree

Alfredo Deza [Thu, 1 Feb 2018 20:31:28 +0000 (15:31 -0500)]

ceph-volume simple.scan parse the keyring out of the keyring file

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

Conflicts:
src/ceph-volume/ceph_volume/devices/simple/scan.py

commit | commitdiff | tree

Alfredo Deza [Tue, 30 Jan 2018 21:23:06 +0000 (16:23 -0500)]

ceph-volume simple.scan support dmcrypt OSDs when scanning

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

commit | commitdiff | tree

Alfredo Deza [Tue, 30 Jan 2018 14:35:53 +0000 (09:35 -0500)]

ceph-volume util.encryption add a utilty to open plain encrypted devices

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

commit | commitdiff | tree

Alfredo Deza [Tue, 30 Jan 2018 14:34:53 +0000 (09:34 -0500)]

ceph-volume util.system tmp mounts can now remove a dmcrypt mapper

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

commit | commitdiff | tree

Alfredo Deza [Tue, 30 Jan 2018 14:22:19 +0000 (09:22 -0500)]

ceph-volume util.system do not 'translate' using realpath

Using realpath always means that device mapper paths, like for dmcrypt
or LVM will get mangled and will return something like `/dev/dm-1` which
is not useful for anything in ceph-volume

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

commit | commitdiff | tree

Alfredo Deza [Tue, 30 Jan 2018 14:19:06 +0000 (09:19 -0500)]

ceph-volume util.disk add a PART_ENTRY_TYPE detection utility

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

commit | commitdiff | tree

Alfredo Deza [Fri, 26 Jan 2018 15:44:14 +0000 (10:44 -0500)]

ceph-volume util.encryption add helpers for legacy devices

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

commit | commitdiff | tree

Alfredo Deza [Fri, 26 Jan 2018 15:25:31 +0000 (10:25 -0500)]

ceph-volume util.constants add ceph-disk partition labels

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

commit | commitdiff | tree

Alfredo Deza [Thu, 25 Jan 2018 16:04:15 +0000 (11:04 -0500)]

ceph-volume util.disk support PKNAME and absolute paths in lsblk

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

commit | commitdiff | tree

Alfredo Deza [Wed, 7 Feb 2018 13:19:29 +0000 (08:19 -0500)]

Merge pull request #20323 from ceph/backport-20203

luminous: ceph-volume: fix usage of the --osd-id flag

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

commit | commitdiff | tree

Alfredo Deza [Wed, 7 Feb 2018 13:18:32 +0000 (08:18 -0500)]

Merge pull request #20322 from ceph/backport-20059

luminous: doc/ceph-volume OSD use the fsid file, not the osd_fsid

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

commit | commitdiff | tree

Yuri Weinstein [Tue, 6 Feb 2018 22:21:16 +0000 (14:21 -0800)]

Merge pull request #20162 from tchaikov/wip-pr-20130-luminous

mgr: balancer: fixed mistype "AttributeError: 'Logger' object has no ...

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

commit | commitdiff | tree

Yuri Weinstein [Tue, 6 Feb 2018 22:20:18 +0000 (14:20 -0800)]

Merge pull request #20325 from jcsp/wip-22851-luminous

luminous: pybind/mgr/dashboard: fix duplicated slash in html href

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

commit | commitdiff | tree

Yuri Weinstein [Tue, 6 Feb 2018 22:19:14 +0000 (14:19 -0800)]

Merge pull request #20326 from theanalyst/wip-22892-luminous

luminous: _read_bdev_label unable to decode label at offset

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

commit | commitdiff | tree

Yan, Zheng [Sun, 19 Nov 2017 12:25:22 +0000 (20:25 +0800)]

mds: properly execute scrub finish context

Bug was introduced by commit 7e52729699 (mds: flush after scrub repairs)

Fixes: http://tracker.ceph.com/issues/22058
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit ff71fbdcbb87ffc9baa02319ff0f336c173c5616)

commit | commitdiff | tree

John Spray [Wed, 25 Oct 2017 13:39:15 +0000 (09:39 -0400)]

mds: clean up clog damage message when repairing

If we've repaired then we don't need to be at WRN
and we don't need to advise the user to look up
the damage detail.

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

commit | commitdiff | tree

John Spray [Wed, 25 Oct 2017 10:30:57 +0000 (06:30 -0400)]

mds: flush after scrub repairs

Otherwise, if we restart the MDS right after the scrub,
then scrub again, it will see the same inconsistency when
it looks at the on-disk state.

This involves adapting the use of ScrubHeader to be something
writeable during scrub to record whether repair happened.

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

commit | commitdiff | tree

John Spray [Wed, 25 Oct 2017 09:24:52 +0000 (05:24 -0400)]

mds: don't report repaired backtraces in damagetable

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