]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocrimson/osd: more constness 37323/head
Kefu Chai [Wed, 23 Sep 2020 04:24:36 +0000 (12:24 +0800)]
crimson/osd: more constness

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: add_recovery(oid) before recover_object(oid)
Kefu Chai [Wed, 23 Sep 2020 04:14:36 +0000 (12:14 +0800)]
crimson/osd: add_recovery(oid) before recover_object(oid)

in 7736bddc534e5df2daf704c4bbc92a0927b0db4d, we assumed that the object
to be recovered did not exist in `recovering` before
`recover_object(oid)` was called. but this turns out not true. so, in
this change, `add_object(oid)` is called before `recover_object(oid)`
gets called.

Fixes: https://tracker.ceph.com/issues/47593
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: use recoverying.at() when appropriate
Kefu Chai [Wed, 23 Sep 2020 04:11:43 +0000 (12:11 +0800)]
crimson/osd: use recoverying.at() when appropriate

this helps to avoid the confusion of "where the recovery is added" and
"are we adding a new instance of recovery here".

should call add_recovery() explicitly when we need to add a new recovery
instance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: add RecoveryBackend:add_recovering()
Kefu Chai [Wed, 23 Sep 2020 04:07:32 +0000 (12:07 +0800)]
crimson/osd: add RecoveryBackend:add_recovering()

before this change, get_recovery() can also be used for adding a
recovery instance to `recovering`. this behavior is error-prone and
confusing.

after this change, add_recovery() is used in the place where we
want to add a new instance of recovery instance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37106 from sebastian-philipp/cephadm-overwritable-templates
Sebastian Wagner [Tue, 22 Sep 2020 23:34:57 +0000 (01:34 +0200)]
Merge pull request #37106 from sebastian-philipp/cephadm-overwritable-templates

mgr/cephadm: make j2 teamplates overwritable

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
4 years agoMerge pull request #37121 from Songweibin/wip-rbd-metadata
Jason Dillaman [Tue, 22 Sep 2020 23:14:24 +0000 (19:14 -0400)]
Merge pull request #37121 from Songweibin/wip-rbd-metadata

librbd: async version of metadata_set/remove

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37083 from orozery/librbd-data-cryptor
Jason Dillaman [Tue, 22 Sep 2020 23:14:07 +0000 (19:14 -0400)]
Merge pull request #37083 from orozery/librbd-data-cryptor

librbd: add data encryptor/decryptor using openssl

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37110 from CongMinYin/qa_immutable_object_cache_check
Jason Dillaman [Tue, 22 Sep 2020 23:12:42 +0000 (19:12 -0400)]
Merge pull request #37110 from CongMinYin/qa_immutable_object_cache_check

qa: check immutable object cache content

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37237 from MahatiC/wip-fix-rwl-path
Jason Dillaman [Tue, 22 Sep 2020 23:11:47 +0000 (19:11 -0400)]
Merge pull request #37237 from MahatiC/wip-fix-rwl-path

librbd/cache: Fix pwl_path read issue

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37206 from bk201/wip-47387
Michael Fritch [Tue, 22 Sep 2020 22:37:09 +0000 (16:37 -0600)]
Merge pull request #37206 from bk201/wip-47387

mgr/rook: fix listing daemons

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #37043 from s0nea/wip-dashboard-47331
Lenz Grimmer [Tue, 22 Sep 2020 11:55:47 +0000 (13:55 +0200)]
Merge pull request #37043 from s0nea/wip-dashboard-47331

mgr/dashboard: log in non-admin users successfully if the telemetry notification is shown

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #37293 from changchengx/osd_comment
Kefu Chai [Tue, 22 Sep 2020 09:46:09 +0000 (17:46 +0800)]
Merge pull request #37293 from changchengx/osd_comment

osd: fix wrong comment about setting auth_client for messenger

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoosd: correct comment about setting auth_client for messenger 37293/head
Changcheng Liu [Tue, 22 Sep 2020 05:11:57 +0000 (13:11 +0800)]
osd: correct comment about setting auth_client for messenger

client_messenger's auth_client has not been set until call
monc->init();

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoMerge pull request #37152 from rhcs-dashboard/bottom-links-component
Lenz Grimmer [Tue, 22 Sep 2020 07:23:32 +0000 (09:23 +0200)]
Merge pull request #37152 from rhcs-dashboard/bottom-links-component

mgr/dashboard: Creating a new Login Page Legal Links Component

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #37291 from badone/wip-docker-test-helper-fixes
Kefu Chai [Tue, 22 Sep 2020 06:17:23 +0000 (14:17 +0800)]
Merge pull request #37291 from badone/wip-docker-test-helper-fixes

test/docker-test: helper fixes and support more distro releases

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agotest: Add support for fedora 32, 33 and Ubuntu 20.04 37291/head
Brad Hubbard [Tue, 22 Sep 2020 01:29:06 +0000 (11:29 +1000)]
test: Add support for fedora 32, 33 and Ubuntu 20.04

Enable creation and use of these OS images in docker-test.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
4 years agotests: Make sure install-deps is run noninteractively
Brad Hubbard [Tue, 22 Sep 2020 02:51:28 +0000 (12:51 +1000)]
tests: Make sure install-deps is run noninteractively

This gets past things like tzconfig stopping for user input.
Remove redundant install of python-virtualenv.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #37200 from tchaikov/wip-crimson-with-lock
Kefu Chai [Tue, 22 Sep 2020 02:53:48 +0000 (10:53 +0800)]
Merge pull request #37200 from tchaikov/wip-crimson-with-lock

crimson/common: add helpers for seastar::with_lock()

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #37211 from tchaikov/wip-zbd
Kefu Chai [Tue, 22 Sep 2020 01:42:09 +0000 (09:42 +0800)]
Merge pull request #37211 from tchaikov/wip-zbd

rpm,install-deps,run-make-check: enable WITH_ZBD build on demand

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agotest/centos-8: Install git before running install-deps
Brad Hubbard [Tue, 22 Sep 2020 00:30:01 +0000 (10:30 +1000)]
test/centos-8: Install git before running install-deps

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
4 years agotest/docker-test: Fix permissions issue when using podman
Brad Hubbard [Tue, 22 Sep 2020 00:28:09 +0000 (10:28 +1000)]
test/docker-test: Fix permissions issue when using podman

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge PR #36776 into master
Patrick Donnelly [Mon, 21 Sep 2020 22:26:22 +0000 (15:26 -0700)]
Merge PR #36776 into master

* refs/pull/36776/head:
systemd: Support Graceful Reboot for AIO Node

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
4 years agoMerge PR #37227 into master
Patrick Donnelly [Mon, 21 Sep 2020 21:04:06 +0000 (14:04 -0700)]
Merge PR #37227 into master

* refs/pull/37227/head:
qa/cephfs: don't pass args to destroy() in recreate()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37233 into master
Patrick Donnelly [Mon, 21 Sep 2020 21:03:32 +0000 (14:03 -0700)]
Merge PR #37233 into master

* refs/pull/37233/head:
qa/mgr: revert a patch from commit 04ed58f

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #37271 from cyx1231st/wip-seastore-fix-non-repeatable-read
Samuel Just [Mon, 21 Sep 2020 17:57:43 +0000 (10:57 -0700)]
Merge pull request #37271 from cyx1231st/wip-seastore-fix-non-repeatable-read

crimson/seastore: fix potential non-repeatable-read from RootBlock

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agoMerge pull request #36927 from idryomov/wip-krbd-noudev
Ilya Dryomov [Mon, 21 Sep 2020 17:39:30 +0000 (19:39 +0200)]
Merge pull request #36927 from idryomov/wip-krbd-noudev

krbd: optionally skip waiting for udev events

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
4 years agoMerge PR #37213 into master
Patrick Donnelly [Mon, 21 Sep 2020 16:48:28 +0000 (09:48 -0700)]
Merge PR #37213 into master

* refs/pull/37213/head:
mgr/rook: Pass pod namespace to list_namespaced_pod()

Reviewed-by: Travis Nielsen <tnielsen@redhat.com>
4 years agoMerge pull request #37101 from LenzGr/master-documentation
Lenz Grimmer [Mon, 21 Sep 2020 15:58:03 +0000 (17:58 +0200)]
Merge pull request #37101 from LenzGr/master-documentation

doc: Updated `HACKING.rst` and `README.rst`

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #37137 from tspmelo/wip-fix-iscsi-tests
Lenz Grimmer [Mon, 21 Sep 2020 12:33:19 +0000 (14:33 +0200)]
Merge pull request #37137 from tspmelo/wip-fix-iscsi-tests

mgr/dashboard: Fix iSCSI backend unit-test

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #37262 from trociny/wip-rbd-nbd-quiesce-hook
Jason Dillaman [Mon, 21 Sep 2020 12:19:08 +0000 (08:19 -0400)]
Merge pull request #37262 from trociny/wip-rbd-nbd-quiesce-hook

rbd-nbd: fix typo in mini help

Reviewed-by: Jason Dillaman <dillaman@rehdat.com>
4 years agoMerge pull request #35785 from rhcs-dashboard/wip-45957-consolidate_Osd_Endpoints
Lenz Grimmer [Mon, 21 Sep 2020 11:59:48 +0000 (13:59 +0200)]
Merge pull request #35785 from rhcs-dashboard/wip-45957-consolidate_Osd_Endpoints

mgr/dashboard: Consolidate Osd mark endpoints

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoqa: add test for mapping and unmapping from a network namespace 36927/head
Ilya Dryomov [Wed, 16 Sep 2020 14:38:10 +0000 (16:38 +0200)]
qa: add test for mapping and unmapping from a network namespace

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge pull request #37234 from guits/guits-quick-fix
Guillaume Abrioux [Mon, 21 Sep 2020 11:41:41 +0000 (13:41 +0200)]
Merge pull request #37234 from guits/guits-quick-fix

ceph-volume: fix wrong type passed in terminal.warning()

4 years agoMerge pull request #37222 from dillaman/wip-librbd-image-dispatch
Mykola Golub [Mon, 21 Sep 2020 11:05:21 +0000 (14:05 +0300)]
Merge pull request #37222 from dillaman/wip-librbd-image-dispatch

librbd: bug fixes and cleanup for IO dispatch path

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #37215 from uweigand/fix-librados-test-endian
Kefu Chai [Mon, 21 Sep 2020 09:49:08 +0000 (17:49 +0800)]
Merge pull request #37215 from uweigand/fix-librados-test-endian

test/librados: fix endian bugs in checksum test cases

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36900 from wjwithagen/wjw-enhance-mgr_module.py
Lenz Grimmer [Mon, 21 Sep 2020 09:48:28 +0000 (11:48 +0200)]
Merge pull request #36900 from wjwithagen/wjw-enhance-mgr_module.py

mgr/dashboard: Report the missing path in error message

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #37087 from tspmelo/wip-iscsi-logged-in
Lenz Grimmer [Mon, 21 Sep 2020 09:45:19 +0000 (11:45 +0200)]
Merge pull request #37087 from tspmelo/wip-iscsi-logged-in

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
4 years agoMerge pull request #37261 from tchaikov/wip-47552
Kefu Chai [Mon, 21 Sep 2020 09:43:17 +0000 (17:43 +0800)]
Merge pull request #37261 from tchaikov/wip-47552

common/BackTrace: do not use len for length of demangled symbol

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #37185 from david-z/wip-fix-osdmaptool
Kefu Chai [Mon, 21 Sep 2020 09:38:56 +0000 (17:38 +0800)]
Merge pull request #37185 from david-z/wip-fix-osdmaptool

tools/osdmaptool.cc: fix inaccurate pg map result when simulating osd out

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37210 from changchengx/no_tune_message
Kefu Chai [Mon, 21 Sep 2020 09:37:21 +0000 (17:37 +0800)]
Merge pull request #37210 from changchengx/no_tune_message

messenger: remove unused variable

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37183 from rhcs-dashboard/fix-47434-master
Lenz Grimmer [Mon, 21 Sep 2020 08:42:19 +0000 (10:42 +0200)]
Merge pull request #37183 from rhcs-dashboard/fix-47434-master

mgr/dashboard: table detail rows overflow

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoceph-volume: fix wrong type passed in terminal.warning() 37234/head
Guillaume Abrioux [Fri, 18 Sep 2020 11:51:51 +0000 (13:51 +0200)]
ceph-volume: fix wrong type passed in terminal.warning()

`terminal.warning()` excepts a `str`.
Passing `e` means we pass a type `exceptions.RuntimeError`

Changing to `terminal.warning(e.message)` fixes the issue.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1877672
Resolves: rhbz#1877672

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
4 years agoMerge pull request #37268 from anthonyeleven/anthonyeleven/doc-fixes
Kefu Chai [Mon, 21 Sep 2020 06:41:35 +0000 (14:41 +0800)]
Merge pull request #37268 from anthonyeleven/anthonyeleven/doc-fixes

doc/man: Add optional reweight-by-utilization args

Reviewed-by: Zac Dover <zac.dover@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/man: Add optional reweight-by-utilization args 37268/head
Anthony D'Atri [Mon, 21 Sep 2020 00:37:58 +0000 (17:37 -0700)]
doc/man: Add optional reweight-by-utilization args
doc/mgr: Grammar and wording for Prometheus labels
doc/rados: Spelling and clarity

Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>
4 years agocrimson/seastore: fix potential non-repeatable-read from RootBlock 37271/head
Yingxin Cheng [Fri, 18 Sep 2020 08:55:03 +0000 (16:55 +0800)]
crimson/seastore: fix potential non-repeatable-read from RootBlock

Load root block into the transaction when read it.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agolibrbd: async version of metadata_set/remove 37121/head
songweibin [Sat, 12 Sep 2020 07:54:44 +0000 (15:54 +0800)]
librbd: async version of metadata_set/remove

In iSCSI scenario (via tcmu-runner), after a client has acquired exclusive
lock on an image, users will no longer be able to set metadata on the image.
This commit try to fix it by forward the request to the lock owner.

Steps to reproduce:

1. Client A:
```
>>> import rbd, rados;client=rados.Rados(conffile='');client.connect();ioctx=client.open_ioctx('rbd');rbd_inst=rbd.RBD();image=rbd.Image(ioctx, 'img1')
>>> from rbd import RBD_LOCK_MODE_EXCLUSIVE
>>> image.lock_acquire(RBD_LOCK_MODE_EXCLUSIVE)
>>>
```

2. Client B:
```
$ rbd image-meta set img1 conf_rbd_qos_iops_limit 10000
2020-09-12T15:19:58.325+0800 7f161affd700 -1 librbd::ManagedLock: 0x7f15f4001d48 handle_acquire_lock: failed to acquire exclusive lock:(30) Read-only file system
failed to set metadata conf_rbd_qos_iops_limit of image : (30) Read-only file system
rbd: setting metadata failed: (30) Read-only file system
$
```

Signed-off-by: songweibin <song.weibin@zte.com.cn>
4 years agoMerge pull request #37176 from badone/wip-enable-mgr-client-debug
Brad Hubbard [Mon, 21 Sep 2020 01:34:58 +0000 (11:34 +1000)]
Merge pull request #37176 from badone/wip-enable-mgr-client-debug

qa: Enable debug_client for mgr tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomessenger: remove unused variable 37210/head
Changcheng Liu [Thu, 17 Sep 2020 05:15:44 +0000 (13:15 +0800)]
messenger: remove unused variable

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agolibrbd: add data encryptor/decryptor using openssl 37083/head
Or Ozeri [Thu, 10 Sep 2020 08:51:56 +0000 (11:51 +0300)]
librbd: add data encryptor/decryptor using openssl

This commit adds the first CryptoInterface implementation
which translates bufferlist encryption to the standard api of crypto libraries,
i.e. using block ciphers operating on C-style arrays.

It defines an abstract DataCryptor interface to allow different crypto libraries implementations.
With this commit, we add an OpenSSL based implementation.
Lastly, we implement a context-pool wrapper implementation to optimize performance.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
4 years agoqa: check immutable object cache content 37110/head
Yin Congmin [Mon, 7 Sep 2020 07:24:56 +0000 (15:24 +0800)]
qa: check immutable object cache content

fix check immutable cache does not work

Signed-off-by: Yin Congmin <congmin.yin@intel.com>
4 years agorbd-nbd: fix typo in mini help 37262/head
Mykola Golub [Sun, 20 Sep 2020 07:19:30 +0000 (08:19 +0100)]
rbd-nbd: fix typo in mini help

Signed-off-by: Mykola Golub <mgolub@suse.com>
4 years agocommon/BackTrace: do not use len for length of demangled symbol 37261/head
Kefu Chai [Sun, 20 Sep 2020 03:30:26 +0000 (11:30 +0800)]
common/BackTrace: do not use len for length of demangled symbol

it turns out `len` is longer than the length of demangled symbol,
let's rely on the `\0` sentry in the returned char* string instead.

in this change, use `status` to tell if the demangle is successful or
not.

Fixes: https://tracker.ceph.com/issues/47552
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37072 from idryomov/wip-kcephfs-blacklisted-string
Ilya Dryomov [Sat, 19 Sep 2020 09:36:43 +0000 (11:36 +0200)]
Merge pull request #37072 from idryomov/wip-kcephfs-blacklisted-string

mds: add " (blacklisted)" to session reject error string

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agocrimson/osd: extract PG::load_head_obc() out 37200/head
Kefu Chai [Fri, 18 Sep 2020 03:00:01 +0000 (11:00 +0800)]
crimson/osd: extract PG::load_head_obc() out

so it can be reused in later refactory

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: split PG::get_oid_and_lock() into two methods
Kefu Chai [Sat, 19 Sep 2020 03:02:19 +0000 (11:02 +0800)]
crimson/osd: split PG::get_oid_and_lock() into two methods

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd/object_context: add helper for acquiring locks
Kefu Chai [Sat, 19 Sep 2020 03:00:22 +0000 (11:00 +0800)]
crimson/osd/object_context: add helper for acquiring locks

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/common/tri_mutex: add helpers for seastar::with_lock()
Kefu Chai [Wed, 16 Sep 2020 16:15:48 +0000 (00:15 +0800)]
crimson/common/tri_mutex: add helpers for seastar::with_lock()

so we don't need to worry about unlocking the object context.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/common: discard failure of finally() block
Kefu Chai [Sat, 19 Sep 2020 02:32:45 +0000 (10:32 +0800)]
crimson/common: discard failure of finally() block

instead of assuming that the function passed to finally() returns an
erroratorized future, in this change:

* s/safe_then/then_wrapped/ to handle the exception thrown by
  the finally function.
* specialize for the case where the finally function does not return
  a future, and just call it. note, in seastar's implementation of
  finally, `finally_body` is used for specializing these two cases.
* rename "future" to "result", for better readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37207 from tchaikov/wip-doc-dev-osx
Kefu Chai [Sat, 19 Sep 2020 04:08:35 +0000 (12:08 +0800)]
Merge pull request #37207 from tchaikov/wip-doc-dev-osx

doc/dev/macos.rst: disable features not supported on osx

Reviewed-by: Kamoltat Sirivadhna <ksirivad@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37252 from pponnuvel/spellcheck-docs
Kefu Chai [Sat, 19 Sep 2020 03:07:52 +0000 (11:07 +0800)]
Merge pull request #37252 from pponnuvel/spellcheck-docs

doc: Fixed a number of typos in documentation

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37216 from tchaikov/wip-doc-cephadmin-codeblock
Kefu Chai [Sat, 19 Sep 2020 02:57:58 +0000 (10:57 +0800)]
Merge pull request #37216 from tchaikov/wip-doc-cephadmin-codeblock

doc/cephadm: use appropriate directive for formatting codeblocks

Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge PR #37202 into master
Patrick Donnelly [Sat, 19 Sep 2020 01:54:57 +0000 (18:54 -0700)]
Merge PR #37202 into master

* refs/pull/37202/head:
mon: allow overriding the initial mon_host

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37224 from tchaikov/wip-cmake-boost-MPL-list-size
Kefu Chai [Sat, 19 Sep 2020 01:33:31 +0000 (09:33 +0800)]
Merge pull request #37224 from tchaikov/wip-cmake-boost-MPL-list-size

cmake: introduce Boost::MPL interface library for increasing BOOST_MPL_LIMIT_LIST_SIZE

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #37214 into master
Patrick Donnelly [Sat, 19 Sep 2020 00:29:27 +0000 (17:29 -0700)]
Merge PR #37214 into master

* refs/pull/37214/head:
mgr/volumes/nfs: Check if orchestrator spec service_id is valid

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37190 into master
Patrick Donnelly [Sat, 19 Sep 2020 00:27:09 +0000 (17:27 -0700)]
Merge PR #37190 into master

* refs/pull/37190/head:
mon/MonCap: check profile_grants too while checking caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37148 into master
Patrick Donnelly [Sat, 19 Sep 2020 00:24:38 +0000 (17:24 -0700)]
Merge PR #37148 into master

* refs/pull/37148/head:
mds/FSMap: do not set legacy_client_fscid after filtering

Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge PR #37037 into master
Patrick Donnelly [Sat, 19 Sep 2020 00:23:32 +0000 (17:23 -0700)]
Merge PR #37037 into master

* refs/pull/37037/head:
mds: fix purge_queue's _calculate_ops is inaccurate

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37218 into master
Patrick Donnelly [Fri, 18 Sep 2020 23:25:59 +0000 (16:25 -0700)]
Merge PR #37218 into master

* refs/pull/37218/head:
qa: spawn MDS daemons before creating fs

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #35906 from gregsfortytwo/wip-stretch-mode
Neha Ojha [Fri, 18 Sep 2020 21:31:45 +0000 (14:31 -0700)]
Merge pull request #35906 from gregsfortytwo/wip-stretch-mode

Add a new stretch mode for 2-site Ceph clusters

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #36957 into master
Patrick Donnelly [Fri, 18 Sep 2020 18:04:11 +0000 (11:04 -0700)]
Merge PR #36957 into master

* refs/pull/36957/head:
mds: convert stringstream to CachedStackStringStream

Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
4 years agoMerge pull request #37245 from mgfritch/cephadm-extra-ceph-conf-test
Michael Fritch [Fri, 18 Sep 2020 17:50:35 +0000 (11:50 -0600)]
Merge pull request #37245 from mgfritch/cephadm-extra-ceph-conf-test

mgr/cephadm: fixup expected extra ceph conf test result

Reviewed-by: Adam King <adking@redhat.com>
4 years agodoc: Fixed a number of typos in documentation 37252/head
Ponnuvel Palaniyappan [Fri, 18 Sep 2020 17:12:07 +0000 (18:12 +0100)]
doc: Fixed a number of typos in documentation

Signed-off-by: Ponnuvel Palaniyappan <pponnuvel@gmail.com>
4 years agomgr/cephadm: fixup expected extra ceph conf test result 37245/head
Michael Fritch [Fri, 18 Sep 2020 14:54:00 +0000 (08:54 -0600)]
mgr/cephadm: fixup expected extra ceph conf test result

fix test failure introduced by:
ff7e76348e5457fa6acb23545fcef56d6640c50a

```
E           AssertionError: expected call not found.
E           Expected: _run_cephadm('test', 'mon.test', 'deploy', ['--name', 'mon.test', '--reconfig', '--config-json', '-'], stdin='{"config": "\\n\\n[mon]\\nk=v\\n", "keyring": ""}')
E           Actual: _run_cephadm('test', 'mon.test', 'deploy',
['--name', 'mon.test', '--reconfig', '--config-json', '-'],
stdin='{"config": "\\n\\n[mon]\\nk=v\\n", "keyring": ""}', image='')
```

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agodoc: Updated `HACKING.rst` and `README.rst` 37101/head
Lenz Grimmer [Fri, 18 Sep 2020 13:15:34 +0000 (15:15 +0200)]
doc: Updated `HACKING.rst` and `README.rst`

Replaced the content of `HACKING.rst` in the dashboard source code
directory with a pointer to the new location in the developer guide.

Updated references in `README.rst` to also point to the online versions
of these files.

Fixes: tracker.ceph.com/issues/47396
Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
4 years agoqa/mgr: revert a patch from commit 04ed58f 37233/head
Rishabh Dave [Fri, 18 Sep 2020 11:03:41 +0000 (16:33 +0530)]
qa/mgr: revert a patch from commit 04ed58f

mds_cluster.mds_fail() runs command "mds fail" not "fs fail". The reason
for failure was PR #32581 which accidentally changed the return code
from 0 to EINVAL. Since this was reversed in PR #37159, the change
introduced by 04ed58f is not only incorrect but also redundant.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge pull request #34545 from rhcs-dashboard/read_only
Lenz Grimmer [Fri, 18 Sep 2020 10:59:30 +0000 (12:59 +0200)]
Merge pull request #34545 from rhcs-dashboard/read_only

mgr/dashboard: Disabling the form inputs for the read_only modals

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #37023 from p-se/grafana-many-to-many
Lenz Grimmer [Fri, 18 Sep 2020 09:58:47 +0000 (11:58 +0200)]
Merge pull request #37023 from p-se/grafana-many-to-many

mgr/dashboard: Fix many-to-many issue in host-details Grafana dashboard

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #37059 from guits/guits-cephadm-shell-multiple-mounts
Joshua Schmid [Fri, 18 Sep 2020 08:57:52 +0000 (10:57 +0200)]
Merge pull request #37059 from guits/guits-cephadm-shell-multiple-mounts

cephadm: support multiple mounts when running interactive shell

4 years agoMerge pull request #36890 from sebastian-philipp/cephadm-extend-ceph.conf
Joshua Schmid [Fri, 18 Sep 2020 08:56:24 +0000 (10:56 +0200)]
Merge pull request #36890 from sebastian-philipp/cephadm-extend-ceph.conf

mgr/cephadm: Add extra-ceph-conf

4 years agoMerge pull request #37135 from sebastian-philipp/cephadm-race-add-host-vs-apply
Joshua Schmid [Fri, 18 Sep 2020 08:55:17 +0000 (10:55 +0200)]
Merge pull request #37135 from sebastian-philipp/cephadm-race-add-host-vs-apply

mgr/cephadm: Fix race between host_add and _apply_all_specs

4 years agoMerge pull request #36969 from votdev/issue_46666_container_spec
Joshua Schmid [Fri, 18 Sep 2020 08:50:30 +0000 (10:50 +0200)]
Merge pull request #36969 from votdev/issue_46666_container_spec

cephadm: Introduce 'container' specification to deploy custom containers

4 years agoqa/cephfs: don't pass args to destroy() in recreate() 37227/head
Rishabh Dave [Fri, 18 Sep 2020 08:18:33 +0000 (13:48 +0530)]
qa/cephfs: don't pass args to destroy() in recreate()

In filesystem.py, don't set value of reset_obj_attrs to False.

Fixes: https://tracker.ceph.com/issues/47526
Signed-off-by: Rishabh Dave <ridave@redhat.com>
4 years agolibrbd/cache: Fix pwl_path read issue 37237/head
Mahati Chamarthy [Fri, 18 Sep 2020 07:22:25 +0000 (12:52 +0530)]
librbd/cache: Fix pwl_path read issue

... in ImageCacheState

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
4 years agomon/MonCap: check profile_grants too while checking caps 37190/head
Rishabh Dave [Wed, 16 Sep 2020 10:59:24 +0000 (16:29 +0530)]
mon/MonCap: check profile_grants too while checking caps

When checking if a certain fs subcommand can and should be executed in
FSCommands.cc, check permissions in "profile_grants" too when the caps
for that entity contains a cap profile.

Fixes: https://tracker.ceph.com/issues/47423
Signed-off-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge pull request #37158 from tchaikov/wip-no-more-assertDictContainsSubset
Kefu Chai [Fri, 18 Sep 2020 07:18:31 +0000 (15:18 +0800)]
Merge pull request #37158 from tchaikov/wip-no-more-assertDictContainsSubset

mgr/dashboard: replace assertDictContainsSubset() with assertLessEqual()

Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #37170 from yaarith/add-smartctl-nvme-dependencies
Kefu Chai [Fri, 18 Sep 2020 05:42:44 +0000 (13:42 +0800)]
Merge pull request #37170 from yaarith/add-smartctl-nvme-dependencies

ceph.spec, debian: add smartmontools, nvme-cli dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: introduce Boost::MPL interface library 37224/head
Kefu Chai [Fri, 18 Sep 2020 04:23:13 +0000 (12:23 +0800)]
cmake: introduce Boost::MPL interface library

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agosrc: Revert "Fix to raise BOOST_MPL_LIMIT_LIST_SIZE from 20 to 30"
Kefu Chai [Fri, 18 Sep 2020 03:01:19 +0000 (11:01 +0800)]
src: Revert "Fix to raise BOOST_MPL_LIMIT_LIST_SIZE from 20 to 30"

This reverts commit 3f4e9a4526b8f174888828078e610769b80e48ec.

will fix the FTBFS by introducing a interface library in CMake script

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: extract admin/CMakeLists.txt
Kefu Chai [Fri, 18 Sep 2020 04:17:44 +0000 (12:17 +0800)]
cmake: extract admin/CMakeLists.txt

for better modularity

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agolibrbd: pass IOContext to image-extent IO dispatch methods 37222/head
Jason Dillaman [Fri, 4 Sep 2020 02:21:30 +0000 (22:21 -0400)]
librbd: pass IOContext to image-extent IO dispatch methods

This allows a specific IOContext to be used regardless of the image's
current read and write snapshot state.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: pass IOContext to object-extent IO dispatch methods
Jason Dillaman [Fri, 4 Sep 2020 00:22:30 +0000 (20:22 -0400)]
librbd: pass IOContext to object-extent IO dispatch methods

This allows a specific IOContext to be used regardless of the image's
current read and write snapshot state.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: helper method to create new data pool IOContext
Jason Dillaman [Thu, 3 Sep 2020 17:33:42 +0000 (13:33 -0400)]
librbd: helper method to create new data pool IOContext

Deep-copy will require the ability to issue IOs against arbitrary
IOContexts via the image-extent IO dispatcher.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: image dispatch spec tids are assigned by dispatcher
Jason Dillaman [Tue, 1 Sep 2020 15:17:41 +0000 (11:17 -0400)]
librbd: image dispatch spec tids are assigned by dispatcher

This was a legacy implementation where it was assigned by the ImageRequestWQ
and therefore needs to be part of the factory methods.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: simplify in-flight IO tracking for write-block image dispatch
Jason Dillaman [Mon, 31 Aug 2020 22:08:24 +0000 (18:08 -0400)]
librbd: simplify in-flight IO tracking for write-block image dispatch

Now that we don't need to worry about read requests issuing a finish
callback, we can use a simple counter to track in-flight writes.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: drop ImageDispatchInterface::handle_finished virtual method
Jason Dillaman [Mon, 31 Aug 2020 22:07:14 +0000 (18:07 -0400)]
librbd: drop ImageDispatchInterface::handle_finished virtual method

Any dispatch layer can now directly place themselves in the finish
callback handler chain without the use of the generic callback.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: use an overridable finish handler for the image dispatcher
Jason Dillaman [Mon, 31 Aug 2020 22:27:32 +0000 (18:27 -0400)]
librbd: use an overridable finish handler for the image dispatcher

This mimics the design from the object dispatcher and will allow
for simplified in-flight IO tracking.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: drop flush tracker from exclusive lock image dispatch
Jason Dillaman [Thu, 17 Sep 2020 23:43:45 +0000 (19:43 -0400)]
librbd: drop flush tracker from exclusive lock image dispatch

We can now pass the flush through the exclusive-lock dispatch layer
to ensure all in-flight IOs have been processed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: update refresh image dispatch layer flush exclusions
Jason Dillaman [Thu, 17 Sep 2020 17:05:27 +0000 (13:05 -0400)]
librbd: update refresh image dispatch layer flush exclusions

Only flush requests coming from the refresh state machine or from the
exclusive-lock dispatch layer initializationshould be ignored. This is
because both can be initiated from the refresh state machine and
therefore deadlock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: reorder exclusive-lock pre-release state steps
Jason Dillaman [Thu, 17 Sep 2020 20:22:20 +0000 (16:22 -0400)]
librbd: reorder exclusive-lock pre-release state steps

The exclusive-lock dispatch layer should be locked and flushed to
ensure no IO is waiting for a refresh. Once that is complete, interlock
with the refresh state machine and re-flush one last time w/ the
refresh dispatch layer skipped.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: avoid blocking writes when initializing exclusive-lock
Jason Dillaman [Thu, 17 Sep 2020 19:09:39 +0000 (15:09 -0400)]
librbd: avoid blocking writes when initializing exclusive-lock

The exclusive-lock dispatch layer will already block IOs as required
so this second layer of blocking just increases the complexity and
the potential for deadlocks when attempting to flush.

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