]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoceph-kvstore-tool: define a noexcept non-default ctor for Deleter 39711/head
Kefu Chai [Fri, 26 Feb 2021 01:38:26 +0000 (09:38 +0800)]
ceph-kvstore-tool: define a noexcept non-default ctor for Deleter

the deleter of a unique_ptr<> should be value-initialized if we use
`unique_ptr()` for constructing the unique_ptr, but somehow, `Deleter`
does have a user-defined constructor which prevents the compiler from
creating a default constructor which could have made Deleter default
constructible.

in this change, a constructor accepts no arguments is explictly defined
to satisfy the requirements for creating `db` using `unique_ptr<>()`.

this change is not cherry-picked from master, as we don't define a
constructor at all for Deleter, so it is *always* value-initialized.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoceph-kvstore-tool: use unique_ptr<> manage the lifecycle of bluestore and db 39395/head
Kefu Chai [Tue, 10 Oct 2017 14:28:14 +0000 (22:28 +0800)]
ceph-kvstore-tool: use unique_ptr<> manage the lifecycle of bluestore and db

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

 Conflicts:
src/tools/ceph_kvstore_tool.cc

4 years agoMerge branch 'CVE-2020-27781-luminous' into HEAD
Patrick Donnelly [Wed, 16 Dec 2020 16:24:44 +0000 (08:24 -0800)]
Merge branch 'CVE-2020-27781-luminous' into HEAD

* CVE-2020-27781-luminous:
  tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize
  pybind/ceph_volume_client: Optionally authorize existing auth-ids
  pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id
  pybind/ceph_volume_client: Disallow authorize auth_id
  pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
4 years agotasks/cephfs/test_volume_client: Add tests for authorize/deauthorize
Kotresh HR [Tue, 1 Dec 2020 10:44:17 +0000 (16:14 +0530)]
tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize

1. Add testcase for authorizing auth_id which is not added by
   ceph_volume_client
2. Add testcase to test 'allow_existing_id' option
3. Add testcase for deauthorizing auth_id which has got it's caps
   updated out of band

Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit aa4beb3d993649a696af95cf27150cc460baaf70)

Conflicts:
qa/tasks/cephfs/test_volume_client.py

4 years agopybind/ceph_volume_client: Optionally authorize existing auth-ids
Kotresh HR [Sun, 6 Dec 2020 07:10:20 +0000 (12:40 +0530)]
pybind/ceph_volume_client: Optionally authorize existing auth-ids

Optionally allow authorizing auth-ids not created by ceph_volume_client
via the option 'allow_existing_id'. This can help existing deployers
of manila to disallow/allow authorization of pre-created auth IDs
via a manila driver config that sets 'allow_existing_id' to False/True.

Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 77b42496e25cbd4af2e80a064ddf26221b53733f)

4 years agopybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id
Kotresh HR [Thu, 26 Nov 2020 09:18:16 +0000 (14:48 +0530)]
pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id

Authorize/Deauthorize used to overwrite the caps of auth-id which would
end up deleting existing caps. This patch fixes the same by retaining
the existing caps by appending or deleting the new caps as needed.

Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 47100e528ef77e7e82dc9877424243dc6a7e7533)

4 years agopybind/ceph_volume_client: Disallow authorize auth_id
Ramana Raja [Wed, 25 Nov 2020 11:14:35 +0000 (16:44 +0530)]
pybind/ceph_volume_client: Disallow authorize auth_id

This patch disallow the ceph_volume_client to authorize the auth_id
which is not created by ceph_volume_client. Those auth_ids could be
created by other means for other use cases which should not be modified
by ceph_volume_client.

Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Ramana Raja <rraja@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 3a85d2d04028a323952a31d18cdbefb710be2e2b)

4 years agopybind/ceph_volume_client: Fix PEP-8 SyntaxWarning
Đặng Minh Dũng [Sun, 10 May 2020 04:37:23 +0000 (11:37 +0700)]
pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

Signed-off-by: Đặng Minh Dũng <dungdm93@live.com>
(cherry picked from commit 3ce9a89a5a1a2d7fa3d57c597b781a6aece7cbb5)

5 years agoMerge pull request #35776 from aclamk/wip-bluefs-log-replay-rescue-lum
Neha Ojha [Wed, 15 Jul 2020 21:33:08 +0000 (14:33 -0700)]
Merge pull request #35776 from aclamk/wip-bluefs-log-replay-rescue-lum

luminous:os/bluestore: Added rescue procedure for bluefs log replay

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoos/bluestore: Add documentation for large bluefs log recovery 35776/head
Adam Kupczyk [Wed, 1 Jul 2020 21:09:17 +0000 (23:09 +0200)]
os/bluestore: Add documentation for large bluefs log recovery

Adds additional paragraph to ceph-bluestore-tool documentation,
describing how to use *special* options --bluefs_replay_recovery
and --bluefs_replay_recovery_disable_compact to recover large
bluefs log.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
5 years agoos/bluestore: Add ability to disable compaction
Adam Kupczyk [Fri, 26 Jun 2020 16:04:57 +0000 (18:04 +0200)]
os/bluestore: Add ability to disable compaction

This ability only makes sense as a step that allows to perform fsck before commiting recovered bluefs log.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
5 years agoos/bluestore: Added rescue procedure for bluefs log replay
Adam Kupczyk [Tue, 23 Jun 2020 12:45:18 +0000 (14:45 +0200)]
os/bluestore: Added rescue procedure for bluefs log replay

This is a procedure tries to find on disk unreachable extents and pretend they were
already a part of bluefs log. If this gives proper crc, accept it.

Fixes: https://tracker.ceph.com/issues/46195
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
5 years agoMerge pull request #34876 from ifed01/wip-ifed-fix-no_compact_bluefs
Yuri Weinstein [Mon, 13 Jul 2020 16:48:57 +0000 (09:48 -0700)]
Merge pull request #34876 from ifed01/wip-ifed-fix-no_compact_bluefs

luminous: os/bluestore/BlueFS: compact log even when sync_metadata sees no work

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge pull request #35345 from sidharthanup/wip-xlock-luminous
Sidharth Anupkrishnan [Mon, 13 Jul 2020 14:07:01 +0000 (19:37 +0530)]
Merge pull request #35345 from sidharthanup/wip-xlock-luminous

luminous: mds: take xlock in the order requests start locking

5 years agoMerge PR #35516 into luminous
Patrick Donnelly [Fri, 10 Jul 2020 19:29:37 +0000 (12:29 -0700)]
Merge PR #35516 into luminous

* refs/pull/35516/head:
doc: mds-config-ref: update 'mds_log_max_segments' value.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #34937 from sidharthanup/mds-modify-active-reqs
Sidharth Anupkrishnan [Fri, 10 Jul 2020 14:03:12 +0000 (19:33 +0530)]
Merge pull request #34937 from sidharthanup/mds-modify-active-reqs

luminous: mds: Using begin() and empty() to iterate the xlist

5 years agoMerge pull request #33294 from batrick/i42160
Sidharth Anupkrishnan [Fri, 10 Jul 2020 14:01:56 +0000 (19:31 +0530)]
Merge pull request #33294 from batrick/i42160

luminous: cephfs: osdc: objecter ops output does not have useful time information

5 years agoMerge pull request #33293 from batrick/i42123
Sidharth Anupkrishnan [Fri, 10 Jul 2020 14:01:06 +0000 (19:31 +0530)]
Merge pull request #33293 from batrick/i42123

luminous: client: no method to handle SEEK_HOLE and SEEK_DATA in lseek

5 years agoMerge pull request #33292 from batrick/i41857
Sidharth Anupkrishnan [Fri, 10 Jul 2020 13:59:59 +0000 (19:29 +0530)]
Merge pull request #33292 from batrick/i41857

luminous: client: removing dir reports "not empty" issue due to client side filled wrong dir offset

5 years agodoc: mds-config-ref: update 'mds_log_max_segments' value. 35516/head
Konstantin Shalygin [Wed, 31 Jul 2019 03:26:37 +0000 (10:26 +0700)]
doc: mds-config-ref: update 'mds_log_max_segments' value.

Also drop options that not exists on code:

* mds_log_max_expiring
* mds_log_eopen_size

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
(cherry picked from commit 3e72a58698f6c14b46177c58449505ddc35b5277)

5 years agomds: take xlock in the order requests start locking 35345/head
Yan, Zheng [Mon, 27 Apr 2020 06:48:33 +0000 (14:48 +0800)]
mds: take xlock in the order requests start locking

this avoid assertion in MutaionImpl::finish_locking()

Fix: https://tracker.ceph.com/issues/45261
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 2e11a35d5b06312e0b2d0aecd83e8eb882ddf719)

5 years agomds: Using begin() and empty() to iterate the xlist 34937/head
shenhang [Thu, 27 Feb 2020 06:01:39 +0000 (14:01 +0800)]
mds: Using begin() and empty() to iterate the xlist
Fixes: https://tracker.ceph.com/issues/44316
The item p pointed to maybe cleaned during the process
 of request_kill previous one.

Signed-off-by: Shen Hang <harryshen18@gmail.com>
(cherry picked from 432ea90)

 Conflicts:
       src/mds/Server.cc

5 years agoos/bluestore/BlueFS: compact log even when sync_metadata sees no work 34876/head
Sage Weil [Wed, 30 Aug 2017 02:07:05 +0000 (22:07 -0400)]
os/bluestore/BlueFS: compact log even when sync_metadata sees no work

It's possible that when sync_metadata() is called there won't be any new
log data to flush because it was already flushed for other reasons (e.g.,
because fsync was called).  However, the log may still be large and in
need of compaction.

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

 Conflicts:
src/os/bluestore/BlueFS.cc
 Some pending release stuff that is now absent at both Luminous and
master.

5 years agoMerge pull request #34712 from ceph/wip-yuriw-clients-upgrades-luminous
Yuri Weinstein [Thu, 23 Apr 2020 18:22:10 +0000 (11:22 -0700)]
Merge pull request #34712 from ceph/wip-yuriw-clients-upgrades-luminous

qa/tests: removed 2-workload/devstack-tempest-gate.yaml  tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoqa/tests: removed 2-workload/devstack-tempest-gate.yaml tests 34712/head
Yuri Weinstein [Thu, 23 Apr 2020 15:25:24 +0000 (08:25 -0700)]
qa/tests: removed 2-workload/devstack-tempest-gate.yaml  tests

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34459 from badone/wip-44984-luminous
Brad Hubbard [Wed, 8 Apr 2020 21:55:13 +0000 (07:55 +1000)]
Merge pull request #34459 from badone/wip-44984-luminous

luminous: selinux: Allow ceph-mgr access to httpd dir

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoselinux: Allow ceph-mgr access to httpd dir 34459/head
Brad Hubbard [Mon, 6 Apr 2020 23:35:06 +0000 (09:35 +1000)]
selinux: Allow ceph-mgr access to httpd dir

ceph-mgr loads modules which require read access and this causes a
denial on el7.

Fixes: https://tracker.ceph.com/issues/44216
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 35a7fc8249337c3c59f0c561632abf578f5d20fc)

5 years agoMerge pull request #34159 from ceph/wip-yuriw-clients-upgrades-luminous-octopus
Josh Durgin [Fri, 3 Apr 2020 16:08:31 +0000 (09:08 -0700)]
Merge pull request #34159 from ceph/wip-yuriw-clients-upgrades-luminous-octopus

qa/tests: client-upgrade-luminous-octopus tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoqa/tests: use py3 version of rbd scripts 34159/head
Josh Durgin [Fri, 27 Mar 2020 15:39:49 +0000 (11:39 -0400)]
qa/tests: use py3 version of rbd scripts

client.1 is upgraded to octopus, so grab the same version of the rbd
workunit and test tree that will run py3 there.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agoqa/tests: skip python-ceph during upgrade
Josh Durgin [Fri, 27 Mar 2020 00:04:30 +0000 (20:04 -0400)]
qa/tests: skip python-ceph during upgrade

Octopus is python3-only so there are no python 2 packages to install.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agoqa/tests: client-upgrade-luminous-octopus tests
Yuri Weinstein [Tue, 24 Mar 2020 21:43:29 +0000 (14:43 -0700)]
qa/tests: client-upgrade-luminous-octopus tests

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34149 from yuriw/wip-yuriw-clients-upgrades-luminous-octopus
Yuri Weinstein [Tue, 24 Mar 2020 20:14:29 +0000 (13:14 -0700)]
Merge pull request #34149 from yuriw/wip-yuriw-clients-upgrades-luminous-octopus

qa/tests: initial check in for client-upgrade-luminous-octopus

5 years agoqa/tests: initial check in for client-upgrade-luminous-octopus 34149/head
Yuri Weinstein [Tue, 24 Mar 2020 19:34:52 +0000 (12:34 -0700)]
qa/tests: initial check in for client-upgrade-luminous-octopus

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #33019 from shyukri/wip-40315-luminous
Yuri Weinstein [Thu, 5 Mar 2020 16:46:19 +0000 (08:46 -0800)]
Merge pull request #33019 from shyukri/wip-40315-luminous

luminous: tests: pybind/test_volume_client: print python version correctly

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #33195 from tchaikov/wip-luminous-17730
Yuri Weinstein [Thu, 5 Mar 2020 16:45:43 +0000 (08:45 -0800)]
Merge pull request #33195 from tchaikov/wip-luminous-17730

luminous: tool: introduce repair command to ceph-kvstore-tool

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #33619 from jan--f/wip-44333-luminous
Jan Fajerski [Wed, 4 Mar 2020 13:40:44 +0000 (14:40 +0100)]
Merge pull request #33619 from jan--f/wip-44333-luminous

luminous: ceph-volume: strip _dmcrypt suffix in simple scan json output

5 years agoMerge pull request #33307 from smithfarm/wip-43481-luminous
Yuri Weinstein [Mon, 2 Mar 2020 21:11:46 +0000 (13:11 -0800)]
Merge pull request #33307 from smithfarm/wip-43481-luminous

luminous: rgw: change the "rgw admin status" 'num_shards' output to signed int

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #32718 from trociny/wip-43626-luminous
Yuri Weinstein [Mon, 2 Mar 2020 19:56:19 +0000 (11:56 -0800)]
Merge pull request #32718 from trociny/wip-43626-luminous

luminous: rbd-mirror: fix 'rbd mirror status' asok command output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32955 from smithfarm/wip-43831-luminous
Yuri Weinstein [Mon, 2 Mar 2020 19:55:32 +0000 (11:55 -0800)]
Merge pull request #32955 from smithfarm/wip-43831-luminous

luminous: librbd: don't call refresh from mirror::GetInfoRequest state machine

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoceph-volume: strip _dmcrypt suffix in simple scan json output 33619/head
Jan Fajerski [Wed, 5 Feb 2020 05:01:16 +0000 (06:01 +0100)]
ceph-volume: strip _dmcrypt suffix in simple scan json output

LUKS encrypted OSDs name their block* files with a _dmcrypt suffix.
activate fails on json files like this. Stripping this suffix in scan
fixes this.

Fixes: https://tracker.ceph.com/issues/43966
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2ddf76d118d77659c590ea076d34ce9a8e351a86)

5 years agoMerge pull request #33376 from badone/wip-luminous-upgrade-ceph-ansible-and-move...
Brad Hubbard [Tue, 25 Feb 2020 23:56:26 +0000 (09:56 +1000)]
Merge pull request #33376 from badone/wip-luminous-upgrade-ceph-ansible-and-move-to-lvm

luminous: qa/ceph-ansible: Upgrade to stable-3.2.30 branch

5 years agoluminous: qa/ceph-ansible: Upgrade to stable-3.2.30 branch 33376/head
Brad Hubbard [Tue, 4 Feb 2020 07:10:27 +0000 (17:10 +1000)]
luminous: qa/ceph-ansible: Upgrade to stable-3.2.30 branch

The move to LVM will allow this test to run on smithis once the
teuthology ceph_ansible task supports that.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoclient/MetaRequest: Add age to MetaRequest dump 33294/head
Varsha Rao [Wed, 28 Aug 2019 07:37:32 +0000 (13:07 +0530)]
client/MetaRequest: Add age to MetaRequest dump

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

5 years agoosdc/Objecter: Add age to the ops
Varsha Rao [Thu, 22 Aug 2019 13:45:35 +0000 (19:15 +0530)]
osdc/Objecter: Add age to the ops

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

Conflicts:
        src/osdc/Objecter.cc: changed coarse_mono_clock to mono_clock to
                              make types compatible.

5 years agorgw: change the 'rgw admin status" nun_shards output to signed int 33307/head
Mark Kogan [Thu, 13 Dec 2018 14:29:31 +0000 (09:29 -0500)]
rgw: change the 'rgw admin status" nun_shards output to signed int

Fixes: http://tracker.ceph.com/issues/37645
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 9bdc324cb6667244bd32ee09760f91819383b30d)

5 years agocommon/ceph_time: Use fixed floating-point notation for mono_clock
Varsha Rao [Thu, 22 Aug 2019 13:41:59 +0000 (19:11 +0530)]
common/ceph_time: Use fixed floating-point notation for mono_clock

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

5 years agoclient: add procession of SEEK_HOLE and SEEK_DATA in lseek. 33293/head
shenhang [Tue, 17 Sep 2019 02:55:21 +0000 (10:55 +0800)]
client: add procession of SEEK_HOLE and SEEK_DATA in lseek.

Fixes: https://tracker.ceph.com/issues/42107
Signed-off-by: Shen Hang <harryshen18@gmail.com>
(cherry picked from commit 394720ca6b731e4698f1dbc7896d294363ecb466)

5 years agoclient:fix a bug in lseek
Duan Zhang [Fri, 8 Sep 2017 15:04:24 +0000 (23:04 +0800)]
client:fix a bug in lseek
If offset less than 0,the lseek may cause f->pos less than 0.
So read or write may error.

Signed-off-by: Duan Zhang <zhangduan@inspur.com>
(cherry picked from commit e12ba12cd870187e0640ea9dcb1696b0a2f006a4)

Conflicts:
src/client/Client.cc

Backport of this commit included because
394720ca6b731e4698f1dbc7896d294363ecb466 depends on it.

5 years agoclient: nfs-ganesha with cephfs client, removing dir reports not empty 33292/head
Peng Xie [Fri, 12 Jul 2019 08:31:58 +0000 (16:31 +0800)]
client: nfs-ganesha with cephfs client, removing dir reports not empty

the problem was due to the cephfs client side wrongly filled the
directory offset from its readdir_cache to nfs-ganesha as its mdcache
dirent cookie

Fixes: http://tracker.ceph.com/issues/40746
Signed-off-by: Peng Xie <peng.hse@xtaotech.com>
(cherry picked from commit 2cce2d4c7d5f3a274c206b4090057760f357ecb0)

5 years agoceph-kvstore-tool: rename repair -> destructive-repair 33195/head
Sage Weil [Tue, 9 Oct 2018 14:13:41 +0000 (09:13 -0500)]
ceph-kvstore-tool: rename repair -> destructive-repair

This is shown to corrupt otherwise healthy rocksdb databases.  Rename to
make it clear that it is generally not safe to run and shoud only be used
as a last resort.

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

Conflicts:
PendingReleaseNotes: drop this change as "repair" command did
not exist in luminous before this change.
qa/workunits/cephtool/test_kvstore_tool.sh: drop this change,
as this test was not added before this change.
src/tools/ceph_kvstore_tool.cc: trivial resolution.

5 years agodoc: introduce repair subcommon of ceph-kvstore-tool
liuchang0812 [Thu, 28 Sep 2017 07:24:07 +0000 (15:24 +0800)]
doc: introduce repair subcommon of ceph-kvstore-tool

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit 51b5ba1aa242772093174cc87a9861c9405c3b67)

5 years agotools/ceph_kvstore_tool: do not open rocksdb when repairing it
Kefu Chai [Thu, 15 Nov 2018 05:56:19 +0000 (13:56 +0800)]
tools/ceph_kvstore_tool: do not open rocksdb when repairing it

before this change, the `need_open_db` parameter is passed to the
constructor of BlueStore as `min_alloc_size`. and rocksdb will fail to
repair because Repairer::Run() also tries to acquire the db lock, and it
will fail to do so if the lock file is already acquired by
BlueStore::_mount().

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

5 years agocommon, tool: update kvstore-tool to repair our key/value database
liuchang0812 [Mon, 24 Jul 2017 14:12:43 +0000 (22:12 +0800)]
common, tool: update kvstore-tool to repair our key/value database

Fixes: http://tracker.ceph.com/issues/17730
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit 4849ce3cc96eac9fee305927198a6c1b90892687)

Conflicts:
src/kv/LevelDBStore.cc
src/kv/RocksDBStore.cc
src/kv/RocksDBStore.h
src/os/bluestore/BlueStore.cc
src/tools/ceph_kvstore_tool.cc: resolve conflicts.

5 years agoqa/tasks/cephfs/test_volume_client: print py2 or py3 which the test case runs 33019/head
Lianne [Tue, 11 Jun 2019 10:27:06 +0000 (18:27 +0800)]
qa/tasks/cephfs/test_volume_client: print py2 or py3 which the test case runs

Fixes: http://tracker.ceph.com/issues/40184
Signed-off-by: Lianne <liyan.wang@xtaotech.com>
(cherry picked from commit 7c7c7870d38902a0df83a0fdecaa56baad556d82)

5 years ago12.2.13 v12.2.13
Jenkins Build Slave User [Thu, 30 Jan 2020 20:52:36 +0000 (20:52 +0000)]
12.2.13

5 years agoMerge pull request #32950 from neha-ojha/wip-pcycle-luminous
Yuri Weinstein [Wed, 29 Jan 2020 19:52:45 +0000 (11:52 -0800)]
Merge pull request #32950 from neha-ojha/wip-pcycle-luminous

luminous: qa: install build dependencies for cfuse_workunit_kernel_untar_build.yaml

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agolibrbd: don't call refresh from mirror::GetInfoRequest state machine 32955/head
Mykola Golub [Mon, 20 Jan 2020 13:42:47 +0000 (13:42 +0000)]
librbd: don't call refresh from mirror::GetInfoRequest state machine

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

Conflicts:
src/librbd/api/Mirror.cc
- C_ImageGetInfo ctor takes only two arguments in nautilus
- nautilus does not have LambdaContext as a class; use FunctionContext
  instead

(cherry picked from commit a1e0d623d5026baec9d1e6ed83201c3fb326fc10)

5 years agoqa: install build dependencies for cfuse_workunit_kernel_untar_build.yaml 32950/head
Neha Ojha [Tue, 18 Sep 2018 22:40:50 +0000 (15:40 -0700)]
qa: install build dependencies for cfuse_workunit_kernel_untar_build.yaml

Fixes: https://tracker.ceph.com/issues/36076
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 38ef3da8d27e24576193cbf3f9238f2c5b586c09)

5 years agoMerge pull request #32796 from jan--f/wip-43759-luminous
Yuri Weinstein [Thu, 23 Jan 2020 19:21:37 +0000 (11:21 -0800)]
Merge pull request #32796 from jan--f/wip-43759-luminous

luminous: ceph-volume: assume msgrV1 for all branches containing mimic

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoceph-volume: assume msgrV1 for all branches containing mimic 32796/head
Jan Fajerski [Wed, 13 Nov 2019 09:13:01 +0000 (10:13 +0100)]
ceph-volume: assume msgrV1 for all branches containing mimic

With nautilus and newer OSDs listen on v1 ports and v2 ports. Assume
that if mimic (or luminous) occur in the branch name, the OSDs are
running msgrv1 only.

Fixes: https://tracker.ceph.com/issues/42791
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit b8754919df61b118200e210e0bfc8d6df0261dfd)

5 years agorbd-mirror: fix 'rbd mirror status' asok command output 32718/head
Mykola Golub [Mon, 30 Dec 2019 15:44:32 +0000 (17:44 +0200)]
rbd-mirror: fix 'rbd mirror status' asok command output

This was broken by def50d04796, and implicitly fixed during
refactoring in the master (octopus) by adf1486e46c, hence it is a
direct commit to nautilus branch.

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

Conflicts:
src/tools/rbd_mirror/Mirror.cc (image_deleter section removed after luminous)

5 years agoMerge pull request #32666 from dzafman/wip-41016-luminous
David Zafman [Fri, 17 Jan 2020 22:16:44 +0000 (14:16 -0800)]
Merge pull request #32666 from dzafman/wip-41016-luminous

luminous: osd: Diagnostic logging for upmap cleaning

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #32523 from iliul/luminous
Yuri Weinstein [Thu, 16 Jan 2020 13:39:37 +0000 (05:39 -0800)]
Merge pull request #32523 from iliul/luminous

luminous: os/bluestore: fix assertion in StupidAllocator::get_fragmentation

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoosd: Diagnostic logging for upmap cleaning 32666/head
David Zafman [Wed, 15 Jan 2020 21:48:01 +0000 (21:48 +0000)]
osd: Diagnostic logging for upmap cleaning

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

5 years agoMerge pull request #32599 from trociny/wip-43499-luminous
Yuri Weinstein [Tue, 14 Jan 2020 01:11:12 +0000 (17:11 -0800)]
Merge pull request #32599 from trociny/wip-43499-luminous

luminous: rbd-mirror: make logrotate work

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32586 from dzafman/wip-bal4-luminous
Yuri Weinstein [Sun, 12 Jan 2020 21:29:37 +0000 (13:29 -0800)]
Merge pull request #32586 from dzafman/wip-bal4-luminous

luminous: Change default upmap_max_deviation to 5

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agologrotate: also sighup rbd-mirror 32599/head
Mykola Golub [Tue, 31 Dec 2019 10:01:31 +0000 (10:01 +0000)]
logrotate: also sighup rbd-mirror

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

Conflicts:
src/cephadm/cephadm (does not exist)
src/logrotate.conf (no "pkill" fallback)

5 years agorbd-mirror: reopen all contexts logs on SIGHUP
Mykola Golub [Tue, 31 Dec 2019 09:57:15 +0000 (09:57 +0000)]
rbd-mirror: reopen all contexts logs on SIGHUP

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

Conflicts:
src/tools/rbd_mirror/Mirror.cc (std::lock_guard vs Mutex::Locker, ceph_abort_msgf does not exist)
src/tools/rbd_mirror/PoolReplayer.cc (std::lock_guard vs Mutex::Locker, PoolReplayer is not a template)

5 years agorbd-mirror: delay local/remote rados initialization until context created
Mykola Golub [Sun, 5 Jan 2020 09:10:24 +0000 (09:10 +0000)]
rbd-mirror: delay local/remote rados initialization until context created

We rely on that if a rados ref is initialized it contains the
valid context.

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

Conflicts:
src/tools/rbd_mirror/PoolReplayer.cc (trivial)

5 years agomgr: Change default upmap_max_deviation to 5 32586/head
David Zafman [Sat, 14 Dec 2019 01:43:44 +0000 (17:43 -0800)]
mgr: Change default upmap_max_deviation to 5

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

Conflicts:
src/pybind/mgr/balancer/module.py (default isn't in COMMANDS section)
        qa/standalone/mgr/balancer.sh (setting upmap_max_deviations to 1 differ)
        src/test/cli/osdmaptool/missing-argument.t (usage included here)

5 years agoosdmaptool: Add --upmap-active to simulate active upmap balancing
David Zafman [Wed, 18 Dec 2019 19:27:02 +0000 (11:27 -0800)]
osdmaptool: Add --upmap-active to simulate active upmap balancing

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

Conflicts:
src/test/cli/osdmaptool/help.t (some options not present)
src/tools/osdmaptool.cc (ceph_assert is assert here)
        src/test/cli/osdmaptool/missing-argument.t (usage included here)

5 years agodoc: Add upmap options to osdmaptool man page and give example
David Zafman [Wed, 18 Dec 2019 03:38:51 +0000 (19:38 -0800)]
doc: Add upmap options to osdmaptool man page and give example

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

5 years agotools: osdmaptool document non-upmap options that were missing
David Zafman [Wed, 18 Dec 2019 01:35:14 +0000 (17:35 -0800)]
tools: osdmaptool document non-upmap options that were missing

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

Conflicts:
doc/man/8/osdmaptool.rst (missing other options not part of this)

5 years agoos/bluestore: fix assertion in StupidAllocator::get_fragmentation 32523/head
Igor Fedotov [Thu, 16 Aug 2018 11:51:06 +0000 (14:51 +0300)]
os/bluestore: fix assertion in StupidAllocator::get_fragmentation

One might face an assertion (assert(intervals <= max_intervals))
in StupidAllocator::get_fragmentation method for clusters created
by early Luminous releases and before. The root cause is that block
volume size wasn't aligned with min_alloc_size and hence we missed
that last fraction interval during max_interval calculation.

Fixes: https://tracker.ceph.com/issues/43297
Note: This was a clean cherry-pick from master, but p2roundup was
introduced since mimic release, use P2ROUNDUP instead

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit a60b2316ce0bed28c468043cff4cab5e61b1a694)
Signed-off-by: Lei Liu <liulei3@360.cn>
5 years agoMerge pull request #32349 from smithfarm/wip-39474-luminous
Yuri Weinstein [Tue, 7 Jan 2020 02:46:21 +0000 (18:46 -0800)]
Merge pull request #32349 from smithfarm/wip-39474-luminous

luminous: common/util: handle long lines in /proc/cpuinfo

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31855 from smithfarm/wip-41730-luminous
Yuri Weinstein [Tue, 7 Jan 2020 02:45:47 +0000 (18:45 -0800)]
Merge pull request #31855 from smithfarm/wip-41730-luminous

luminous: osd/ReplicatedBackend.cc: 1349: FAILED ceph_assert(peer_missing.count(fromshard))

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #32194 from linuxbox2/luminous-lc-early
Nathan Cutler [Thu, 2 Jan 2020 15:33:45 +0000 (16:33 +0100)]
Merge pull request #32194 from linuxbox2/luminous-lc-early

luminous: rgw: lc: continue past get_obj_state() failure

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
5 years agocommon/util: handle long lines in /proc/cpuinfo 32349/head
Sage Weil [Mon, 22 Apr 2019 17:51:41 +0000 (12:51 -0500)]
common/util: handle long lines in /proc/cpuinfo

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

5 years agoMerge pull request #32267 from ideepika/wip-43325-luminous
Nathan Cutler [Wed, 18 Dec 2019 11:21:53 +0000 (12:21 +0100)]
Merge pull request #32267 from ideepika/wip-43325-luminous

luminous: doc: wrong datatype describing crush_rule

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32227 from alimaredia/wip-s3-tests-branch-name-refactor-luminous
Yuri Weinstein [Mon, 16 Dec 2019 22:52:13 +0000 (14:52 -0800)]
Merge pull request #32227 from alimaredia/wip-s3-tests-branch-name-refactor-luminous

luminous: update s3-test download code for s3-test tasks

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #31860 from smithfarm/wip-43013-luminous
Yuri Weinstein [Mon, 16 Dec 2019 22:51:13 +0000 (14:51 -0800)]
Merge pull request #31860 from smithfarm/wip-43013-luminous

luminous: rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #32034 from cbodley/wip-qa-rgw-swift-luminous
Yuri Weinstein [Mon, 16 Dec 2019 22:50:32 +0000 (14:50 -0800)]
Merge pull request #32034 from cbodley/wip-qa-rgw-swift-luminous

luminous: qa/rgw: add missing force-branch: ceph-luminous for swift tasks

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #32215 from smithfarm/wip-43234-luminous
Yuri Weinstein [Mon, 16 Dec 2019 22:49:01 +0000 (14:49 -0800)]
Merge pull request #32215 from smithfarm/wip-43234-luminous

luminous: tests: radosgw-admin: remove dependency on bunch package

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoluminous: update s3-test download code for s3-test tasks 32227/head
Ali Maredia [Mon, 25 Nov 2019 02:30:03 +0000 (21:30 -0500)]
luminous: update s3-test download code for s3-test tasks

- Ensure the download code for all tasks running
s3-tests is consistent.
- Simplify download code to only use the config
variable 'force-branch' for the branch being
cloned.
- Make ceph-luminous the force-branch for all
suites using s3-tests.
- Add force-branch to suites running s3readwrite
& s3roundtrip tasks

Signed-off-by: Ali Maredia <amaredia@redhat.com>
5 years agoosd/MissingLoc.cc: do not rely on missing_loc_sources only 31855/head
Neha Ojha [Fri, 6 Sep 2019 03:35:51 +0000 (20:35 -0700)]
osd/MissingLoc.cc: do not rely on missing_loc_sources only

In 624ade487ea4aeaf988cc1767e0b293f76addd5b, we relied on missing_loc_sources
to check for strays and remove an OSD from missing_loc. However, it is
possible that missing_loc_sources is empty while there are still OSDs
present in missing_loc. Since the aim is to just remove a stray OSD from
missing_loc, we do not need to rely on missing_loc_sources. We still
clean missing_loc_sources if any stray is present in it.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 5906a57320f04f57a38eef9588bd16ac3fd4e55d)

Conflicts:
src/osd/MissingLoc.cc
- file does not exist in luminous; made changes manually in src/osd/PG.cc
- adjust ldout for luminous

5 years agoMerge pull request #32135 from jecluis/wip-telemetry-luminous
Yuri Weinstein [Mon, 16 Dec 2019 19:55:09 +0000 (11:55 -0800)]
Merge pull request #32135 from jecluis/wip-telemetry-luminous

luminous: telemetry module for mgr

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agodoc/rados/operations: crush_rule is a name 32267/head
Kefu Chai [Sat, 27 Jul 2019 13:35:37 +0000 (21:35 +0800)]
doc/rados/operations: crush_rule is a name

like
```
ceph osd pool set <pool-name> crush_rule <rule-name>
```
where `<rule-name>` is a string instead of a number.

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

5 years agoosd/PG: fix _finish_recovery vs repair race
xie xingguo [Sat, 31 Aug 2019 02:17:57 +0000 (10:17 +0800)]
osd/PG: fix _finish_recovery vs repair race

On detecting a corrupted object, primary may automatically
repair that object by leveraging the existing recovery procedure,
which turned out to be racy with a previous unfinished _finish_recovery
callback - the problem would then be that _finish_recovery might
continue to purge some strays that we still want to pull data from.

Fix by re-checking if there are any newly added missing objects when
executing _finish_recovery.

Note that before https://github.com/ceph/ceph/pull/29756 we might
instead have to call needs_recovery to catch the race condition
since we did not evict pg from clean state when triggering an auto-repair..

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(manual backport of d96e53285b4e748eacda314bf0958b87cfa42130)

Conflicts:
        src/osd/PG.cc
- adjusted if conditional for luminous
- did not add the comment nor state_clear(PG_STATE_REPAIR);. Those lines were
  moved but don't exist in luminous.

5 years agoosd/MissingLoc, PeeringState: remove osd from missing loc in purge_strays()
Neha Ojha [Sat, 31 Aug 2019 01:15:58 +0000 (18:15 -0700)]
osd/MissingLoc, PeeringState: remove osd from missing loc in purge_strays()

We should always try to keep osds in missing_loc consistent with peer_missing
and peer_info. When we remove an osd from peer_missing and peer_info, we
should also remove it from missing_loc during purging strays.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 624ade487ea4aeaf988cc1767e0b293f76addd5b)

Conflicts:
src/osd/MissingLoc.cc
src/osd/MissingLoc.h
src/osd/PeeringState.cc
- these files do not exist in luminous; made the changes manually to
  src/osd/PG.cc and src/osd/PG.h
- ldout(cct, ...) -> ldout(pg->cct, ...)

5 years agoPendingReleaseNotes: add telemetry mgr module 32135/head
Joao Eduardo Luis [Thu, 12 Dec 2019 17:41:14 +0000 (17:41 +0000)]
PendingReleaseNotes: add telemetry mgr module

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
5 years agomgr/telemetry: bump revision
Joao Eduardo Luis [Mon, 9 Dec 2019 19:32:52 +0000 (19:32 +0000)]
mgr/telemetry: bump revision

We should have done this while cherry-picking from master, but we
didn't. And here we are now. It's simpler to apply this one-off patch
than going back to the cherry-picking maze to adjust this one thing.

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
5 years agomgr/telemetry: add stats about crush map
Sage Weil [Fri, 1 Nov 2019 12:58:54 +0000 (07:58 -0500)]
mgr/telemetry: add stats about crush map

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

 Conflicts:
src/pybind/mgr/telemetry/module.py
          Missing context due to missing patches.
        PendingReleaseNotes
          Dropped to prevent conflicts in the future

5 years agomgr/telemetry: add rgw metadata
Abhishek Lekshmanan [Wed, 30 Oct 2019 20:34:43 +0000 (15:34 -0500)]
mgr/telemetry: add rgw metadata

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

 Conflicts:
PendingReleaseNotes
          Dropped to prevent conflicts in the future
src/pybind/mgr/telemetry/module.py
            Context issues due to missing patches

5 years agomgr/telemetry: mds cache stats
Sage Weil [Tue, 29 Oct 2019 18:53:50 +0000 (13:53 -0500)]
mgr/telemetry: mds cache stats

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

 Conflicts:
src/pybind/mgr/telemetry/module.py
            Due to missing context resulting from missing patches.
        PendingReleaseNotes
            Dropped to prevent conflicts in the future

5 years agomgr/telemetry: add more pool metadata
Sage Weil [Tue, 29 Oct 2019 18:05:30 +0000 (13:05 -0500)]
mgr/telemetry: add more pool metadata

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

 Conflicts:
src/pybind/mgr/telemetry/module.py
          Context issues
        PendingReleaseNotes:
          Dropped to prevent conflicts in the future

5 years agomgr/telemetry: remove crush rule name
Sage Weil [Tue, 29 Oct 2019 16:29:46 +0000 (11:29 -0500)]
mgr/telemetry: remove crush rule name

This is a user-specified string and could contain identifying info.

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

 Conflicts:
src/pybind/mgr/telemetry/module.py
            Context issues

5 years agomgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count
Sage Weil [Tue, 29 Oct 2019 16:14:30 +0000 (11:14 -0500)]
mgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count

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

 Note:
    This commit was heavily modified. We wanted to provide the number of
    ipv4 and ipv6 monitors in the report, so we rewrote that part so we
    can report on it; but we had to drop everything else (msgr1 and
    msgr2), as well as 'min_mon_release'. Those do not exist in
    luminous. In the end, the commit message itself is misleading, but
    we are somehow (*shrug*) opting for leaving the commit as the original.
    Additionally, we removed PendingReleaseNotes changes to prevent
    conflicts in the future.

5 years agomgr/telemetry: add CephFS metadata
Sage Weil [Tue, 29 Oct 2019 16:08:42 +0000 (11:08 -0500)]
mgr/telemetry: add CephFS metadata

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

 Conflicts:
PendingReleaseNotes
            Dropped due to conflicts down the road
src/pybind/mgr/telemetry/module.py
            Context issues

5 years agoMerge pull request #31857 from smithfarm/wip-40947-luminous
Yuri Weinstein [Thu, 12 Dec 2019 16:41:43 +0000 (08:41 -0800)]
Merge pull request #31857 from smithfarm/wip-40947-luminous

luminous:  osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31858 from smithfarm/wip-38205-luminous
Yuri Weinstein [Thu, 12 Dec 2019 16:41:19 +0000 (08:41 -0800)]
Merge pull request #31858 from smithfarm/wip-38205-luminous

luminous: osd: refuse to start if we're > N+2 from recorded require_osd_release

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