]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agoqa: wait pgs to be clean before using the pools 42923/head
Xiubo Li [Tue, 27 Jul 2021 01:53:58 +0000 (09:53 +0800)]
qa: wait pgs to be clean before using the pools

Or in some use cases, like the mds-full tests, we will hit the
"PG_AVAILABILITY" warning.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit a448d1c3ee161dc1910ff9fd71a82f7eb0020526)

3 years agoqa: ignore PG_RECOVERY_FULL and PG_DEGRADED for mds-full
Xiubo Li [Mon, 26 Jul 2021 12:19:40 +0000 (20:19 +0800)]
qa: ignore PG_RECOVERY_FULL and PG_DEGRADED for mds-full

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 3456ff26289915b1cdbc534274f269fc603edacd)

3 years agoqa: wait more time since there have many more pgs than before
Xiubo Li [Fri, 28 May 2021 04:58:21 +0000 (12:58 +0800)]
qa: wait more time since there have many more pgs than before

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 999c787ac60beb0d28f09d574242ec64eee06686)

3 years agoqa: do not multiple the full ratio twice
Xiubo Li [Thu, 27 May 2021 02:57:24 +0000 (10:57 +0800)]
qa: do not multiple the full ratio twice

The cluster has already multiple the full ratio before returning
the "max_avail".

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

3 years agoqa: do not raise for kclient for _fsync test
Xiubo Li [Thu, 27 May 2021 08:00:32 +0000 (16:00 +0800)]
qa: do not raise for kclient for _fsync test

For kclient, the write() will return -ENOSPC instead of the fsync().

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

3 years agoqa: use the pg autoscale mode to calcuate the pg_num
Xiubo Li [Mon, 26 Apr 2021 08:24:31 +0000 (16:24 +0800)]
qa: use the pg autoscale mode to calcuate the pg_num

Setting the pg_num to 8 is too small that some osds maybe not covered by the
pools, some osds maybe overloaded. Remove the hardcodeing pg_num here and let
the pg autoscale mode to calculate it as needed, and at the same time set the
pg_num_min to 64 to avoid the pg_num to small.

If ec pool is used, for the test cases most datas will go to the ec pool and
the primary replicated pool will store a small amount of metadata for all the
files only, so set the target size ratio to 0.05 should be enough.

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

Cherry-pick notes:
- Fixed Invalid command: missing required parameter pg_num(<int[0-]>)

3 years agoqa: set the object_size to 1M
Xiubo Li [Tue, 27 Apr 2021 04:03:58 +0000 (12:03 +0800)]
qa: set the object_size to 1M

Set the object_size to 1MB to make the objects destributed more even
among the OSDs.

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

3 years agoqa: move the is_full() to parent class
Xiubo Li [Fri, 23 Apr 2021 03:06:21 +0000 (11:06 +0800)]
qa: move the is_full() to parent class

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit f4288f2a9be842d7f5c68ebc1f04e3ab821397a8)

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 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 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 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>
3 years agoMerge pull request #42135 from dang/wip-dang-41991-backport
Yuri Weinstein [Mon, 16 Aug 2021 15:50:33 +0000 (08:50 -0700)]
Merge pull request #42135 from dang/wip-dang-41991-backport

pacific: RGW - Bucket Remove Op: Pass in user

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #40696 from singuliere/wip-50156-pacific
Yuri Weinstein [Mon, 16 Aug 2021 15:50:00 +0000 (08:50 -0700)]
Merge pull request #40696 from singuliere/wip-50156-pacific

pacific: rgw/notification: fix persistent notification hang when ack-levl=none

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
3 years agoMerge pull request #40695 from singuliere/wip-50157-pacific
Yuri Weinstein [Mon, 16 Aug 2021 15:49:17 +0000 (08:49 -0700)]
Merge pull request #40695 from singuliere/wip-50157-pacific

pacific: rgw/notification: fixing the "persistent=false" flag

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #40693 from singuliere/wip-50214-pacific
Yuri Weinstein [Mon, 16 Aug 2021 15:48:39 +0000 (08:48 -0700)]
Merge pull request #40693 from singuliere/wip-50214-pacific

pacific: rgw: objectlock: improve client error messages

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agomgr/dashboard: run-cephadm-e2e-tests.sh improvements 42789/head
Alfonso Martínez [Wed, 11 Aug 2021 08:25:42 +0000 (10:25 +0200)]
mgr/dashboard: run-cephadm-e2e-tests.sh improvements

- Jenkins env.: make sure the cluster is always started.
- PR template: add trigger phrase to the jenkins commands list.
- Cypress: add --no-install flag; clean previous reports.

Fixes: https://tracker.ceph.com/issues/52082
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit cadf8c75ac0266e42c1ea0b4d6733590ea3dac21)

3 years agomgr/dashboard: cephadm e2e start script: add --expanded option
Alfonso Martínez [Mon, 9 Aug 2021 13:14:21 +0000 (15:14 +0200)]
mgr/dashboard: cephadm e2e start script: add --expanded option

- Additional improvements: clean npm cache in jenkins env.; display mgr logs on error.

Fixes: https://tracker.ceph.com/issues/52082
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 973a6f534383e84bd92b690eaf2862a5a30ba70c)

3 years agomgr/dashboard: tox.ini: delete useless env. 'apidocs' 42788/head
Alfonso Martínez [Wed, 11 Aug 2021 09:14:53 +0000 (11:14 +0200)]
mgr/dashboard: tox.ini: delete useless env. 'apidocs'

Fixes: https://tracker.ceph.com/issues/52130
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit d7346ec1486d7ca24177c3064f457f9722c0c8cb)

3 years agotest/store_test: more testing for deferred writes 42773/head
Igor Fedotov [Mon, 9 Aug 2021 15:18:20 +0000 (18:18 +0300)]
test/store_test: more testing for deferred writes

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 324ea6b425e5898eca6e86264fa4d34cb868a6ae)

3 years agoos/bluestore: enforce one more non-inclusive comparision against prefer_deferred_size
Igor Fedotov [Mon, 9 Aug 2021 16:14:33 +0000 (19:14 +0300)]
os/bluestore: enforce one more non-inclusive comparision against prefer_deferred_size

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit cb30c9965854e7dbfe851ed0cfaf113b16bcab5e)

3 years agoos/bluestore: Better handling of deferred write trigger
Adam Kupczyk [Mon, 9 Aug 2021 13:59:46 +0000 (15:59 +0200)]
os/bluestore: Better handling of deferred write trigger

Now deferred write in _do_alloc_write does not depend on blob size,
but on size of extent allocated on disk.
It is now possible to set bluestore_prefer_deferred_size way larger than
bluestore_max_blob_size and still get desired behavior.
Example: for deferred=256K, blob=64K : when op write is 128K both blobs will be
written as deferred. When op write is 256K then all will go as regular write.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 06ac561a72a93bd24d05b6c2266d66fee49228b8)

3 years agoos/bluestore: account for alignment with max_blob_size when splitting
Igor Fedotov [Mon, 9 Aug 2021 15:18:35 +0000 (18:18 +0300)]
os/bluestore: account for alignment with max_blob_size when splitting
write I/O into chunks.

Without the fix the following write seq:
0~4M
4096~4M

produces tons of deferred writes at the second stage.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit b06bcf99f50cf7db5856eb1f6cd56100a0d0bbbc)

3 years agoos/bluestore: introduce l_bluestore_write_deferred_bytes perf counter.
Igor Fedotov [Fri, 6 Aug 2021 23:22:12 +0000 (02:22 +0300)]
os/bluestore: introduce l_bluestore_write_deferred_bytes perf counter.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f38f18c149b9347a26d845539eaeef29979e9006)

3 years agoos/bluestore: use non-inclusive comparision against prefer_deferred_size
Igor Fedotov [Fri, 6 Aug 2021 18:32:23 +0000 (21:32 +0300)]
os/bluestore: use non-inclusive comparision against prefer_deferred_size

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

3 years agoos/bluestore: improve logging around deferred writes
Igor Fedotov [Fri, 6 Aug 2021 14:50:13 +0000 (17:50 +0300)]
os/bluestore: improve logging around deferred writes

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 89a20d63ec7e255d36363bd8977c3fca1d277877)

3 years agoos/bluestore: fix missing 'l_bluestore_write_deferred' perf counter increment
Igor Fedotov [Fri, 6 Aug 2021 12:23:52 +0000 (15:23 +0300)]
os/bluestore: fix missing 'l_bluestore_write_deferred' perf counter increment

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit dc367c4bbc701b04a5bde562e30ab5b9c1705657)

3 years agoos/bluestore: cosmetic cleanups
Igor Fedotov [Fri, 6 Aug 2021 12:09:40 +0000 (15:09 +0300)]
os/bluestore: cosmetic cleanups

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 080531d6813b868eda562cf27babe18d8a974413)

3 years agoMerge pull request #42679 from callithea/wip-51992-pacific
Ernesto Puerta [Thu, 12 Aug 2021 17:33:21 +0000 (19:33 +0200)]
Merge pull request #42679 from callithea/wip-51992-pacific

pacific: monitoring/grafana/cluster: use per-unit max and limit values

3 years agoMerge pull request #42755 from guits/wip-50896-pacific
Guillaume Abrioux [Thu, 12 Aug 2021 11:35:45 +0000 (13:35 +0200)]
Merge pull request #42755 from guits/wip-50896-pacific

pacific: ceph-volume: Consider /dev/root as mounted

3 years agoceph-volume: work around phantom atari partitions 42753/head
Blaine Gardner [Fri, 23 Jul 2021 18:56:35 +0000 (12:56 -0600)]
ceph-volume: work around phantom atari partitions

See Rook issue https://github.com/rook/rook/issues/7940 for full
information.

Ceph bluestore disks can sometimes appear as though they have "phantom"
Atari (AHDI) partitions created on them when they don't in reality. This
is due to a series of bugs in the Linux kernel when it is built with
Atari support enabled. This behavior does not appear for raw mode OSDs on
partitions, only on disks.

Changing the on-disk format of Bluestore OSDs comes with
backwards-compatibility challenges, and fixing the issue in the Kernel
could be years before users get a fix. Working around the Kernel issue
in ceph-volume is therefore the best place to fix the issue for Ceph.

To work around the issue in Ceph volume, there are two behaviors that need
adjusted:
1. `ceph-volume inventory` should not report that a partition is
   available if the parent device is a BlueStore OSD.
2. `ceph-volume raw list` should report parent disks if the disk is a
   BlueStore OSD and not report the disk's children, BUT it should still
   report children if the parent disk is not a BlueStore OSD.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 9212420bbc88e0caaf0b2302dd1f379f563f7d26)

3 years agoceph-volume: use safer check for bluestore label
Blaine Gardner [Mon, 19 Jul 2021 17:57:09 +0000 (11:57 -0600)]
ceph-volume: use safer check for bluestore label

Using only the exit status of `ceph-bluestore-tool show-label` to
determine if a device is a bluestore OSD could report a false negative
if there is a system error when `ceph-bluestore-tool` opens the device.

A better check is to open the device and read the bluestore device
label (the first 22 bytes of the device) to look for the bluestore
device signature ("bluestore block device"). If ceph-volume fails to
open the device due to a system error, it is safest to assume the device
is BlueStore so that an existing OSD isn't overwritten.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 651b28f2e3cb39dbe9c7038cd677a01523f08821)

3 years agoceph-volume: consider /dev/root mounted 42755/head
David Caro [Fri, 7 May 2021 15:58:23 +0000 (17:58 +0200)]
ceph-volume: consider /dev/root mounted

Fixes: https://tracker.ceph.com/issues/50604
Signed-off-by: David Caro <david@dcaro.es>
(cherry picked from commit c7b959c35ff463cfbffa2abf0f56a1c1a5f594c8)

3 years agoMerge pull request #42493 from dsavineau/wip-51852-pacific
Guillaume Abrioux [Wed, 11 Aug 2021 14:32:13 +0000 (16:32 +0200)]
Merge pull request #42493 from dsavineau/wip-51852-pacific

pacific: ceph-volume: lvm batch: fast_allocations(): avoid ZeroDivisionError

3 years agoMerge pull request #42546 from dsavineau/wip-51958-pacific
Guillaume Abrioux [Wed, 11 Aug 2021 14:29:33 +0000 (16:29 +0200)]
Merge pull request #42546 from dsavineau/wip-51958-pacific

pacific: ceph-volume/tests: retry when destroying osd

3 years agocephadm: fix container name detection 42736/head
Sage Weil [Mon, 9 Aug 2021 18:15:28 +0000 (14:15 -0400)]
cephadm: fix container name detection

'enter' was broken because we weren't correctly identifying the container
name.  Strip the newline from the inspect result so that we can reliably
match against the 'running' state.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit fb5e4b3740241d5c41b348e0fc5f59ebde5ee558)