]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/telemetry: fix device id splitting when anonymizing serial 37318/head
Yaarit Hatuka [Thu, 27 Aug 2020 03:04:34 +0000 (23:04 -0400)]
mgr/telemetry: fix device id splitting when anonymizing serial

Anonymizing the serial number in the device id string fails in rare
cases where 'vendor' and 'model' are missing from the device id
string. Ideally, device id is generated (in blkdev.cc) as
'vendor_model_serial', in case all fields were successfully retrieved
from the device. In cases where they were not, device id can also be
generated as 'model_serial' or 'serial'. Splitting by '_' fails in the
latter case (since 'serial' is the only element in the string).

In order to anonymize serial numbers in smartctl reports we now rely
on the serial number value as retrieved from the raw smartctl report
itself (as opposed to the one in device id). That's in order to avoid
possible inconsistencies between the serial retrieved from device id and
the one in the report.

Fixes: https://tracker.ceph.com/issues/46977
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit e5099a7b58bcf39d80beb908c192c3bf639db1a4)

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

In master we use Python 3's f-string formatting to create 'anon_devid':
anon_devid = f"{devid.rsplit('_', 1)[0]}_{uuid.uuid1()}"

The conflict happened since Nautilus still uses Python 2, and 'anon_id'
is created via string concatenation.
anon_devid = devid[:devid.rfind('_')] + '_' + str(uuid.uuid1())

4 years agoMerge pull request #37284 from idryomov/wip-krbd-noudev-nautilus
Ilya Dryomov [Tue, 22 Sep 2020 07:52:48 +0000 (09:52 +0200)]
Merge pull request #37284 from idryomov/wip-krbd-noudev-nautilus

nautilus: krbd: optionally skip waiting for udev events

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37051 from trociny/wip-47362-nautilus
Yuri Weinstein [Mon, 21 Sep 2020 19:50:20 +0000 (12:50 -0700)]
Merge pull request #37051 from trociny/wip-47362-nautilus

nautilus: os/bluestore: fix collection_list ordering

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36828 from batrick/i47152
Yuri Weinstein [Mon, 21 Sep 2020 15:21:47 +0000 (08:21 -0700)]
Merge pull request #36828 from batrick/i47152

nautilus: pybind/mgr/volumes: add global lock debug

Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge pull request #36714 from kotreshhr/wip-46948-nautilus
Yuri Weinstein [Mon, 21 Sep 2020 15:20:44 +0000 (08:20 -0700)]
Merge pull request #36714 from kotreshhr/wip-46948-nautilus

nautilus: qa: Fix traceback during fs cleanup between tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36181 from smithfarm/wip-46592-nautilus
Yuri Weinstein [Mon, 21 Sep 2020 15:20:06 +0000 (08:20 -0700)]
Merge pull request #36181 from smithfarm/wip-46592-nautilus

nautilus: common:  ignore SIGHUP prior to fork

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: add test for mapping and unmapping from a network namespace 37284/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>
(cherry picked from commit d2884adb1542de7a43f82eb899056aa74de95052)

4 years agoMerge pull request #37161 from rhcs-dashboard/alert-loading
Lenz Grimmer [Fri, 18 Sep 2020 10:56:59 +0000 (12:56 +0200)]
Merge pull request #37161 from rhcs-dashboard/alert-loading

nautilus: mgr/dashboard: Monitoring: Fix for the infinite loading bar action

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agomgr/dashboard: Monitoring: Fix for the infinite loading bar action 37161/head
nizamial09 [Tue, 15 Sep 2020 13:01:52 +0000 (18:31 +0530)]
mgr/dashboard: Monitoring: Fix for the infinite loading bar action

Only seen in nautilus
Intended to fix the unusual behaviour in the All Alerts tab where the loading bar progressess continously until one of the alerts is selected.

To reproduce:
Navigate to cluster -> Monitoring -> All Alerts tab. You can see the progress bar at the bottom of the table.

Fixes: https://tracker.ceph.com/issues/47435
Signed-off-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #37204 from tchaikov/nautilus-doc-rtd
Kefu Chai [Thu, 17 Sep 2020 02:54:31 +0000 (10:54 +0800)]
Merge pull request #37204 from tchaikov/nautilus-doc-rtd

nautilus: doc: enable Read the Docs

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agodoc: add in-doc search from read the docs 37204/head
Kefu Chai [Thu, 9 Apr 2020 15:14:42 +0000 (23:14 +0800)]
doc: add in-doc search from read the docs

readthedocs-sphinx-search features better user experience than the
builtin search offered by sphinx

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

4 years agodoc: use plantweb as fallback of sphinx-ditaa
Kefu Chai [Thu, 9 Apr 2020 13:25:39 +0000 (21:25 +0800)]
doc: use plantweb as fallback of sphinx-ditaa

RTD does not support installing system packages, the only ways to install
dependencies are setuptools and pip. while ditaa is a tool written in
Java. so we need to find a native python tool allowing us to render ditaa
images. plantweb is able to the web service for rendering the ditaa
diagram. so let's use it as a fallback if "ditaa" is not around.

also start a new line after the directive, otherwise planweb server will
return 500 at seeing the diagram.

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

Conflicts:
doc/cephfs/cephfs-io-path.rst
doc/dev/deduplication.rst
doc/install/ceph-deploy/quick-cephfs.rst
doc/radosgw/vault.rst
doc/rbd/rbd-kubernetes.rst
doc/rbd/rbd-persistent-cache.rst: these file does not exist in
          nautilus, so drop related changes

4 years agodoc/conf.py: exclude pybindings docs from build for RTD
Kefu Chai [Thu, 9 Apr 2020 08:51:06 +0000 (16:51 +0800)]
doc/conf.py: exclude pybindings docs from build for RTD

because it'd difficult to prepare (dummy) librados,libcephfs and librbd for
their python bindings in the building environment offered by Read the Docs.

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

Conflicts:
doc/conf.py: trivial resolution

4 years agoreadthedocs: add .readthedocs.yml
Kefu Chai [Thu, 9 Apr 2020 07:35:15 +0000 (15:35 +0800)]
readthedocs: add .readthedocs.yml

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

4 years agoMerge pull request #37171 from neha-ojha/wip-47092-nautilus
Yuri Weinstein [Wed, 16 Sep 2020 21:06:12 +0000 (14:06 -0700)]
Merge pull request #37171 from neha-ojha/wip-47092-nautilus

nautilus: mon: mark pgtemp messages as no_reply more consistenly in preprocess_…

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #37091 from neha-ojha/wip-47194-nautilus
Yuri Weinstein [Wed, 16 Sep 2020 15:52:38 +0000 (08:52 -0700)]
Merge pull request #37091 from neha-ojha/wip-47194-nautilus

nautilus: os/bluestore: enable more flexible bluefs space management by default.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #36982 from neha-ojha/wip-47296-nautilus
Yuri Weinstein [Wed, 16 Sep 2020 15:44:27 +0000 (08:44 -0700)]
Merge pull request #36982 from neha-ojha/wip-47296-nautilus

nautilus: mon/OSDMonitor: only take in osd into consideration when trimming osd…

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36920 from p-se/wip-47228-nautilus
Yuri Weinstein [Wed, 16 Sep 2020 15:43:53 +0000 (08:43 -0700)]
Merge pull request #36920 from p-se/wip-47228-nautilus

nautilus: mgr/dashboard: document Prometheus' security model

Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #36726 from dillaman/wip-compile-fixes-nautilus
Yuri Weinstein [Wed, 16 Sep 2020 15:43:24 +0000 (08:43 -0700)]
Merge pull request #36726 from dillaman/wip-compile-fixes-nautilus

nautilus: minor tweaks to fix compile issues under latest Fedora

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #36412 from shyukri/wip-46088-nautilus
Yuri Weinstein [Wed, 16 Sep 2020 15:42:49 +0000 (08:42 -0700)]
Merge pull request #36412 from shyukri/wip-46088-nautilus

nautilus: mgr/prometheus: automatically discover RBD pools for stats gathering

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agomon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp 37171/head
Greg Farnum [Wed, 12 Aug 2020 23:44:11 +0000 (23:44 +0000)]
mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp

If a message is forwarded, it's conceivable the leader's and peon's evaluation
will disagree about whether the message is useful or not, which could result
in the leader ignoring it and the peon having a dangling forwarded message.
Fix this by marking the op as no_reply whenever ignoring it.

Fixes: https://tracker.ceph.com/issues/46914
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 73a014fc2ca928eb72def31c9e4177063cda421a)

4 years agoMerge pull request #36944 from vumrao/wip-vumrao-47257
Yuri Weinstein [Tue, 15 Sep 2020 20:39:31 +0000 (13:39 -0700)]
Merge pull request #36944 from vumrao/wip-vumrao-47257

nautilus: mon/PGMap: add pg count for pools in the ceph df command

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36952 from ceph/wip-nautilus-bz1872983
Jan Fajerski [Tue, 15 Sep 2020 13:25:34 +0000 (15:25 +0200)]
Merge pull request #36952 from ceph/wip-nautilus-bz1872983

nautilus: ceph-volume: simple scan should ignore tmpfs

4 years agoMerge pull request #36453 from jan--f/wip-46113-nautilus
Jan Fajerski [Tue, 15 Sep 2020 13:22:23 +0000 (15:22 +0200)]
Merge pull request #36453 from jan--f/wip-46113-nautilus

nautilus: ceph-volume: report correct rejected reason in inventory if device type is invalid

4 years agoMerge pull request #37055 from ifed01/wip-ifed-fix-rocksdb-opts-nautilus
Yuri Weinstein [Mon, 14 Sep 2020 15:31:29 +0000 (08:31 -0700)]
Merge pull request #37055 from ifed01/wip-ifed-fix-rocksdb-opts-nautilus

nautilus: kv/RocksDBStore: make options compaction_threads/disableWAL/flusher_t…

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37081 from idryomov/wip-relax-preauth-asserts-nautilus
Ilya Dryomov [Sun, 13 Sep 2020 18:56:37 +0000 (20:56 +0200)]
Merge pull request #37081 from idryomov/wip-relax-preauth-asserts-nautilus

nautilus: msg/async/ProtocolV2: allow rxbuf/txbuf get bigger in testing

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #36188 from smithfarm/wip-45954-nautilus
Yuri Weinstein [Fri, 11 Sep 2020 16:50:46 +0000 (09:50 -0700)]
Merge pull request #36188 from smithfarm/wip-45954-nautilus

nautilus: rgw: fail when get/set-bucket-versioning attempted on a non-existent …

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoos/bluestore: enable more flexible bluefs space management by default. 37091/head
Igor Fedotov [Fri, 21 Aug 2020 11:51:00 +0000 (14:51 +0300)]
os/bluestore: enable more flexible bluefs space management by default.

It turned out that we did't enable it when introduced this feature in
https://github.com/ceph/ceph/pull/29687.

Fixes: https://tracker.ceph.com/issues/47053
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 41823db09c609155db31afbd03b817c2a578fa9d)

4 years agomsg/async/ProtocolV2: allow rxbuf/txbuf get bigger in testing 37081/head
Ilya Dryomov [Sat, 29 Aug 2020 10:02:30 +0000 (12:02 +0200)]
msg/async/ProtocolV2: allow rxbuf/txbuf get bigger in testing

We have a kernel client test case that constructs huge auth tickets
to exercise the three related code paths in the kernel.  One of the
tickets is bigger than 1000000 bytes, as required for triggering the
third code path.

We haven't bumped into this assert earlier because the kernel client
is still on msgr v1.  However, "rbd map" and "rbd unmap" commands
started connecting to the cluster in commit 96f05a7956b3 ("rbd: delay
determination of default pool name") and that happens via msgr v2.

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

4 years agoceph-volume: show correct rejected reason in inventory if device type is not acceptable 36453/head
Satoru Takeuchi [Fri, 22 May 2020 01:45:32 +0000 (01:45 +0000)]
ceph-volume: show correct rejected reason in inventory if device type is not acceptable

If device type is not acceptable in `c-v inventory`, its rejected reason
becomes "Insufficient space (<5GB)" by mistake. It's because sys_api is
empty due to skipping devices that are neither `disk` nor `device`. We
should report the target device is not acceptable in this case.

Fixes: https://tracker.ceph.com/issues/46102
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 3e5d91d41f7275d4656019c1ca3fc80927d214c9)

4 years agoceph-volume: cleanup code
Satoru Takeuchi [Fri, 22 May 2020 01:07:17 +0000 (01:07 +0000)]
ceph-volume: cleanup code

Simplify the logic and fix a typo.

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 0169b72fff48134ef01802ade38c55281b9f4510)

4 years agomon/PGMap: add pg count for pools in the ceph df command 36944/head
Vikhyat Umrao [Wed, 26 Aug 2020 10:17:05 +0000 (03:17 -0700)]
mon/PGMap: add pg count for pools in the ceph df command
Fixes: https://tracker.ceph.com/issues/46663
Signed-off-by: Vikhyat Umrao <vikhyat@redhat.com>
(cherry picked from commit 9ffbffbe6cd1d8dafb1dd88cbc1ce644afc7a915)

 Conflicts:
PendingReleaseNotes
        - Taking only release notes line for this commit

Signed-off-by: Vikhyat Umrao <vikhyat@redhat.com>
4 years agotest/objectstore: make store_test also run collection_list_legacy 37051/head
Mykola Golub [Thu, 20 Aug 2020 11:24:42 +0000 (12:24 +0100)]
test/objectstore: make store_test also run collection_list_legacy

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

Conflicts:
src/test/objectstore/store_test.cc:
different collection_list arguments in
SyntheticWorkloadState::shutdown

4 years agoos/kstore: fix collection_list properly set next if end reached
Mykola Golub [Wed, 19 Aug 2020 10:16:12 +0000 (11:16 +0100)]
os/kstore: fix collection_list properly set next if end reached

Previously it was setting it to GMAX (happened when one had end
set to not GMAX and max set to INT_MAX).

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

4 years agoos/kstore: fix collection_list ordering
Mykola Golub [Wed, 19 Aug 2020 08:56:57 +0000 (09:56 +0100)]
os/kstore: fix collection_list ordering

It has the same key escaping bug as the blustore has, but we
don't need to workaround it here because kstore is not in
production use.

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

4 years agoos/bluestore: refactor _collection_list
Mykola Golub [Wed, 19 Aug 2020 08:33:38 +0000 (09:33 +0100)]
os/bluestore: refactor _collection_list

Make it operate with oids only hiding keys in CollectionListIterator.

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

4 years agoosd: add and utilize OSD_FIXED_COLLECTION_LIST feature
Mykola Golub [Thu, 30 Jul 2020 14:21:28 +0000 (15:21 +0100)]
osd: add and utilize OSD_FIXED_COLLECTION_LIST feature

If all osds from upacting set have this feature set
the backend can use the new "fixed" collection_list method,
otherwise it fallbacks to the legacy method.

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

Conflicts:
src/include/ceph_features.h: trivial
src/osd/PGBackend.h: trivial
src/osd/PrimaryLogPG.h: PG::get_min_upacting_features instead of
PeeringState::get_min_upacting_features

4 years agokv/RocksDBStore: make options compaction_threads/disableWAL/flusher_threads/compact_o... 37055/head
Jianpeng Ma [Fri, 10 Jan 2020 06:33:55 +0000 (14:33 +0800)]
kv/RocksDBStore: make options compaction_threads/disableWAL/flusher_threads/compact_on_mount work.

This bug introduce by commit: 5f72c376deb64562e.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit ce3a1ca56df917bc3fa186d0e8c7b4256d2a37e9)

4 years agoos: add collection_list_legacy
Mykola Golub [Thu, 30 Jul 2020 07:39:45 +0000 (08:39 +0100)]
os: add collection_list_legacy

which provides the old collection_list behaviour on the bluestore.

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

Conflicts:
src/os/bluestore/BlueStore.cc: (std::shared_lock vs RWLock)
src/os/bluestore/BlueStore.h: trivial (std::vector vs vector)

4 years agoos/bluestore: fix collection_list properly set next if end reached
Mykola Golub [Fri, 31 Jul 2020 15:05:10 +0000 (16:05 +0100)]
os/bluestore: fix collection_list properly set next if end reached

Previously it was setting it to GMAX (happened when one had end
set to not GMAX and max set to INT_MAX).

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

4 years agoos/bluestore: make get_key_object work with temp keys
Mykola Golub [Wed, 29 Jul 2020 18:02:54 +0000 (19:02 +0100)]
os/bluestore: make get_key_object work with temp keys

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

4 years agoos/bluestore: fix collection_list ordering
Mykola Golub [Mon, 13 Jul 2020 06:33:07 +0000 (07:33 +0100)]
os/bluestore: fix collection_list ordering

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

4 years agoMerge pull request #36930 from aclamk/wip-bluefs-log-replay-rescue-nautilus
Yuri Weinstein [Tue, 8 Sep 2020 17:15:44 +0000 (10:15 -0700)]
Merge pull request #36930 from aclamk/wip-bluefs-log-replay-rescue-nautilus

nautilus: Rescue procedure for extremely large bluefs log

Neha Ojha <nojha@redhat.com>

4 years agoceph-volume: simple scan should ignore tmpfs 36952/head
Andrew Schoen [Fri, 4 Sep 2020 14:44:49 +0000 (09:44 -0500)]
ceph-volume: simple scan should ignore tmpfs

When simple scan is ran against a ceph-volume
OSD, util.encryption.legacy_encrypted returns
tmpfs. We want to avoid creating a Device
object with tmpfs and ignore the OSD as it's
not a ceph-disk created OSD.

Resolves: rhbz#1872983

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

4 years agomon/OSDMonitor: only take in osd into consideration when trimming osdmaps 36982/head
Kefu Chai [Thu, 3 Sep 2020 15:02:58 +0000 (23:02 +0800)]
mon/OSDMonitor: only take in osd into consideration when trimming osdmaps

we should not take down osd into consideration when trimming osdmap. in
e62269c892, we decrease the upper bound of range of osdmaps to be trimmed
if the given osd is out. but we should have to decrease it only if the
osd in question is still *in*.

so, in this change, the min_lec is decreased only if the osd in question
is *in*.

Fixes: https://tracker.ceph.com/issues/47290
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 79175740cf2394bba74163ca8a5131419b9641ed)

 Conflicts:
src/mon/OSDMonitor.cc - trivial resolution

4 years agoMerge pull request #36785 from callithea/wip-46937-nautilus
Yuri Weinstein [Wed, 2 Sep 2020 17:33:26 +0000 (10:33 -0700)]
Merge pull request #36785 from callithea/wip-46937-nautilus

nautilus: mgr: Add missing states to PG_STATES in mgr_module.py.

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36853 from dillaman/wip-46932-nautilus
Yuri Weinstein [Wed, 2 Sep 2020 16:42:53 +0000 (09:42 -0700)]
Merge pull request #36853 from dillaman/wip-46932-nautilus

nautilus: librados: add LIBRADOS_SUPPORTS_GETADDRS support

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #36784 from callithea/wip-46752-nautilus
Yuri Weinstein [Wed, 2 Sep 2020 16:41:46 +0000 (09:41 -0700)]
Merge pull request #36784 from callithea/wip-46752-nautilus

nautilus: mgr/dashboard: wait longer for health status to be cleared

Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #36578 from callithea/wip-46716-nautilus
Yuri Weinstein [Wed, 2 Sep 2020 16:40:39 +0000 (09:40 -0700)]
Merge pull request #36578 from callithea/wip-46716-nautilus

nautilus: mgr/diskprediction_local: Fix array size error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #36926 from leseb/bp-36700-nautilus
Jan Fajerski [Wed, 2 Sep 2020 13:34:40 +0000 (15:34 +0200)]
Merge pull request #36926 from leseb/bp-36700-nautilus

nautilus: ceph-volume: retry when acquiring lock fails

4 years agokrbd: optionally skip waiting for udev events
Ilya Dryomov [Mon, 24 Aug 2020 17:01:46 +0000 (19:01 +0200)]
krbd: optionally skip waiting for udev events

Add support for noudev option to allow mapping and unmapping images
from a privileged container in a non-initial network namespace (e.g.
when using Multus CNI).

Fixes: https://tracker.ceph.com/issues/47128
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 2e657d134a1af489dcf623d207be259ce3dda9bc)

Conflicts:
doc/man/8/rbd.rst [ crush_location, read_from_replica and
  compression_hint map options not in nautilus ]
src/krbd.cc [ commits 08bf0b628803 ("krbd: do away with
  explicit memory management") and 1e67e240f4dd ("krbd: misc
  cleanups") not in nautilus ]
src/tools/rbd/action/Kernel.cc [ commits 34f539d8af33 ("rbd:
  delay parsing of default kernel map options") and da4ffd834fb8
  ("rbd: rename some MapOptions instances to unmap_options") not
  in nautilus ]

4 years agoos/bluestore: Add documentation for large bluefs log recovery 36930/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.

Fixes: https://tracker.ceph.com/issues/46714
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
4 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.

Fixes: https://tracker.ceph.com/issues/46714
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
Cherry-picked from 7b01af4d95bfa789b3b3247d016431fdbfd844a4
Conflicts:
src/os/bluestore/BlueFS.cc

4 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/46714
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
Cherry-picked from 40e94a106a8adff6304905d59e1634801d2c9890

Conflicts:
src/common/legacy_config_opts.h
src/os/bluestore/BlueFS.cc

4 years agoMerge pull request #36615 from rishabh-d-dave/cv-add-tests-for-new-lvm-functions-n
Jan Fajerski [Tue, 1 Sep 2020 14:25:21 +0000 (16:25 +0200)]
Merge pull request #36615 from rishabh-d-dave/cv-add-tests-for-new-lvm-functions-n

nautilus: ceph-volume: add tests for new functions that run LVM commands

4 years agoMerge pull request #36610 from rishabh-d-dave/cv-rm-container-classes-n
Jan Fajerski [Tue, 1 Sep 2020 14:25:02 +0000 (16:25 +0200)]
Merge pull request #36610 from rishabh-d-dave/cv-rm-container-classes-n

nautilus: ceph-volume: remove container classes from api/lvm.py

4 years agoceph-volume: retry when acquiring lock fails 36926/head
Sébastien Han [Tue, 18 Aug 2020 13:41:31 +0000 (15:41 +0200)]
ceph-volume: retry when acquiring lock fails

When preaparing the osd device with --mkfs, the ceph-osd binary tries to
acquire an exclusive lock on the device (soon to become an OSD).
Unfortunately, when running in containers, we have seen cases where
there is a race between ceph-osd and systemd-udevd to acquire a lock on
the device. Sometimes systemd-udevd gets the lock and releases it soon
so that the ceph-osd gets sometimes the lock is still held and because
ceph-osd uses LOCK_NB the command fails.

This commit retries if the lock cannot be acquired, up to 5 times for 5
seconds, this should be more than enough to acquire the lock and
proceed with the OSD mkfs.

Unfortunately, this is so transient that we cannot lock earlier from c-v,
this won't do anything.

Fixes: https://tracker.ceph.com/issues/47010
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit a285cd08921f51ef1101950eb6b9addcdfbecc35)

4 years agomgr/dashboard: document Prometheus' security model 36920/head
Patrick Seidensal [Tue, 5 May 2020 12:16:36 +0000 (14:16 +0200)]
mgr/dashboard: document Prometheus' security model

Fixes: https://tracker.ceph.com/issues/45377
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 34765e9215f8a0f1476b09993a0703c38a691e4b)

4 years agoMerge PR #36692 into nautilus
Patrick Donnelly [Fri, 28 Aug 2020 16:17:11 +0000 (09:17 -0700)]
Merge PR #36692 into nautilus

* refs/pull/36692/head:
mgr/dashboard/api: reduce amount of daemon logs

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36783 from callithea/wip-46973-nautilus
Lenz Grimmer [Fri, 28 Aug 2020 10:30:08 +0000 (12:30 +0200)]
Merge pull request #36783 from callithea/wip-46973-nautilus

nautilus: mgr/dashboard: Hide table action input field if limit=0

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #36607 from s0nea/wip-46913-nautilus
Lenz Grimmer [Fri, 28 Aug 2020 10:21:16 +0000 (12:21 +0200)]
Merge pull request #36607 from s0nea/wip-46913-nautilus

nautilus: mgr/dashboard/api: increase API health timeout

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agomgr: Add missing states to PG_STATES in mgr_module.py. 36785/head
Harley Gorrell [Fri, 31 Jul 2020 23:21:47 +0000 (17:21 -0600)]
mgr: Add missing states to PG_STATES in mgr_module.py.

Fixes: https://tracker.ceph.com/issues/46808
Signed-off-by: Harley Gorrell <harley@panix.com>
(cherry picked from commit 5cdadf17d634e1cbd8d2b0be8c9439bc20bdbd13)

Conflicts:
src/pybind/mgr/mgr_module.py
- state "laggy" and "wait" are not relevant for nautilus

4 years agoMerge pull request #36354 from BenoitKnecht/nautilus-doc-osd-op-queue
Neha Ojha [Fri, 28 Aug 2020 01:15:46 +0000 (18:15 -0700)]
Merge pull request #36354 from BenoitKnecht/nautilus-doc-osd-op-queue

nautilus: doc/rados: Fix osd_op_queue default value

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #36833 into nautilus
Patrick Donnelly [Thu, 27 Aug 2020 20:43:01 +0000 (13:43 -0700)]
Merge PR #36833 into nautilus

* refs/pull/36833/head:
nautilus: mgr/volumes: convert uid and gid to integer type
mgr/volumes: Address python breakage in python 2
mgr/volumes: Update doc/cephfs/fs-volumes.rst for nautilus
mgr/volumes: Prevent subvolume recreate if trash is not-empty
mgr/volumes: Disallow subvolume group level snapshots
mgr/volumes: Add test case to ensure subvolume is marked
mgr/volumes: handle idempotent subvolume marks
mgr/volumes: Tests amended and added to ensure subvolume trash functionality
mgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume
mgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash
mgr/volumes: maintain per subvolume trash directory
mgr/volumes: make subvolume_v2::_is_retained() object property
mgr/volumes: Use snapshot root directory attrs when creating clone root

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agonautilus: mgr/volumes: convert uid and gid to integer type 36833/head
Ramana Raja [Thu, 27 Aug 2020 11:19:50 +0000 (16:49 +0530)]
nautilus: mgr/volumes: convert uid and gid to integer type

... before chown in py2 environments.

Introduced-by: 0eaf9b0bd2786762160b83edc52d979f5aad233c
Signed-off-by: Ramana Raja <rraja@redhat.com>
4 years agomgr/volumes: Address python breakage in python 2
Shyamsundar Ranganathan [Wed, 26 Aug 2020 23:22:09 +0000 (19:22 -0400)]
mgr/volumes: Address python breakage in python 2

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 284dd3c4829f95b9618d98da49e59ec1c56dde61)

4 years agomgr/volumes: Update doc/cephfs/fs-volumes.rst for nautilus
ShyamsundarR [Wed, 26 Aug 2020 20:30:23 +0000 (16:30 -0400)]
mgr/volumes: Update doc/cephfs/fs-volumes.rst for nautilus

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Prevent subvolume recreate if trash is not-empty
Shyamsundar Ranganathan [Wed, 26 Aug 2020 12:41:11 +0000 (08:41 -0400)]
mgr/volumes: Prevent subvolume recreate if trash is not-empty

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 00e4ab054faf7f33d117b5f6ce70c31e8d53ad1b)

4 years agomgr/volumes: Disallow subvolume group level snapshots
Shyamsundar Ranganathan [Tue, 25 Aug 2020 22:46:12 +0000 (18:46 -0400)]
mgr/volumes: Disallow subvolume group level snapshots

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit f97e57c28c7fa7685b853e9f7f7e23267739a6c0)

4 years agomgr/volumes: Add test case to ensure subvolume is marked
Shyamsundar Ranganathan [Tue, 25 Aug 2020 15:44:50 +0000 (11:44 -0400)]
mgr/volumes: Add test case to ensure subvolume is marked

with the vxattr ceph.dir.subvolume set to true.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 3527711a4a2600acb85f3cb2b599b531a8c1a104)

4 years agomgr/volumes: handle idempotent subvolume marks
Venky Shankar [Tue, 25 Aug 2020 06:57:50 +0000 (02:57 -0400)]
mgr/volumes: handle idempotent subvolume marks

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 2f5eed200a0710759001ae1a26c739584f32be88)

4 years agomgr/volumes: Tests amended and added to ensure subvolume trash functionality
Shyamsundar Ranganathan [Mon, 24 Aug 2020 19:10:44 +0000 (15:10 -0400)]
mgr/volumes: Tests amended and added to ensure subvolume trash functionality

Amended a few test cases to ensure created subvolumes and snaps
are removed, and trash stays empty at the end of the test.

Further added one test case for create errors in a retained
v2 subvolume, to ensure metadata is sane, and created incarnation
is not present.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 88cffe6ea97733f2f0169362ffbde3e3827dc861)

Conflicts:
qa/tasks/cephfs/test_volumes.py
- Remove pin related test cases

4 years agomgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume
Shyamsundar Ranganathan [Mon, 24 Aug 2020 13:33:10 +0000 (09:33 -0400)]
mgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume

This enables snapshot scaling of subvolumes, and hence prevents
renaming, hardlinking etc. outside the subvolume.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit fe0c0bd5ea1e7ebd7f2777848b9cac3966342dda)

4 years agomgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash
Shyamsundar Ranganathan [Sun, 23 Aug 2020 16:31:01 +0000 (12:31 -0400)]
mgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash

For v2 subvolumes without any snapshots or pending purges
move the subvolume to trash, for the purge operation.

When removing only incarnations, leverage symlink based purge
job creation, to avoid renaming the incarnation out of the
subvolume.

For create errors, where the subvolume was retained, just remove
the created incarnation directory.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 20c8a62939a0f290234ffa048bcc4c36f033b440)

4 years agomgr/volumes: maintain per subvolume trash directory
Venky Shankar [Fri, 21 Aug 2020 14:07:37 +0000 (10:07 -0400)]
mgr/volumes: maintain per subvolume trash directory

PR https://github.com/ceph/ceph/pull/36472 introduces changes
that disallow nested nested snapshots in a subtree (subvolume)
and renames across subvolumes. This effect asynchronous purge
in mgr/volumes as subvolume are moved to a trash directory for
asynchronous deletion by purge threads.

To workaround this, start maintaining a subvolume specific
trash directory. Use the trash directory as an index to the
subvolume specific trash directory entry.

This changes subvolume deletion logic which currently relies
on `--retain-snapshots` flag to decide if the subvolume user
directory should get purged or the subvolume base directory
itself. Deleting a subvolume moves the user facing directory
to its specific trash directory. Purge threads take care of
deleting user facing directories (in trash) and the subvolume
base directory if required (when certain conditions are met).

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit aae7a70ed2cf9c32684cfdaf701778a05f229e09)

4 years agomgr/volumes: make subvolume_v2::_is_retained() object property
Venky Shankar [Fri, 21 Aug 2020 05:18:45 +0000 (01:18 -0400)]
mgr/volumes: make subvolume_v2::_is_retained() object property

... and drop the leading underscore.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 9a76c01536377737a18ed7005fd10b1111e96d50)

4 years agomgr/volumes: Use snapshot root directory attrs when creating clone root
Shyamsundar Ranganathan [Tue, 23 Jun 2020 23:57:52 +0000 (19:57 -0400)]
mgr/volumes: Use snapshot root directory attrs when creating clone root

If a subvolumes mode or uid/gid values are changed post a snapshot,
and a clone of a snapshot prior to the change is initiated, the clone
inherits the current source subvolumes attributes, rather than the
snapshots attributes.

Fixing this by using the snapshots subvolume root attributes to create
the clone subvolumes root.

Following attributes are picked from the source subvolume snapshot:
- uid, gid, mode, data pool, pool namespace, quota

Fixes: https://tracker.ceph.com/issues/46163
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 0eaf9b0bd2786762160b83edc52d979f5aad233c)

4 years agoMerge PR #36404 into nautilus
Patrick Donnelly [Thu, 27 Aug 2020 19:31:24 +0000 (12:31 -0700)]
Merge PR #36404 into nautilus

* refs/pull/36404/head:
client: expose ceph.quota.max_bytes xattr within snapshots

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36613 from tspmelo/wip-46925-nautilus
Lenz Grimmer [Thu, 27 Aug 2020 15:21:44 +0000 (17:21 +0200)]
Merge pull request #36613 from tspmelo/wip-46925-nautilus

nautilus: mgr/dashboard: Unable to edit iSCSI logged-in client

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
4 years agoMerge pull request #36304 from dillaman/wip-46725-nautilus
Yuri Weinstein [Thu, 27 Aug 2020 14:51:30 +0000 (07:51 -0700)]
Merge pull request #36304 from dillaman/wip-46725-nautilus

nautilus: ceph-iscsi: selinux fixes

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agolibrados: add LIBRADOS_SUPPORTS_GETADDRS support 36853/head
Xiubo Li [Thu, 6 Aug 2020 03:56:26 +0000 (11:56 +0800)]
librados: add LIBRADOS_SUPPORTS_GETADDRS support

This will be very helpful when release ceph package(like RPM) with
backporting rados_getaddrs() api to previous version.

In tcmu-runner we need to check whether the rados_getaddrs() is
support or not.

Fixes: https://tracker.ceph.com/issues/46842
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 63cb60b52596d85b44ca8698ed48f9358fdda96a)

4 years agolibrados: expose msgr client addresses via API
Jason Dillaman [Thu, 27 Aug 2020 13:24:49 +0000 (09:24 -0400)]
librados: expose msgr client addresses via API

This is a partial backport of the librados API changes from commit
df507cde8d71063d5873a42f668156e4c32e86f9.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: added missing <string> include to PoolMetadata header
kalebskeithley [Mon, 13 Jan 2020 12:51:59 +0000 (07:51 -0500)]
librbd: added missing <string> include to PoolMetadata header

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
(cherry picked from commit 84f629e1b1c8b336b9ce6bcc2466010045e68e7e)

4 years agocommon: add missing #include
Kefu Chai [Sun, 5 Jan 2020 14:25:40 +0000 (22:25 +0800)]
common: add missing #include

clang++-9.0.1 and libc++ require them to build

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

4 years agoMerge PR #36804 into nautilus
Patrick Donnelly [Wed, 26 Aug 2020 23:35:08 +0000 (16:35 -0700)]
Merge PR #36804 into nautilus

* refs/pull/36804/head:
qa/workunits/fs: add test for subvolume
mds: don't move inode with nlink > 1 to global snaprealm if it's in subvolume
mds: disallow hardlink across subvolume
mds: disallow across subvolume rename
mds: disallow creating snapshot on descendent directory of subvolume
mds: add vxattr that marks/clears subvolume flag

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36756 from smithfarm/wip-47070-nautilus
Yuri Weinstein [Wed, 26 Aug 2020 16:28:05 +0000 (09:28 -0700)]
Merge pull request #36756 from smithfarm/wip-47070-nautilus

nautilus: os/bluestore: dump onode that has too many spanning blobs

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #36741 from yaarith/devicehealth-fix-daemon-filtering-when-scraping
Yuri Weinstein [Wed, 26 Aug 2020 16:26:28 +0000 (09:26 -0700)]
Merge pull request #36741 from yaarith/devicehealth-fix-daemon-filtering-when-scraping

nautilus: mgr/devicehealth: fix daemon filtering before scraping device

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36670 from smithfarm/wip-46981-nautilus
Yuri Weinstein [Wed, 26 Aug 2020 16:25:01 +0000 (09:25 -0700)]
Merge pull request #36670 from smithfarm/wip-46981-nautilus

nautilus: pybind/mgr/restful: use dict.items() for py3 compatible

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36634 from smithfarm/wip-46952-nautilus
Yuri Weinstein [Wed, 26 Aug 2020 16:15:44 +0000 (09:15 -0700)]
Merge pull request #36634 from smithfarm/wip-46952-nautilus

nautilus: monclient: schedule first tick using mon_client_hunt_interval

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agopybind/mgr/volumes: add global lock debug 36828/head
Patrick Donnelly [Wed, 5 Aug 2020 22:54:33 +0000 (15:54 -0700)]
pybind/mgr/volumes: add global lock debug

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

4 years agoMerge pull request #36790 from rhcs-dashboard/wip-47122-nautilus
Lenz Grimmer [Wed, 26 Aug 2020 08:21:10 +0000 (10:21 +0200)]
Merge pull request #36790 from rhcs-dashboard/wip-47122-nautilus

nautilus: mgr/dashboard: remove "This week/month/year" and "Today" time stamps

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoqa/workunits/fs: add test for subvolume 36804/head
Yan, Zheng [Wed, 5 Aug 2020 15:31:03 +0000 (23:31 +0800)]
qa/workunits/fs: add test for subvolume

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit df7e9aa42b97f3203e92387d2ceea5636f5230ad)

4 years agomds: don't move inode with nlink > 1 to global snaprealm if it's in subvolume
Yan, Zheng [Wed, 5 Aug 2020 09:31:57 +0000 (17:31 +0800)]
mds: don't move inode with nlink > 1 to global snaprealm if it's in subvolume

Fixes: https://tracker.ceph.com/issues/46074
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 63da28d6a8be20183a294744892a41f47e8ba24b)

 Conflicts:
src/mds/Server.cc

4 years agomds: disallow hardlink across subvolume
Yan, Zheng [Wed, 5 Aug 2020 08:04:30 +0000 (16:04 +0800)]
mds: disallow hardlink across subvolume

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 55cc3f7d7d27837bfe64ee46444358c0e45d16f6)

4 years agomds: disallow across subvolume rename
Yan, Zheng [Wed, 5 Aug 2020 07:37:20 +0000 (15:37 +0800)]
mds: disallow across subvolume rename

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 53348ab67f0f3e691cfeb6b02d80b868fdb98d89)

4 years agomds: disallow creating snapshot on descendent directory of subvolume
Yan, Zheng [Wed, 5 Aug 2020 07:33:10 +0000 (15:33 +0800)]
mds: disallow creating snapshot on descendent directory of subvolume

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 34c6b4437a2e8a49bb76e86d07cd86b740e3f581)

4 years agomds: add vxattr that marks/clears subvolume flag
Yan, Zheng [Tue, 4 Aug 2020 13:26:26 +0000 (21:26 +0800)]
mds: add vxattr that marks/clears subvolume flag

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 8d531680cdf48ba43d93becd5a19072844e92c19)

 Conflicts:
src/mds/Server.cc
src/mds/SnapRealm.h
src/mds/snap.h

4 years agoMerge pull request #36725 from dillaman/wip-46946-nautilus
Yuri Weinstein [Wed, 26 Aug 2020 00:11:08 +0000 (17:11 -0700)]
Merge pull request #36725 from dillaman/wip-46946-nautilus

nautilus: rbd: librbd: global and pool-level config overrides require image refresh to apply

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #36712 from smithfarm/wip-47023-nautilus
Yuri Weinstein [Wed, 26 Aug 2020 00:10:30 +0000 (17:10 -0700)]
Merge pull request #36712 from smithfarm/wip-47023-nautilus

nautilus: librbd: Align rbd_write_zeroes declarations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #36413 from shyukri/wip-46321-nautilus
Yuri Weinstein [Wed, 26 Aug 2020 00:07:08 +0000 (17:07 -0700)]
Merge pull request #36413 from shyukri/wip-46321-nautilus

nautilus: osd/OSDCap: rbd profile permits use of "rbd_info"

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>