]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agorpm, debian: remove lsb-release 43001/head
Ken Dreyer [Thu, 12 Aug 2021 14:48:18 +0000 (10:48 -0400)]
rpm, debian: remove lsb-release

Nothing requires this any more, so we can remove it from the RPM
and Debian packaging.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit cbc0127f3435a1c62344df377e19577c4931b376)

 Conflicts:
debian/control - trivial ordering

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
3 years agomake-debs.sh: remove lsb_release
Ken Dreyer [Thu, 12 Aug 2021 14:47:42 +0000 (10:47 -0400)]
make-debs.sh: remove lsb_release

The lsb_release utility brings in a lot of other dependencies. Remove
it from the make-debs script.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 92f73a2bb94d7ff645072b98c2b9c7eea8208782)

3 years agotest/docker-test: remove lsb_release
Ken Dreyer [Thu, 12 Aug 2021 14:46:16 +0000 (10:46 -0400)]
test/docker-test: remove lsb_release

The lsb_release utility brings in a lot of other dependencies. Remove
it from the docker-test script.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 24af043ee57419bd28d72ffc85cd1078df9af123)

3 years agoworkunits/rbd: remove lsb_release
Ken Dreyer [Thu, 12 Aug 2021 14:44:48 +0000 (10:44 -0400)]
workunits/rbd: remove lsb_release

The lsb_release utility brings in a lot of other dependencies. Remove
it from the RBD workunit script.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 65f4d6eb3664a4cc6120031679b8368cbc02a4a5)

 Conflicts:
qa/workunits/rbd/qemu-iotests.sh - trivial fix

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
3 years agoworkunits/rgw: remove lsb_release
Ken Dreyer [Thu, 12 Aug 2021 14:43:46 +0000 (10:43 -0400)]
workunits/rgw: remove lsb_release

The lsb_release utility brings in a lot of other dependencies. Remove
it from the RGW workunit Perl scripts.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit db66f6f35735d2aae2170af3520d222cf748ef9b)

3 years agoMerge pull request #42898 from smithfarm/wip-52380-pacific
Yuri Weinstein [Tue, 31 Aug 2021 19:34:04 +0000 (12:34 -0700)]
Merge pull request #42898 from smithfarm/wip-52380-pacific

pacific: cmake: exclude "grafonnet-lib" target from "all"

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
3 years agoMerge pull request #42897 from ifed01/wip-ifed-fix-spurious-read-errors-warn-pac
Yuri Weinstein [Tue, 31 Aug 2021 19:31:07 +0000 (12:31 -0700)]
Merge pull request #42897 from ifed01/wip-ifed-fix-spurious-read-errors-warn-pac

pacific: os/bluestore: respect bluestore_warn_on_spurious_read_errors setting

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42888 from callithea/wip-51951-pacific
Yuri Weinstein [Tue, 31 Aug 2021 19:30:32 +0000 (12:30 -0700)]
Merge pull request #42888 from callithea/wip-51951-pacific

pacific: Don't persist report data

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42969 from idryomov/wip-krbd-escape-match-sysattr-pacific
Ilya Dryomov [Tue, 31 Aug 2021 14:01:29 +0000 (16:01 +0200)]
Merge pull request #42969 from idryomov/wip-krbd-escape-match-sysattr-pacific

pacific: krbd: escape udev_enumerate_add_match_sysattr values

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agokrbd: escape udev_enumerate_add_match_sysattr values 42969/head
Ilya Dryomov [Sat, 28 Aug 2021 09:05:28 +0000 (11:05 +0200)]
krbd: escape udev_enumerate_add_match_sysattr values

libudev uses fnmatch(3) for matching attributes, meaning that shell
glob pattern matching is employed instead of literal string matching.
Escape glob metacharacters to suppress pattern matching.

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

3 years agoMerge pull request #42428 from kamoltat/wip-ksirivad-backport-pacific-42036
Kamoltat Sirivadhna [Fri, 27 Aug 2021 18:56:00 +0000 (14:56 -0400)]
Merge pull request #42428 from kamoltat/wip-ksirivad-backport-pacific-42036

pacific: mgr/pg_autoscaler: Introduce autoscaler scale-down feature
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoPendingReleaseNotes: add autoscaler profile 42428/head
Kamoltat [Thu, 26 Aug 2021 19:50:14 +0000 (19:50 +0000)]
PendingReleaseNotes: add autoscaler profile

Added autoscaler profile release notes for
>=16.2.6

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit ea094f769f554ff7d5e4a17e76130d00044ef4e4)

3 years agodoc/rados/operations/placement-groups: added bias + profile
Kamoltat [Fri, 6 Aug 2021 04:23:29 +0000 (04:23 +0000)]
doc/rados/operations/placement-groups: added bias + profile

Added documentations on the autoscale profile and bias

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 65fec053e003967aa3ffa5008730661baa46c868)

3 years agopybind/mgr/pg_autoscaler: Added PROFILE to autoscale-status
Kamoltat [Fri, 30 Jul 2021 19:29:21 +0000 (19:29 +0000)]
pybind/mgr/pg_autoscaler: Added PROFILE to autoscale-status

autoscaler now shows the PROFILE status of each pool
in `ceph osd pool autoscale-status`

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 4a2912bbad72b00ae9fe0d892f07ca760e5cefb4)

3 years agopybind/mgr/autoscaler: don't scale pools with overlapping roots
Kamoltat [Fri, 25 Jun 2021 22:40:43 +0000 (22:40 +0000)]
pybind/mgr/autoscaler: don't scale pools with overlapping roots

In the previous version of get_subtree_resource_status() in
src/pybind/mgr/pg_autoscaler/module.py we ignore overlapping
pools which in some cases if combined with the new `scale-down`
algorithm in https://github.com/ceph/ceph/pull/38805 can cause
some pools to scale up/down to inapproriate amount of pgs.

Therefore, the PR identifies the overlapping roots and prevent the pools
with such roots from scaling. This only happens with `scale-down` profile
as we see no problem with the default `scale-up` profile.

Removed the variable `pool_root` since it is not used anywhere in
the code, it only gets assigned and reassigned

Also included a unit test test_overlapping_roots.py that tests the function
identify_subtrees_and_overlaps() as well as edited test_cal_final_pg_target.py
to account for pools that contain overlapping roots, therefore, those pools
are expected not to scale.

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 16eb42a1d8cef5cf008b04b27d51e13dbd6ec495)

3 years agopybind/mgr/pg_autoscaler: add typing annotations
Kefu Chai [Mon, 28 Jun 2021 03:32:41 +0000 (11:32 +0800)]
pybind/mgr/pg_autoscaler: add typing annotations

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

Conflicts:
src/mypy.ini - trivial fix

3 years agopybind/mgr/pg_autoscaler: do not index pool_root with pool_name
Kefu Chai [Mon, 28 Jun 2021 05:24:41 +0000 (13:24 +0800)]
pybind/mgr/pg_autoscaler: do not index pool_root with pool_name

pool_root is indexed by pool_id, and we never index it with pool_name.

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

3 years agopybind/mgr/pg_autoscaler: do not create a tuple long_desc
Kefu Chai [Mon, 28 Jun 2021 04:39:12 +0000 (12:39 +0800)]
pybind/mgr/pg_autoscaler: do not create a tuple long_desc

long_desc is supposed to be a str, not a tuple of str.

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

3 years agopybind/mgr/pg_autoscaler: extract CrushSubtreeResourceStatus out
Kefu Chai [Mon, 28 Jun 2021 04:28:17 +0000 (12:28 +0800)]
pybind/mgr/pg_autoscaler: extract CrushSubtreeResourceStatus out

as it also serves as part of interface of get_subtree_resource_status(),
not only its internals. to ease adding the type annotations, this class
is promoted out of the class.

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

3 years agopybind/mgr/pg_autoscaler: define commands using CLICommand
Kefu Chai [Mon, 28 Jun 2021 03:44:05 +0000 (11:44 +0800)]
pybind/mgr/pg_autoscaler: define commands using CLICommand

simpler this way

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

3 years agopybind/mgr/pg_autoscaler: define options using Option
Kefu Chai [Mon, 28 Jun 2021 03:34:09 +0000 (11:34 +0800)]
pybind/mgr/pg_autoscaler: define options using Option

more consistent and less error-prune this way.

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

3 years agopybind/mgr/pg_autoscaler: Added autoscale-profile feature
Kamoltat [Tue, 13 Apr 2021 21:12:40 +0000 (21:12 +0000)]
pybind/mgr/pg_autoscaler: Added autoscale-profile feature

The autoscaler by default will start out each pool with minimal
pgs and `scale-up` the pgs when there is more usage in each pool.

Users can now use the commands:

`osd pool set autoscale-profile scale-down` to make the pools
start out with a full complement of pgs and only `scale-down`
when usage ratio across the pools are not even.

`osd pool set autoscale-profile scale-up` (by default) to make the pools
start out with minimal pgs and `scale-up` the pgs when there
is more usage in each pool.

Edited KVMonitor.cc file to make the `autoscale_profile` variable
persistent.

Edited tests/test_cal_final_pg_target.py so that it takes into account
the new `profile` argument when calling cal_final_pg_target(). Also,
added some new test cases for when profile is `scale-up`

Renamed tests/test_autoscaler.py to a more appropriate name:
tests/test_cal_ratio.py

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 0e49683b538026e4c51a040950da3dbb9c7e92d5)

3 years agomgr/pg_autoscaler: avoid scale-down until there is pressure
Kamoltat [Thu, 7 Jan 2021 15:39:19 +0000 (15:39 +0000)]
mgr/pg_autoscaler: avoid scale-down until there is pressure

The autoscaler will start out with scaling each
pools to have a full complements of pgs from the start
and will only decrease it when pools need more due to
increased usage.

Introduced a unit test that tests only the
function get_final_pg_target_and_ratio() which
deals with the distrubtion of pgs amongst the
pools

Edited workunit script to reflect the change
of how pgs are calculated and distrubted.

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit daeb6f6ac0c8f77ae07147f9d1e2ed18d6d8e4cc)

3 years agoMerge pull request #42914 from vshankar/wip-51544
Yuri Weinstein [Thu, 26 Aug 2021 18:38:48 +0000 (11:38 -0700)]
Merge pull request #42914 from vshankar/wip-51544

pacific: mgr/volumes: use dedicated libcephfs handles for subvolume calls and …

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #42900 from ajarr/wip-51834-pacific
Yuri Weinstein [Thu, 26 Aug 2021 18:38:02 +0000 (11:38 -0700)]
Merge pull request #42900 from ajarr/wip-51834-pacific

pacific: mds: create file system with specific ID

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #42083 from kotreshhr/wip-51411-pacific
Yuri Weinstein [Wed, 25 Aug 2021 19:04:56 +0000 (12:04 -0700)]
Merge pull request #42083 from kotreshhr/wip-51411-pacific

pacific: mgr/mgr_util: switch using unshared cephfs connections whenever possible

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #42908 from cfsnyder/wip-52330-pacific
Yuri Weinstein [Wed, 25 Aug 2021 14:43:53 +0000 (07:43 -0700)]
Merge pull request #42908 from cfsnyder/wip-52330-pacific

pacific: cls/cmpomap: empty values are 0 in U64 comparisons

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agomgr/volumes: use dedicated libcephfs handles for subvolume calls and async jobs 42914/head
Venky Shankar [Fri, 18 Jun 2021 07:13:01 +0000 (03:13 -0400)]
mgr/volumes: use dedicated libcephfs handles for subvolume calls and async jobs

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

3 years agoMerge pull request #42860 from ideepika/wip-52336-pacific
Yuri Weinstein [Tue, 24 Aug 2021 21:54:48 +0000 (14:54 -0700)]
Merge pull request #42860 from ideepika/wip-52336-pacific

pacific: mon/PGMap: remove DIRTY field in ceph df detail when cache tiering is not in use

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42844 from aclamk/resharding-column-options-pacific
Yuri Weinstein [Tue, 24 Aug 2021 21:54:12 +0000 (14:54 -0700)]
Merge pull request #42844 from aclamk/resharding-column-options-pacific

pacific: kv/RocksDBStore: Add handling of block_cache option for resharding

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42615 from neha-ojha/wip-51830-pacific
Yuri Weinstein [Tue, 24 Aug 2021 21:53:25 +0000 (14:53 -0700)]
Merge pull request #42615 from neha-ojha/wip-51830-pacific

pacific: common/options: Set osd_client_message_cap to 256.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #42300 from callithea/wip-51241-pacific
Yuri Weinstein [Tue, 24 Aug 2021 21:52:25 +0000 (14:52 -0700)]
Merge pull request #42300 from callithea/wip-51241-pacific

pacific: debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-roo…

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #42578 from batrick/i51983
Yuri Weinstein [Tue, 24 Aug 2021 21:51:21 +0000 (14:51 -0700)]
Merge pull request #42578 from batrick/i51983

pacific: mon/MDSMonitor: do not pointlessly kill standbys that are incompatible with current CompatSet

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #42096 from varshar16/wip-nfs-backport-june
Yuri Weinstein [Tue, 24 Aug 2021 21:50:20 +0000 (14:50 -0700)]
Merge pull request #42096 from varshar16/wip-nfs-backport-june

pacific: nfs backport June

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #42909 from gregsfortytwo/wip-51290-pacific
Gregory Farnum [Tue, 24 Aug 2021 20:12:23 +0000 (13:12 -0700)]
Merge pull request #42909 from gregsfortytwo/wip-51290-pacific

pacific: mon: Sanely set the default CRUSH rule when creating pools in stretch…

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agomon: Sanely set the default CRUSH rule when creating pools in stretch mode 42909/head
Greg Farnum [Thu, 17 Jun 2021 19:56:20 +0000 (19:56 +0000)]
mon: Sanely set the default CRUSH rule when creating pools in stretch mode

If we get a pool create request while in stretch mode that does not explicitly
specify a crush rule, look at the stretch-mode pools and their rules, and
select the most common one.

Also update set_up_stretch_mode.sh to add a few more rules that let me test
this locally.

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

3 years agocls/cmpomap: empty values are 0 in U64 comparisons 42908/head
Casey Bodley [Tue, 10 Aug 2021 19:40:25 +0000 (15:40 -0400)]
cls/cmpomap: empty values are 0 in U64 comparisons

previously, when trying to use cmpomap interfaces on an omap key with
an empty value, U64 comparisons would fail to decode with -EIO. so
cmp_set_vals() and cmp_rm_keys() are unable to update or remove such
keys

for backward-compatibility with rgw's data sync error repo, where the
keys used to have empty values, enable these comparisons by treating an
empty value as 0

Fixes: https://tracker.ceph.com/issues/52128
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 23339590ca693c6577eb6de3b47103d60ff57a8b)

3 years agomds: create file system with specific ID 42900/head
Ramana Raja [Mon, 28 Jun 2021 23:39:10 +0000 (19:39 -0400)]
mds: create file system with specific ID

File system will need to be recreated when monitor databases are lost
and rebuilt. Some applications (e.g., CSI) expect that the recovered
file system have the same ID as before. Allow creating a file system
with a specific ID to help in such scenarios. This can now be done by
the `fs new` command using the argument 'fscid' and 'force' flag.
Newer file systems will no longer have increasing IDs as a corollary.

Fixes: https://tracker.ceph.com/issues/51340
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit a0a8ba5087f0b82588860cda188dfdb48a964771)

Conflicts:
qa/tasks/cephfs/test_admin.py
        fixed conflicts due tests reorder in master

3 years agocmake: exclude "grafonnet-lib" target from "all" 42898/head
Kefu Chai [Fri, 20 Aug 2021 14:50:40 +0000 (22:50 +0800)]
cmake: exclude "grafonnet-lib" target from "all"

so we don't build this target when running "make", and hence avoid
accessing the internet in a building envronment where the internest
access is not allowed.

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

Conflicts:
monitoring/grafana/dashboards/CMakeLists.txt
- pacific does not have "LOG_DOWNLOAD ON", "LOG_MERGED_STDOUTERR ON", or
  "LOG_OUTPUT_ON_FAILURE ON", but that fact is orthogonal to the substance of
  this backport

3 years agoMerge pull request #42632 from cfsnyder/wip-51471-pacific
Yuri Weinstein [Mon, 23 Aug 2021 15:08:52 +0000 (08:08 -0700)]
Merge pull request #42632 from cfsnyder/wip-51471-pacific

pacific: rgw/sts: correcting the evaluation of session policies

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoos/bluestore: respect bluestore_warn_on_spurious_read_errors setting 42897/head
Igor Fedotov [Tue, 6 Jul 2021 15:28:07 +0000 (18:28 +0300)]
os/bluestore: respect bluestore_warn_on_spurious_read_errors setting

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

3 years agoqa/tasks/mgr/test_insights: Remove test for persistent checks 42888/head
Brad Hubbard [Tue, 20 Jul 2021 02:58:15 +0000 (12:58 +1000)]
qa/tasks/mgr/test_insights: Remove test for persistent checks

This test makes no sense if we are no longer persisting the store.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 32d1cca2d9b606915c590f52d61856ee401fb4fc)

3 years agopybind/mgr/insights: Don't persist report data
Brad Hubbard [Thu, 22 Apr 2021 04:56:37 +0000 (14:56 +1000)]
pybind/mgr/insights: Don't persist report data

Don't store health reports in rocksdb.

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

3 years agomgr/tests: Fix typo in function name
Brad Hubbard [Thu, 22 Apr 2021 04:55:42 +0000 (14:55 +1000)]
mgr/tests: Fix typo in function name

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 11268b332f582d658553774f0a9b9662da6c02ef)

3 years agoMerge pull request #42868 from sebastian-philipp/pacific-backport-42852-42863
Sebastian Wagner [Fri, 20 Aug 2021 16:59:05 +0000 (18:59 +0200)]
Merge pull request #42868 from sebastian-philipp/pacific-backport-42852-42863

pacific: qa/cephadm: centos_8.x_container_tools_3.0.yaml

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
3 years agoMerge pull request #42850 from ceph/wip-81356-pacific
Kefu Chai [Fri, 20 Aug 2021 14:40:40 +0000 (22:40 +0800)]
Merge pull request #42850 from ceph/wip-81356-pacific

pacific: run-make-check.sh: Increase failure output log size

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoqa/distro: Add centos_8.2_container_tools_3.0.yaml 42868/head
Sebastian Wagner [Fri, 20 Aug 2021 08:53:11 +0000 (10:53 +0200)]
qa/distro: Add centos_8.2_container_tools_3.0.yaml

Let's avoid latest kubic stable

Fixes: https://tracker.ceph.com/issues/52279
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit e436483c77adf7f876533c25a11c14d19a2d32a4)

Conflicts:
qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml
qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml

3 years agoqa/cephadm: centos_8.3_container_tools_3.0.yaml
Sebastian Wagner [Thu, 19 Aug 2021 14:30:32 +0000 (16:30 +0200)]
qa/cephadm: centos_8.3_container_tools_3.0.yaml

Let's avoid latest stable

Fixes: https://tracker.ceph.com/issues/52279
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit c6bd968eff96666da7e321fb5787c82dc66ddbb7)

3 years agokv/RocksDBStore: Add handling of block_cache option for resharding 42844/head
Adam Kupczyk [Wed, 14 Jul 2021 21:35:12 +0000 (23:35 +0200)]
kv/RocksDBStore: Add handling of block_cache option for resharding

Synchronized all situations when we initialize DB to include handling of block_cache option.
Lack of it prevented ability to reshard into specification that we have as default.

Conflicts:
src/kv/RocksDBStore.cc
Trivial conflict, related to gist of the change. No logic involved in resolving.

Fixes: https://tracker.ceph.com/issues/52246
Cherry-picked from: 2d6b20f7aaaf0e6

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agodoc/rados/op: ceph/df show DIRTY field N/A 42860/head
Deepika Upadhyay [Wed, 23 Jun 2021 03:57:25 +0000 (09:27 +0530)]
doc/rados/op: ceph/df show DIRTY field N/A

DIRTY field should only be available if cache tiering is in use.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit ba52429897c34a132f2868aad3dc0c79de3db45d)

3 years agotest: update test for when cache tier is not available
Deepika Upadhyay [Wed, 23 Jun 2021 05:14:21 +0000 (10:44 +0530)]
test: update test for when cache tier is not available

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit e80a80c7d932ab60c5b31ad50c7b62d5fb0b37bc)

3 years agomon/PGMap: DIRTY field as N/A in `df detail` when cache tier not in use
Deepika Upadhyay [Wed, 23 Jun 2021 05:12:38 +0000 (10:42 +0530)]
mon/PGMap: DIRTY field as N/A in `df detail` when cache tier not in use

    'ceph df detail' reports a column for DIRTY objects under POOLS even
    though cache tiers not being used.  In replicated or EC pool all objects
    in the pool are reported as logically DIRTY as they have never been
    flushed .
    we display N/A for DIRTY objects if the pool is not a cache tier.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit fafebb1824eb474dbbeb4137c033954d45b508af)

3 years agoMerge pull request #42211 from ideepika/wip-51549-pacific
Yuri Weinstein [Thu, 19 Aug 2021 20:48:13 +0000 (13:48 -0700)]
Merge pull request #42211 from ideepika/wip-51549-pacific

pacific: monitoring/grafana/build/Makefile: revamp for arm64 builds, pushes to docker and quay, jenkins

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
3 years agorun-make-check.sh: Increase failure output log size 42850/head
David Galloway [Wed, 18 Aug 2021 17:30:22 +0000 (13:30 -0400)]
run-make-check.sh: Increase failure output log size

Fixes: https://tracker.ceph.com/issues/43566
Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit e1b55f6878cfe847112959885d2fc44e91f3c44f)

3 years agoMerge pull request #42736 from sebastian-philipp/pacific-backport-41854-42108-42134...
Sebastian Wagner [Wed, 18 Aug 2021 15:23:07 +0000 (17:23 +0200)]
Merge pull request #42736 from sebastian-philipp/pacific-backport-41854-42108-42134-42017-41906-42032-41829-41938-42177-42092-

pacific: cephadm: August batch 1

Reviewed-by: Sage Weil <sage@newdream.net>
3 years agoMerge pull request #42753 from guits/wip-52133-pacific
Guillaume Abrioux [Wed, 18 Aug 2021 14:33:12 +0000 (16:33 +0200)]
Merge pull request #42753 from guits/wip-52133-pacific

pacific: ceph-volume: work around phantom atari partitions

3 years agoMerge pull request #42829 from tchaikov/pacific-pr-42811
Kefu Chai [Wed, 18 Aug 2021 13:43:54 +0000 (21:43 +0800)]
Merge pull request #42829 from tchaikov/pacific-pr-42811

pacific: mgr/dashboard/api: set a UTF-8 locale when running pip

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
3 years agomgr/dashboard/api: set a UTF-8 locale when running pip 42829/head
Kefu Chai [Tue, 17 Aug 2021 07:53:51 +0000 (15:53 +0800)]
mgr/dashboard/api: set a UTF-8 locale when running pip

ansible-core started to include files whose filenames are encoded in
non-ascii characters, so we have to use a more capable encoding for the
locale in order to install this package. otherwise we'd have following
error:

Collecting ansible-core<2.12,>=2.11.3
  Using cached ansible-core-2.11.4.tar.gz (6.8 MB)
ERROR: Exception:

Traceback (most recent call last):
  File "/tmp/tmp.fX76ASIrch/venv/lib/python3.8/site-packages/pip/_internal/cli/base_command.py", line 173, in _main
    status = self.run(options, args)
...
  File "/tmp/tmp.fX76ASIrch/venv/lib/python3.8/site-packages/pip/_internal/utils/unpacking.py", line 226, in untar_file
    with open(path, "wb") as destfp:
UnicodeEncodeError: 'latin-1' codec can't encode characters in position 137-140: ordinal not in range(256)

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

3 years agorgw/sts: correcting the evaluation of session policies 42632/head
Pritha Srivastava [Thu, 27 May 2021 13:36:44 +0000 (19:06 +0530)]
rgw/sts: correcting the evaluation of session policies
passed in with AssumeRoleWithWebIdentity.

Session Policies are used to restrict the permissions
granted by identity-based (Role's permission policy
and resource-policy (bucket policy) in some cases.

Fixes: https://tracker.ceph.com/issues/51019
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit bd611d451aaaba65c6c1b7a91ec4486142c90522)

Conflicts:
src/rgw/rgw_op.cc

Cherry-pick notes:
- conflict due to rgw::sal::RGWObject renaming to rgw::sal::Object after Pacific

3 years agoMerge pull request #42819 from rhcs-dashboard/wip-52293-pacific
Alfonso Martínez [Wed, 18 Aug 2021 08:40:42 +0000 (10:40 +0200)]
Merge pull request #42819 from rhcs-dashboard/wip-52293-pacific

pacific: mgr/dashboard: disable create snapshot with subvolumes

3 years agoMerge pull request #42817 from rhcs-dashboard/wip-52294-pacific
Alfonso Martínez [Wed, 18 Aug 2021 06:32:13 +0000 (08:32 +0200)]
Merge pull request #42817 from rhcs-dashboard/wip-52294-pacific

pacific: mgr/dashboard: Refresh button on the iscsi targets page

3 years agoMerge pull request #42812 from aaSharma14/wip-52135-pacific
Alfonso Martínez [Wed, 18 Aug 2021 06:25:43 +0000 (08:25 +0200)]
Merge pull request #42812 from aaSharma14/wip-52135-pacific

pacific: mgr/dashboard: monitoring: replace Grafana JSON with Grafonnet based code

3 years agoMerge pull request #42702 from joscollin/wip-52084-pacific
Yuri Weinstein [Tue, 17 Aug 2021 15:57:13 +0000 (08:57 -0700)]
Merge pull request #42702 from joscollin/wip-52084-pacific

pacific: pybind/mgr/stats: validate cmdtag

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agomgr/dashboard: disable create snapshot with subvolumes 42819/head
Pere Diaz Bou [Tue, 17 Aug 2021 07:41:58 +0000 (09:41 +0200)]
mgr/dashboard: disable create snapshot with subvolumes

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit b38259b62950ed2b15175935af7de00059926f3f)

3 years agomgr/dashboard: Refresh button on the iscsi targets page 42817/head
Nizamudeen A [Mon, 9 Aug 2021 07:52:51 +0000 (13:22 +0530)]
mgr/dashboard: Refresh button on the iscsi targets page

Added a refresh button on the iscsi targets page. I've noticed that the
auto reload causes some load on the backend. So I disabled the auto
reload and went for the same approach as we have on rgw. A yellow
warning color on refresh btn to let the user know to manually refresh
that whenever needed.

Fixes: https://tracker.ceph.com/issues/52102
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 8f23a587a8ccc686b1e3acbfa587fcab76bee45d)

3 years agomgr/dashboard: fix grafonnet build error 42812/head
Aashish Sharma [Thu, 12 Aug 2021 08:58:23 +0000 (14:28 +0530)]
mgr/dashboard: fix grafonnet build error

This PR tends to fix the issue caused by #42194

Fixes:https://tracker.ceph.com/issues/52238
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 4907c78bb732b613ae223d3a7d1a046da457d1cc)

Conflicts:
ceph.spec.in (added jsonnet package)
monitoring/grafana/dashboards/CMakeLists.txt (added grafana jsons code)
(cherry picked from commit 570160e291b9029c7998d4dd4fee33327da91312)

3 years agoMerge pull request #42788 from rhcs-dashboard/wip-52248-pacific
Alfonso Martínez [Tue, 17 Aug 2021 10:27:01 +0000 (12:27 +0200)]
Merge pull request #42788 from rhcs-dashboard/wip-52248-pacific

pacific: mgr/dashboard: tox.ini: delete useless env. 'apidocs'

3 years agoMerge pull request #42789 from rhcs-dashboard/wip-52250-pacific
Alfonso Martínez [Tue, 17 Aug 2021 10:26:36 +0000 (12:26 +0200)]
Merge pull request #42789 from rhcs-dashboard/wip-52250-pacific

pacific: mgr/dashboard: cephadm e2e start script: add --expanded option

3 years agoMerge pull request #42810 from rhcs-dashboard/wip-52291-pacific
Alfonso Martínez [Tue, 17 Aug 2021 10:02:37 +0000 (12:02 +0200)]
Merge pull request #42810 from rhcs-dashboard/wip-52291-pacific

pacific: mgr/dashboard: fix rename inventory to disks

3 years agomgr/dashboard: monitoring: replace Grafana JSON with Grafonnet based Code
Aashish Sharma [Tue, 6 Jul 2021 11:02:20 +0000 (16:32 +0530)]
mgr/dashboard: monitoring: replace Grafana JSON with Grafonnet based Code

This PR intends to add grafonnet to generate grafana JSON files

Fixes: https://tracker.ceph.com/issues/45184
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit e9bd94515f865b6c8865210b6329c11f3ebe9d23)

Conflicts:
debian/control (added jsonnet package)
run-make-check.sh (switched ON the WITH_GRAFANA bool for make check)

3 years agomgr/dashboard: fix rename inventory to disks 42810/head
Navin Barnwal [Fri, 7 May 2021 07:47:39 +0000 (13:17 +0530)]
mgr/dashboard: fix rename inventory to disks

Fix Inventory breadcrumbs

Fixes: https://tracker.ceph.com/issues/50314
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 23f44e894462e5658f8bcb85899df009fe379379)

3 years agomgr/dashboard: fix rename inventory to disks
Navin Barnwal [Thu, 6 May 2021 17:25:57 +0000 (22:55 +0530)]
mgr/dashboard: fix rename inventory to disks

Fix Orchestrator e2e tests

Fixes: https://tracker.ceph.com/issues/50314
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 15b3665f27d7ceb2de74796a365d4bd19d716ff6)

3 years agomgr/dashboard: fix rename inventory to disks
Navin Barnwal [Wed, 5 May 2021 15:54:36 +0000 (21:24 +0530)]
mgr/dashboard: fix rename inventory to disks
Fix failure check in Host detail component

Fixes: https://tracker.ceph.com/issues/50314
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 356c3c3bbf18a1dbce05d5b7b190df5ef69112e0)

3 years agomgr/dashboard: fix rename inventory to disks
Navin Barnwal [Tue, 4 May 2021 14:29:30 +0000 (19:59 +0530)]
mgr/dashboard: fix rename inventory to disks
Inventory -> Physical Disks changed in total 3 locations

Fixes: https://tracker.ceph.com/issues/50314
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit f2aa58a5faaa8aa47c4245fc557a584a97496e67)

3 years agomgr/dashboard: fix rename inventory to disks
Navin Barnwal [Fri, 30 Apr 2021 09:56:28 +0000 (15:26 +0530)]
mgr/dashboard: fix rename inventory to disks

Fixes: https://tracker.ceph.com/issues/50314
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 6c609ace4998a087f21fa55c576b1f3cf1a0e054)

3 years agomgr/dashboard: fix rename inventory to disks
Navin Barnwal [Fri, 30 Apr 2021 09:21:29 +0000 (14:51 +0530)]
mgr/dashboard: fix rename inventory to disks

Fixes: https://tracker.ceph.com/issues/50314
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit fe0bbdaf6a1da13b76a261f8aebe181fd66bee91)

3 years agoMerge pull request #42659 from cfsnyder/wip-50386-pacific
Yuri Weinstein [Mon, 16 Aug 2021 23:36:46 +0000 (16:36 -0700)]
Merge pull request #42659 from cfsnyder/wip-50386-pacific

pacific: SimpleRADOSStriper: use debug_cephsqlite

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42693 from tchaikov/pacific-pr-41215
Yuri Weinstein [Mon, 16 Aug 2021 23:33:55 +0000 (16:33 -0700)]
Merge pull request #42693 from tchaikov/pacific-pr-41215

pacific: cmake: Replace boost download url

Reviewed-by: Boris Ranto <branto@redhat.com>
3 years agoMerge pull request #42692 from tchaikov/pacific-pr-42681
Yuri Weinstein [Mon, 16 Aug 2021 23:33:21 +0000 (16:33 -0700)]
Merge pull request #42692 from tchaikov/pacific-pr-42681

pacific: cmake: link bundled fmt statically

Reviewed-by: Boris Ranto <branto@redhat.com>
3 years agoMerge pull request #42561 from smithfarm/wip-51969-pacific
Yuri Weinstein [Mon, 16 Aug 2021 23:32:19 +0000 (16:32 -0700)]
Merge pull request #42561 from smithfarm/wip-51969-pacific

pacific: rpm/luarocks: simplify conditional and support Leap 15.3

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
3 years agoMerge pull request #42544 from cybozu/pacific-kv-rocksdbstore-enrich-debug-message
Yuri Weinstein [Mon, 16 Aug 2021 23:30:36 +0000 (16:30 -0700)]
Merge pull request #42544 from cybozu/pacific-kv-rocksdbstore-enrich-debug-message

pacific: kv/RocksDBStore: enrich debug message

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
3 years agoMerge pull request #42542 from smithfarm/wip-51955-pacific
Yuri Weinstein [Mon, 16 Aug 2021 23:29:53 +0000 (16:29 -0700)]
Merge pull request #42542 from smithfarm/wip-51955-pacific

pacific: compression/snappy: use uint32_t to be compatible with 1.1.9

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #42224 from cfsnyder/wip-51568-pacific
Yuri Weinstein [Mon, 16 Aug 2021 23:29:21 +0000 (16:29 -0700)]
Merge pull request #42224 from cfsnyder/wip-51568-pacific

pacific: mon/OSDMonitor: resize oversized Lec::epoch_by_pg, after PG merging, preventing osdmap trimming

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoqa: update mds_pre_upgrade to no longer stop standbys 42578/head
Patrick Donnelly [Tue, 30 Mar 2021 21:55:54 +0000 (14:55 -0700)]
qa: update mds_pre_upgrade to no longer stop standbys

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 2cd3494771b41216ad99a3bf462e2462b30254b6)

3 years agoqa: update mds_pre_upgrade to disable standby-replay
Patrick Donnelly [Tue, 30 Mar 2021 21:53:04 +0000 (14:53 -0700)]
qa: update mds_pre_upgrade to disable standby-replay

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 8e0b9bcad67352a5ad0d91993e8fb26f482a08de)

3 years agoqa: add tests for compat manipulation and upgrade
Patrick Donnelly [Tue, 30 Mar 2021 21:06:28 +0000 (14:06 -0700)]
qa: add tests for compat manipulation and upgrade

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 295971b9c6520389b6780bfa3bddc3606eaba6dd)

Conflicts:
qa/tasks/cephfs/test_admin.py: trivial

3 years agodoc: remove deprecated compat commands
Patrick Donnelly [Wed, 31 Mar 2021 13:45:08 +0000 (06:45 -0700)]
doc: remove deprecated compat commands

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 54b649af9b43b8ff48f39b033cc69f4d4e3b1b30)

3 years agodoc: update MDS upgrade procedure
Patrick Donnelly [Tue, 30 Mar 2021 21:46:45 +0000 (14:46 -0700)]
doc: update MDS upgrade procedure

Now that CompatSet changes to the FSMap no longer cause old MDS to
suicide.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit efb70f2b336b119ca99fe2abb79428ab4d3453a2)

3 years agomon,mds: use per-MDS compat to inform replacement
Patrick Donnelly [Tue, 30 Mar 2021 21:26:08 +0000 (14:26 -0700)]
mon,mds: use per-MDS compat to inform replacement

This diff makes the following changes:

- FSMap::compat is now just a "default compat" of currently unknown
  utility. It is used when constructing a new file system but does
  not really have any effect or current use.

- The `mds compat *` CLI commands are deprecated. They manipulate
  the default compat which has no useful effect.

- Each MDS sends its compat to the mons in its beacon. This is from
  MDSMap::get_compat_set_all() at MDS boot. This CompatSet does not
  change for the duration of the MDS lifetime.

- Mons record each MDS compat in the FSMap to inform standby failover.
  An MDS is only promoted if it is compatible with the file system
  compat.

- Mons upgrade (merge) the file system compat when (a) the number of
  *in* MDS is 1 (effected by max_mds=1) and (b) the mons are promoting a
  standby with a new compat. A file system is never upgraded when there
  is more than 1 rank to prevent two MDS with incompatible compat.

- A suite of `fs compat` commands exist to manipulate the file system
  compat. These exist mostly for testing.

The consequence of these changes is that the upgrade procedure for MDS
can be updated to no longer require turning off all MDS but rank 0
before performing any upgrades. A CompatSet change would cause all MDS
receiving the new MDSMap to suicide due to incompatibility (if so).
Instead, the monitors will no longer assign an incompatible MDS to a
file system and enforce an upgrade procedure if incompatibilities exist.

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

Conflicts:
src/mds/FSMap.h: trivial
src/mon/MDSMonitor.cc: trivial
src/mon/MonCommands.h: work around removed OBSOLETE commands

3 years agomon: do not update inline incompat except via mds
Patrick Donnelly [Tue, 30 Mar 2021 21:07:46 +0000 (14:07 -0700)]
mon: do not update inline incompat except via mds

The MDS_FEATURE_INCOMPAT_INLINE feature indicates that an MDS knows how
to read/write inline data and that the file system may have it. The
separate setting for inline_data protects this file system feature.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 8cdc36c89da224eb8e86ee6ed80cd2eb65354587)

3 years agomds: add MDSMap method for creating null MDSMap
Patrick Donnelly [Wed, 17 Mar 2021 16:55:04 +0000 (09:55 -0700)]
mds: add MDSMap method for creating null MDSMap

It's not necessary to distribute a CompatSet with the null mdsmap. We
only need to communicate that the MDS is not part of any map.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 4a10b6016ff76f80e27574ad2ab40ac5b0266264)

3 years agomds: only update beacon epoch if newer
Patrick Donnelly [Tue, 6 Apr 2021 15:20:54 +0000 (08:20 -0700)]
mds: only update beacon epoch if newer

This is a defensive programming change. We don't want the beacon epoch
to ever go backwards.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0256ae010f61520a67f95fcd3e8522784ea56f8b)

3 years agomds: harden standby_mds lookup
Patrick Donnelly [Tue, 30 Mar 2021 21:13:42 +0000 (14:13 -0700)]
mds: harden standby_mds lookup

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b8ad8a8c821ba57d64aa349a9da7117867b0f401)

3 years agomon/FSCommands: accept generic ostream rather than stringstream
Patrick Donnelly [Tue, 30 Mar 2021 19:40:58 +0000 (12:40 -0700)]
mon/FSCommands: accept generic ostream rather than stringstream

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 31c8edd603e7db84529eacde1771aef01dbde089)

Conflicts:
src/mon/FSCommands.cc: trivial

3 years agoinclude: add less verbose CompatSet dump
Patrick Donnelly [Mon, 5 Apr 2021 14:55:20 +0000 (07:55 -0700)]
include: add less verbose CompatSet dump

For printing in `fs dump`.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 56b36e69fae0fcfb5081ede3934f1d63cde0494a)

3 years agoinclude: add dump operator for Feature
Patrick Donnelly [Tue, 30 Mar 2021 21:10:28 +0000 (14:10 -0700)]
include: add dump operator for Feature

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 5da02036eefe60c89e11f53d4bacb0e41e03e794)

3 years agoinclude: add const qualifier to appropriate CompatSet methods
Patrick Donnelly [Tue, 30 Mar 2021 19:39:36 +0000 (12:39 -0700)]
include: add const qualifier to appropriate CompatSet methods

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d179fa2bc0262854b1e001e0c9db3d2f508bf647)

3 years agomon/MDSMonitor.cc: fix join fscid not applied with pending fsmap at boot
Zhi Zhang [Thu, 4 Feb 2021 03:57:26 +0000 (11:57 +0800)]
mon/MDSMonitor.cc: fix join fscid not applied with pending fsmap at boot

Fixes: https://tracker.ceph.com/issues/49157
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit 4ab87e2eecbdcb4932775e871c3ae2f793880c20)

3 years agoMerge pull request #42536 from batrick/i51940
Yuri Weinstein [Mon, 16 Aug 2021 20:58:44 +0000 (13:58 -0700)]
Merge pull request #42536 from batrick/i51940

pacific: MDSMonitor: monitor crash after upgrade from ceph 15.2.13 to 16.2.4

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42773 from neha-ojha/wip-52244-pacific
Neha Ojha [Mon, 16 Aug 2021 17:26:11 +0000 (10:26 -0700)]
Merge pull request #42773 from neha-ojha/wip-52244-pacific

pacific: os/bluestore: make deferred writes less aggressive for large writes

Reviewed-by: Igor Fedotov <ifedotov@suse.com>