]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agomgr/dashboard: fix frontend deps' vulnerabilities 44297/head
Alfonso Martínez [Thu, 2 Dec 2021 14:05:23 +0000 (15:05 +0100)]
mgr/dashboard: fix frontend deps' vulnerabilities

- Remove npm-force-resolutions: no resolution needed anymore and this is modifying package-lock.json every time it is run (striping last empty line).
- Add .npmrc: save exact version by default; do not launch audit report when installing.

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/package-lock.json
    - Accept version from master branch.
src/pybind/mgr/dashboard/frontend/package.json
    - Accept version from master branch.

3 years agoMerge pull request #44086 from rhcs-dashboard/wip-53380-pacific
Ernesto Puerta [Mon, 13 Dec 2021 15:40:42 +0000 (16:40 +0100)]
Merge pull request #44086 from rhcs-dashboard/wip-53380-pacific

pacific: mgr/dashboard: upgrade Cypress to the latest stable version

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
3 years agoMerge pull request #44209 from guits/wip-53371-pacific
Guillaume Abrioux [Mon, 13 Dec 2021 08:50:24 +0000 (09:50 +0100)]
Merge pull request #44209 from guits/wip-53371-pacific

pacific: ceph-volume: human_readable_size() refactor

3 years agoMerge pull request #43649 from ideepika/wip-53019-pacific
Deepika Upadhyay [Fri, 10 Dec 2021 11:02:13 +0000 (16:32 +0530)]
Merge pull request #43649 from ideepika/wip-53019-pacific

pacific: test/librbd: harden RemoveFullTry tests

Reviewed-by: Mykola Golub mgolub@suse.com
3 years agoMerge pull request #44199 from ideepika/wip-pwl-backports-december-pacific
Deepika Upadhyay [Fri, 10 Dec 2021 10:44:53 +0000 (16:14 +0530)]
Merge pull request #44199 from ideepika/wip-pwl-backports-december-pacific

pacific: librbd/cache/pwl: misc backports

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Mykola Golub mgolub@suse.com
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
3 years agolibrbd: Read request need exclusive-lock when enable pwl-cache. 44199/head
Jianpeng Ma [Wed, 8 Sep 2021 01:51:19 +0000 (09:51 +0800)]
librbd: Read request need exclusive-lock when enable  pwl-cache.

TestLibRBD.TestFUA descript the following workload:
a)write/read the same image w/ pwl-cache
  write_image = open(image_name);
  read_image  = open(image_name);
b)i/o workload is:
   write(write_image)
      write need EXLock and require EXLOCK

  read(read_image)
     in ExclusiveLock<I>::init(), firstly read need EXLOCK
     so will require EXLOCK. write_image release EXLOCK(will
     flush data to osd and remove cache). read_image init pwl-cache
     and read-io firstly enter pwl-cache and missed and then read
     from osd.

   write(write_image)
     write need EXLOCK and require EXLOCK. This make read_image remove
     empty cache. write_image init cache pool and write data to cache.

   read(read_image)
       In send_set_require_lock(), it set write need EXLOCK.
       So read don't require EXLOCK and dirtyly read from osd.

Because second-read  don't need EXLOCK and make write_image don't
release EXLOCK(flush dirty data to osd and  shutdown pwl-cache).
This make second-read don't read the latest data.

So we should make read also need EXLOCK when enable pwl-cache.

Fixes: https://tracker.ceph.com/issues/51438
Tested-by: Feng Hualong <hualong.feng@intel.com>
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 621facb6e66ce92ca36d566c78bc065a9666639e)

3 years agolibrbd: send FLUSH_SOURCE_INTERNAL when do copy/deep_copy.
Jianpeng Ma [Mon, 1 Nov 2021 00:33:23 +0000 (08:33 +0800)]
librbd: send FLUSH_SOURCE_INTERNAL when do copy/deep_copy.

copy/deep_copy use object_map to judge whether object exist.
If w/ librbdo pwl cache, flush can't flush data to osd which
change objectmap state. So we should send flush w/ FLUSH_SOURCE_INTERNAL
to make data flush to osd.

Fixes:https://tracker.ceph.com/issues/53057
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit a2ae83f8aab18933eae77cf3034b740082a39e4f)

3 years agoqa/suites/rbd: added SSD PWL cache mode to tests
Jason Dillaman [Wed, 10 Mar 2021 16:30:47 +0000 (11:30 -0500)]
qa/suites/rbd: added SSD PWL cache mode to tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e2c9c5cd4146c9a86100ca3aaf407127b1df1310)

3 years agolibrbd/cache/pwl: it should in apply_metadata set discard_granularity for pwl cache.
Jianpeng Ma [Wed, 1 Dec 2021 08:58:25 +0000 (16:58 +0800)]
librbd/cache/pwl: it should in apply_metadata set discard_granularity for pwl cache.

Function apply_meta can overwrite discard_granularity_bytes
based on option.

Fixes:https://tracker.ceph.com/issues/53434

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

3 years agolibrbd/cache/pwl: revert patch 76f4d29d92be3f9f45767cb1ac6cc50.
Jianpeng Ma [Sun, 28 Nov 2021 05:00:14 +0000 (13:00 +0800)]
librbd/cache/pwl: revert patch 76f4d29d92be3f9f45767cb1ac6cc50.

In fact, After BlockGuard to fix flush reorder issue, patch
76f4d29d9 don't need. So revert.

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

3 years agolibrbd/cache/pwl: Using BlockGuard control overlap ops order when flush to osd.
Jianpeng Ma [Mon, 29 Nov 2021 07:16:21 +0000 (15:16 +0800)]
librbd/cache/pwl: Using BlockGuard control overlap ops  order when flush to osd.

In process of tests, we met some inconsistent-data problem. Test case
mainly use write,then discard to detect data consistent.
W/o pwl, write/discard are synchronous ops. After write, data already
located into osd. But w/ pwl, we use asynchronous api to send ops to
osd.
Although we mare sure send order. But send-order don't makre sure
complete order. This mean pwl keep order of write/discard. But it
don't keep the same semantics which use synchronous api. W/ pwl, it make
synchronous to asynchronous. For normal ops, it's not problem. But if
connected-commands w/ overlap, it make data inconsistent.
So we use BlockGuard to solve this issue.

Fixes: https://tracker.ceph.com/issues/49876
Fixes: https://tracker.ceph.com/issues/53108
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 8e8f3ef516e98da011f3086f8e78a2fa261293ed)

3 years agoMerge pull request #43745 from mfoliveira/wip-53101-pacific
Yuri Weinstein [Wed, 8 Dec 2021 16:18:37 +0000 (08:18 -0800)]
Merge pull request #43745 from mfoliveira/wip-53101-pacific

pacific: os/bluestore/AvlAllocator: introduce bluestore_avl_alloc_ff_max_* options

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
3 years agoMerge pull request #44226 from ceph/pacific-m2r
David Galloway [Wed, 8 Dec 2021 14:07:25 +0000 (09:07 -0500)]
Merge pull request #44226 from ceph/pacific-m2r

doc: Use older mistune

3 years ago16.2.7 v16.2.7
Jenkins Build Slave User [Tue, 7 Dec 2021 16:15:49 +0000 (16:15 +0000)]
16.2.7

3 years agoMerge pull request #44201 from sebastian-philipp/qa-suites-orch-cephadm-mgr-nfs-upgra...
Yuri Weinstein [Mon, 6 Dec 2021 20:43:53 +0000 (12:43 -0800)]
Merge pull request #44201 from sebastian-philipp/qa-suites-orch-cephadm-mgr-nfs-upgrade-0-distro-pacific

qa/suites/orch/cephadm: mgr-nfs-upgrade: add missing 0-distro dir

Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #44164 from cfsnyder/wip-52450-pacific
Yuri Weinstein [Mon, 6 Dec 2021 20:42:41 +0000 (12:42 -0800)]
Merge pull request #44164 from cfsnyder/wip-52450-pacific

pacific: rpm, debian: move smartmontools and nvme-cli to ceph-base

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
3 years agoMerge pull request #44154 from neha-ojha/wip-perf-pacific
Yuri Weinstein [Mon, 6 Dec 2021 20:41:29 +0000 (12:41 -0800)]
Merge pull request #44154 from neha-ojha/wip-perf-pacific

pacific: qa: miscellaneous perf suite fixes

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
3 years agodoc: Use older mistune 44226/head
David Galloway [Mon, 6 Dec 2021 15:32:56 +0000 (10:32 -0500)]
doc: Use older mistune

https://github.com/miyakogi/m2r/issues/66

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit ed2ad24a4ba3ad3f8103926bfea2466b9eb61222)

3 years agopacific: follow up on get_first_*() refactor 44209/head
Guillaume Abrioux [Sat, 4 Dec 2021 06:27:42 +0000 (07:27 +0100)]
pacific: follow up on get_first_*() refactor

The backport for the lvm migrate feature in pacific was merged after the
get_first_*() refactor backport.
So we have still some old references to `get_single_lv()`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoceph-volume: human_readable_size() refactor
Guillaume Abrioux [Tue, 16 Nov 2021 19:32:38 +0000 (20:32 +0100)]
ceph-volume: human_readable_size() refactor

This commit refactors the `human_readable_size()` function.

The current implementation has a couple of issues:

in a 'human readable' mindset, I would expect `human_readable_size(1024)` to
return '1.00 KB' instead of '1024.00 KB'.

```
In [1]: from ceph_volume.util.disk import human_readable_size

In [2]: human_readable_size(1024)
Out[2]: '1024.00 B'

In [3]: human_readable_size(1024*1024)
Out[3]: '1024.00 KB'

```

Also, it doesn't support PB unit:

```
In [4]: human_readable_size(1024*1024*1024*1024*1024)
Out[4]: '1024.00 TB'

In [5]: human_readable_size(1024*1024*1024*1024*1024*1024)
---------------------------------------------------------------------------
IndexError                                Traceback (most recent call last)
<ipython-input-31-0859861661dc> in <module>
----> 1 human_readable_size(1024*1024*1024*1024*1024*1024)

~/GIT/ceph/src/ceph-volume/ceph_volume/util/disk.py in human_readable_size(size)
    640     return "{size:.2f} {suffix}".format(
    641         size=size,
--> 642         suffix=suffixes[suffix_index])
    643
    644

IndexError: list index out of range
```

This commit fixes this.

Fixes: https://tracker.ceph.com/issues/48492
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 6940856f233f4d365a119eed90ff88fd918f6916)

3 years agorpm, debian: move smartmontools and nvme-cli to ceph-base 44164/head
Yaarit Hatuka [Wed, 25 Aug 2021 02:12:08 +0000 (02:12 +0000)]
rpm, debian: move smartmontools and nvme-cli to ceph-base

We wish to be able to scrape SMART and NVMe metrics from OSD and MON
nodes. For this we require / recommend smartmontools and nvme-cli
dependencies for both the ceph-osd and ceph-mon packages.  However, the
sudoers file (which is required for invoking `smartctl` by user 'ceph')
was installed only in the ceph-osd package.  Since different packages
cannot own the same file, and because we want to be able to scrape from
every daemon, we move the dependencies and the sudoers installation to
ceph-base. For generalization, we rename:
sudoers.d/ceph-osd-smartctl -> sudoers.d/ceph-smartctl

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

Conflicts:
ceph.spec.in

Cherry-pick notes:
- Conflict in ceph.spec.in because setuptools not required for OSD in pacific

3 years agoqa/suites/orch/cephadm: mgr-nfs-upgrade: add missing 0-distro dir 44200/head 44201/head
Sebastian Wagner [Fri, 3 Dec 2021 10:56:54 +0000 (11:56 +0100)]
qa/suites/orch/cephadm: mgr-nfs-upgrade: add missing 0-distro dir

move qa/suites/orch/cephadm/mgr-nfs-upgrade/0-*

to qa/suites/orch/cephadm/mgr-nfs-upgrade/0-distro/*

Fixes: https://tracker.ceph.com/issues/53365
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoqa/suites/rados/perf/ceph.yaml: remove rgw 44154/head
Neha Ojha [Mon, 9 Aug 2021 14:35:01 +0000 (14:35 +0000)]
qa/suites/rados/perf/ceph.yaml: remove rgw

This is no longer required because we removed cosbench workloads in
fd350fd0150a2d4072f055658c20314a435a19ba. This is also required to prevent
failures like the following or any other changes that break the rgw task:

```
2021-08-06T20:13:25.812 INFO:teuthology.orchestra.run.smithi060.stderr:curl: (7) Failed to connect to smithi060.front.sepia.ceph.com port 80: Connection refused
2021-08-06T20:15:33.813 ERROR:teuthology.contextutil:Saw exception from nested tasks
Traceback (most recent call last):
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_04c2febe7099917d97a71271f17abb5710030132/teuthology/contextutil.py", line 31, in nested
    vars.append(enter())
  File "/usr/lib/python3.6/contextlib.py", line 81, in __enter__
    return next(self.gen)
  File "/home/teuthworker/src/github.com_ceph_ceph-c_3c0f8c8164075af7aac4d1f2805d3f4580709461/qa/tasks/rgw.py", line 191, in start_rgw
    wait_for_radosgw(url, remote)
  File "/home/teuthworker/src/github.com_ceph_ceph-c_3c0f8c8164075af7aac4d1f2805d3f4580709461/qa/tasks/util/rgw.py", line 94, in wait_for_radosgw
    assert exit_status == 0
AssertionError
```

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

3 years agoqa: remove cosbench workloads from perf suites
Neha Ojha [Fri, 21 May 2021 20:17:11 +0000 (20:17 +0000)]
qa: remove cosbench workloads from perf suites

Due to https://tracker.ceph.com/issues/49139

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

3 years agoqa: use ubuntu_latest for perf suites
Neha Ojha [Fri, 21 May 2021 16:15:37 +0000 (16:15 +0000)]
qa: use ubuntu_latest for perf suites

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

3 years agovstart,init-ceph: include build bin/ in $PATH 44086/head
Sage Weil [Fri, 5 Mar 2021 15:54:37 +0000 (10:54 -0500)]
vstart,init-ceph: include build bin/ in $PATH

This allows mgr/cephadm to run radosgw-admin.

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

 Conflicts:
src/init-ceph.in
    - Resolve conflicts.

3 years agomgr/dashboard: upgrade Cypress to the latest stable version
Alfonso Martínez [Wed, 24 Nov 2021 14:36:50 +0000 (15:36 +0100)]
mgr/dashboard: upgrade Cypress to the latest stable version

- Remove unneeded dependency that was causing UI performance issues: zone.js
- Ignore 'ResizeObserver loop limit exceeded' error.
- run-frontend-e2e-tests.sh refactoring: create rgw dashboard user through
  'ceph dashboard set-rgw-credentials' and use it on rgw buckets' tests.

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

Conflicts:
        src/pybind/mgr/dashboard/frontend/package-lock.json
        - Regenerate file to align to pacific.
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
3 years agoMerge pull request #44047 from rhcs-dashboard/wip-53343-pacific
Ernesto Puerta [Wed, 24 Nov 2021 12:56:37 +0000 (13:56 +0100)]
Merge pull request #44047 from rhcs-dashboard/wip-53343-pacific

pacific: mgr/dashboard: rgw daemon list: add realm column

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #44077 from rhcs-dashboard/wip-53377-pacific
Ernesto Puerta [Wed, 24 Nov 2021 12:38:23 +0000 (13:38 +0100)]
Merge pull request #44077 from rhcs-dashboard/wip-53377-pacific

pacific: mgr/dashboard: Predefine labels in create host form

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #44051 from rhcs-dashboard/wip-53364-pacific
Ernesto Puerta [Wed, 24 Nov 2021 12:13:49 +0000 (13:13 +0100)]
Merge pull request #44051 from rhcs-dashboard/wip-53364-pacific

pacific: mgr/dashboard: provisioned values is misleading in RBD image table

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
3 years agoMerge pull request #43811 from liewegas/pr-53134-pacific
Yuri Weinstein [Wed, 24 Nov 2021 01:10:18 +0000 (17:10 -0800)]
Merge pull request #43811 from liewegas/pr-53134-pacific

pacific: backport mgr/nfs bits

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agomgr/dashboard: Predfine labels in create host form 44077/head
Nizamudeen A [Thu, 18 Nov 2021 11:09:30 +0000 (16:39 +0530)]
mgr/dashboard: Predfine labels in create host form

Also retains the previously created labels by user in the form

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

3 years agoMerge pull request #43931 from rhcs-dashboard/wip-52528-pacific
Ernesto Puerta [Tue, 23 Nov 2021 18:37:30 +0000 (19:37 +0100)]
Merge pull request #43931 from rhcs-dashboard/wip-52528-pacific

pacific: mgr/prometheus: offer ability to disable cache

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: p-se <NOT@FOUND>
3 years agoMerge pull request #44057 from rhcs-dashboard/wip-53363-pacific
Ernesto Puerta [Tue, 23 Nov 2021 18:36:07 +0000 (19:36 +0100)]
Merge pull request #44057 from rhcs-dashboard/wip-53363-pacific

pacific: mgr/dashboard: Daemon Events listing using bootstrap class

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43960 from guits/wip-53284-pacific
Guillaume Abrioux [Tue, 23 Nov 2021 16:43:39 +0000 (17:43 +0100)]
Merge pull request #43960 from guits/wip-53284-pacific

pacific: ceph-volume: `get_first_lv()` refactor

3 years agoMerge pull request #44056 from rhcs-dashboard/wip-53366-pacific
Ernesto Puerta [Tue, 23 Nov 2021 15:25:14 +0000 (16:25 +0100)]
Merge pull request #44056 from rhcs-dashboard/wip-53366-pacific

pacific: mgr/dashboard: fix flaky inventory e2e test

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #44053 from rhcs-dashboard/wip-53297-pacific
Ernesto Puerta [Tue, 23 Nov 2021 15:20:49 +0000 (16:20 +0100)]
Merge pull request #44053 from rhcs-dashboard/wip-53297-pacific

pacific: mgr/dashboard: Device health status is not getting listed under hosts section

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agomgr/dashboard: Daemon Events listing using bootstrap class 44057/head
Nizamudeen A [Tue, 16 Nov 2021 14:43:09 +0000 (20:13 +0530)]
mgr/dashboard: Daemon Events listing using bootstrap class

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

3 years agomgr/dashboard: fix flaky inventory e2e test 44056/head
Nizamudeen A [Thu, 18 Nov 2021 07:13:39 +0000 (12:43 +0530)]
mgr/dashboard: fix flaky inventory e2e test

When `inventory.getTableCount('total').should('be.eq', totalDiskCount);`
this line is executed the table was not loaded properly and hence the
getTableCount returns 0 on the first try but on second try it passes
since the table is loaded. But in orch e2es the retries are set to 0. I
am not sure if it makes sense to set it to 1. Anyway I am adapting the
test a bit to expect the count to be equal to totalDiskCount so that the
test will wait a bit.

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

3 years agomgr/dashboard: Device health status is not getting listed under hosts section 44053/head
Aashish Sharma [Wed, 10 Nov 2021 08:27:47 +0000 (13:57 +0530)]
mgr/dashboard: Device health status is not getting listed under hosts section

Device health is shown as failed to retrieve data under Hosts > Device Health section. This PR intends to fix this issue.

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

3 years agoMerge pull request #43972 from gregsfortytwo/wip-53259-pacific
Gregory Farnum [Mon, 22 Nov 2021 20:47:48 +0000 (15:47 -0500)]
Merge pull request #43972 from gregsfortytwo/wip-53259-pacific

pacific: mon: MonMap: display disallowed_leaders whenever they're set

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #43971 from gregsfortytwo/wip-53239-pacific
Gregory Farnum [Mon, 22 Nov 2021 20:47:29 +0000 (15:47 -0500)]
Merge pull request #43971 from gregsfortytwo/wip-53239-pacific

pacific: mon: MonMap: do not increase mon_info_t's compatv in stretch mode, really

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agomgr/dashboard: provisioned values is misleading in RBD image table 44051/head
Avan Thakkar [Tue, 9 Nov 2021 21:37:33 +0000 (03:07 +0530)]
mgr/dashboard: provisioned values is misleading in RBD image table

Fixes: https://tracker.ceph.com/issues/46617
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Adding hint in image table similar to the one in rbd-details.

(cherry picked from commit 4ee2f2a9b79e246dfa56ad371b0718f0171eee3e)

3 years agoMerge pull request #44032 from kamoltat/wip-ksirivad-backport-43999
Yuri Weinstein [Mon, 22 Nov 2021 20:10:05 +0000 (12:10 -0800)]
Merge pull request #44032 from kamoltat/wip-ksirivad-backport-43999

pacific: pybind/mgr/pg_autoscale: revert to default profile scale-up

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge PR #43925 into pacific
Patrick Donnelly [Mon, 22 Nov 2021 17:36:15 +0000 (12:36 -0500)]
Merge PR #43925 into pacific

* refs/pull/43925/head:
doc: document subvolume (group) pins

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
3 years agomgr/dashboard: rgw daemon list: add realm column 44047/head
Alfonso Martínez [Wed, 17 Nov 2021 08:29:38 +0000 (09:29 +0100)]
mgr/dashboard: rgw daemon list: add realm column

- Some refactoring and cleanup.

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

3 years agoMerge pull request #43784 from lxbsz/wip-531121
Yuri Weinstein [Mon, 22 Nov 2021 14:58:40 +0000 (06:58 -0800)]
Merge pull request #43784 from lxbsz/wip-531121

Pacific: mds: add read/write io size metrics support

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #43315 from idryomov/wip-rbd-mirror-snapshot-rx-only-pacific
Yuri Weinstein [Sat, 20 Nov 2021 20:24:19 +0000 (12:24 -0800)]
Merge pull request #43315 from idryomov/wip-rbd-mirror-snapshot-rx-only-pacific

pacific: rbd-mirror: unbreak one-way snapshot-based mirroring

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
3 years agoMerge pull request #44034 from batrick/i53347
Yuri Weinstein [Sat, 20 Nov 2021 16:05:37 +0000 (08:05 -0800)]
Merge pull request #44034 from batrick/i53347

pacific: qa: disable metrics on kernel client during upgrade

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoqa: disable metrics on kernel client during upgrade 44034/head
Patrick Donnelly [Tue, 16 Nov 2021 20:04:59 +0000 (15:04 -0500)]
qa: disable metrics on kernel client during upgrade

v16.2.4 MDS triggers an assert from these messages.

Also: add latest pacific for extra coverage.

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

Backport note: dropped pacific.yaml which would result in no upgrade.

3 years agoPendingReleaseNotes: update release notes 44032/head
Kamoltat [Fri, 19 Nov 2021 23:10:30 +0000 (23:10 +0000)]
PendingReleaseNotes: update release notes

Update the pending release notes explaining
why we are making the autoscaler profile
`scale-up` by default.

Signed-off-by: Kamoltat <ksirivad@redhat.com>
3 years agoMerge pull request #43922 from aclamk/wip-aclamk-fix-omap-upgrade-fix-pac
Yuri Weinstein [Fri, 19 Nov 2021 23:36:00 +0000 (15:36 -0800)]
Merge pull request #43922 from aclamk/wip-aclamk-fix-omap-upgrade-fix-pac

Pacific: BlueStore: Omap upgrade to per-pg fix fix

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
3 years agopybind/mgr/pg_autoscale: revert to default profile scale-up
Kamoltat [Wed, 17 Nov 2021 20:34:48 +0000 (20:34 +0000)]
pybind/mgr/pg_autoscale: revert to default profile scale-up

pg_autoscale module will now start out all the pools
with a scale-up profile by default.

Added tests in workunits/mon/pg_autoscaler.sh
to evaluate if the default pool creation is
a scale-up profile

Updated documentation and release notes to
reflect the change in the default behavior
of the pg_autoscale profile.

Fixes: https://tracker.ceph.com/issues/53309
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit a9f9f7b3fd813d429c4a539edf560d3fb6eb553b)

Conflicts:
src/pybind/mgr/pg_autoscaler/module.py - trivial fix

3 years agoos/bluestore: Fix omap upgrade to per-pg scheme 43922/head
Adam Kupczyk [Sat, 13 Nov 2021 10:28:18 +0000 (11:28 +0100)]
os/bluestore: Fix omap upgrade to per-pg scheme

This is fix to regression introduced by fix to omap upgrade: https://github.com/ceph/ceph/pull/43687
The problem was that we always skipped first omap entry.
This worked fine with objects having omap header key.
For objects without header key we skipped first actual omap key.

Fixes: https://tracker.ceph.com/issues/53307
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 65a3f374aa1c57c5bb9401e57dab98a643b4360a)

3 years agoos/bluestore: Add more legacy -> per PG upgrade tests
Adam Kupczyk [Sat, 13 Nov 2021 09:41:14 +0000 (10:41 +0100)]
os/bluestore: Add more legacy -> per PG upgrade tests

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

 Conflicts:
src/test/objectstore/store_test.cc

3 years agoMerge pull request #43930 from rhcs-dashboard/wip-53092-pacific
Ernesto Puerta [Fri, 19 Nov 2021 19:18:24 +0000 (20:18 +0100)]
Merge pull request #43930 from rhcs-dashboard/wip-53092-pacific

pacific: mgr/dashboard: all pyfakefs must be pinned on same version

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: ljflores <NOT@FOUND>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: rishabh-d-dave <NOT@FOUND>
3 years agoMerge pull request #43973 from rhcs-dashboard/wip-53253-pacific
Ernesto Puerta [Fri, 19 Nov 2021 19:17:18 +0000 (20:17 +0100)]
Merge pull request #43973 from rhcs-dashboard/wip-53253-pacific

pacific: mgr/dashboard: Spelling mistake in host-form Network address field

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43893 from rhcs-dashboard/wip-53221-pacific
Ernesto Puerta [Fri, 19 Nov 2021 19:16:55 +0000 (20:16 +0100)]
Merge pull request #43893 from rhcs-dashboard/wip-53221-pacific

pacific: mgr/dashboard: include mfa_ids in rgw user-details section

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43970 from ifed01/wip-ifed-fix-vol-select
Yuri Weinstein [Fri, 19 Nov 2021 18:57:46 +0000 (10:57 -0800)]
Merge pull request #43970 from ifed01/wip-ifed-fix-vol-select

pacific: os/bluestore: do not select absent device in volume selector

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agoMerge pull request #43939 from rhcs-dashboard/wip-53270-pacific
Ernesto Puerta [Fri, 19 Nov 2021 18:33:25 +0000 (19:33 +0100)]
Merge pull request #43939 from rhcs-dashboard/wip-53270-pacific

pacific: mgr/dashboard: Edit a service feature

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43975 from ivancich/wip-53291-pacific
J. Eric Ivancich [Fri, 19 Nov 2021 15:47:21 +0000 (10:47 -0500)]
Merge pull request #43975 from ivancich/wip-53291-pacific

pacific: rgw: remove prefix & delim params for bucket removal & mp upload abort

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #43805 from sunnyku/wip-53028-pacific
Yuri Weinstein [Fri, 19 Nov 2021 14:33:14 +0000 (06:33 -0800)]
Merge pull request #43805 from sunnyku/wip-53028-pacific

pacific: librbd/object_map: rbd diff between two snapshots lists entire image content

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
3 years agoMerge pull request #43924 from vshankar/wip-53217
Yuri Weinstein [Fri, 19 Nov 2021 14:16:53 +0000 (06:16 -0800)]
Merge pull request #43924 from vshankar/wip-53217

pacific: cephfs-mirror, test: add thrasher for cephfs mirror daemon, HA test yamls

Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agoMerge pull request #43815 from lxbsz/wip-53164
Yuri Weinstein [Fri, 19 Nov 2021 14:13:59 +0000 (06:13 -0800)]
Merge pull request #43815 from lxbsz/wip-53164

pacific: mds: do not trim stray dentries during opening the root

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #43782 from lxbsz/wip-53120
Yuri Weinstein [Thu, 18 Nov 2021 15:22:40 +0000 (07:22 -0800)]
Merge pull request #43782 from lxbsz/wip-53120

Pacific: client: do not defer releasing caps when revoking

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #43702 from cfsnyder/wip-52678-pacific
Yuri Weinstein [Thu, 18 Nov 2021 15:21:42 +0000 (07:21 -0800)]
Merge pull request #43702 from cfsnyder/wip-52678-pacific

pacific: qa: lengthen grace for fs map showing dead MDS

Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agoMerge pull request #43434 from callithea/wip-52412-pacific
Yuri Weinstein [Thu, 18 Nov 2021 15:20:39 +0000 (07:20 -0800)]
Merge pull request #43434 from callithea/wip-52412-pacific

pacific: snap-schedule: count retained snapshots per retention policy

Reviewed-by: Kotresh HR khiremat@redhat.com
Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #43906 from sebastian-philipp/pacific-backport-43376-43602-43654...
Sebastian Wagner [Thu, 18 Nov 2021 10:01:38 +0000 (11:01 +0100)]
Merge pull request #43906 from sebastian-philipp/pacific-backport-43376-43602-43654-43734-42838-43454-43628-43762-43790-43737-

pacific: cephadm: November batch

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #43948 from guits/wip-53278-pacific
Guillaume Abrioux [Thu, 18 Nov 2021 08:48:56 +0000 (09:48 +0100)]
Merge pull request #43948 from guits/wip-53278-pacific

pacific: ceph-volume: fix bug with miscalculation of required db/wal slot size for VGs with multiple PVs

3 years agoMerge pull request #43949 from guits/wip-53188-pacific
Guillaume Abrioux [Thu, 18 Nov 2021 08:34:54 +0000 (09:34 +0100)]
Merge pull request #43949 from guits/wip-53188-pacific

pacific: ceph-volume: fix a typo causing AttributeError

3 years agorgw: remove prefix & delim params for bucket removal & mp upload abort 43975/head
J. Eric Ivancich [Tue, 16 Nov 2021 23:06:58 +0000 (18:06 -0500)]
rgw: remove prefix & delim params for bucket removal & mp upload abort

The calls to remove a bucket had parameters to specify a prefix and
delimiter, which does not make sense. This was precipitated due to some
existing Swift protocol logic, but buckets are removed irrespective of
prefix and delimiter. So the functions and calls are adjusted to
remove those parameters. Additionally, those same parameters were
removed for aborting incomplete multipart uploads.

Additionally a bug is fixed in which during bucket removal, multipart
uploads were only removed if the prefix was non-empty.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry-picked from 5156e4e7ce307f8ac6ee6dc36f7e546c93d17d55)

Conflicts:
        src/rgw/rgw_sal_rados.cc
        src/rgw/rgw_sal.h
        src/rgw/rgw_sal_rados.h
  - Alterations due to Zipper 7 code refactoring
        src/rgw/rgw_sal_dbstore.cc
        src/rgw/rgw_sal_dbstore.h
  - Did not exist before Zipper 7 code refactoring

3 years agoceph-volume/tests: update setup_mixed_type playbook 43948/head
Guillaume Abrioux [Wed, 27 Oct 2021 06:37:07 +0000 (08:37 +0200)]
ceph-volume/tests: update setup_mixed_type playbook

we need to create a file with a larger size.
see https://github.com/ceph/ceph/pull/43300#issuecomment-951961243

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 8af00e25aa4ab60d0309e31f6c20edd6cd5be1ee)

3 years agoceph-volume: fix bug with miscalculation of required db/wal slot size for VGs with...
Cory Snyder [Fri, 24 Sep 2021 15:56:09 +0000 (11:56 -0400)]
ceph-volume: fix bug with miscalculation of required db/wal slot size for VGs with multiple PVs

Previous logic for calculating db/wal slot sizes made the assumption that there would only be
a single PV backing each db/wal VG. This wasn't the case for OSDs deployed prior to v15.2.8,
since ceph-volume previously deployed multiple SSDs in the same VG. This fix removes the
assumption and does the correct calculation in either case.

Fixes: https://tracker.ceph.com/issues/52730
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit cd6aa1329f70f89338757ba295e279ecfdbc2d07)

3 years agoMerge pull request #43890 from batrick/i53231
Yuri Weinstein [Wed, 17 Nov 2021 16:14:17 +0000 (08:14 -0800)]
Merge pull request #43890 from batrick/i53231

pacific: MDSMonitor: assertion during upgrade to v16.2.5+

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #43841 from vshankar/wip-52952
Yuri Weinstein [Wed, 17 Nov 2021 16:02:27 +0000 (08:02 -0800)]
Merge pull request #43841 from vshankar/wip-52952

pacific: mds: skip journaling blocklisted clients when in `replay` state

Reviewed-by: Venky Shankar vshankar@redhat.com
Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agoMerge pull request #43891 from batrick/i53232
Yuri Weinstein [Wed, 17 Nov 2021 15:59:02 +0000 (07:59 -0800)]
Merge pull request #43891 from batrick/i53232

pacific: MDSMonitor: no active MDS after cluster deployment

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #43828 from batrick/i53006
Yuri Weinstein [Wed, 17 Nov 2021 15:16:13 +0000 (07:16 -0800)]
Merge pull request #43828 from batrick/i53006

pacific: qa: reduce frag split confs for dir_split counter test

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #43941 from sebastian-philipp/backport-43780
Sebastian Wagner [Wed, 17 Nov 2021 14:38:40 +0000 (15:38 +0100)]
Merge pull request #43941 from sebastian-philipp/backport-43780

pacific: doc/radosgw/nfs: add note about NFSv3 deprecation

Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoqa/suites/orch/cephadm/dashboard: Add centos_8.3_container_tools_3.0.yaml 43906/head
Sebastian Wagner [Tue, 16 Nov 2021 14:07:03 +0000 (15:07 +0100)]
qa/suites/orch/cephadm/dashboard: Add centos_8.3_container_tools_3.0.yaml

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoqa/suites/orch/cephadm: add 8.stream + container_tools
Sage Weil [Mon, 8 Nov 2021 17:01:45 +0000 (11:01 -0600)]
qa/suites/orch/cephadm: add 8.stream + container_tools

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

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

3 years agocephadm: Avoid "Could not locate podman: podman not found"
Sebastian Wagner [Wed, 3 Nov 2021 11:12:15 +0000 (12:12 +0100)]
cephadm: Avoid "Could not locate podman: podman not found"

Right now, we're spamming the cephadm.log on docker deployments

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

3 years agocephadm: fix upgrade name already in use
Daniel Pivonka [Fri, 5 Nov 2021 17:54:36 +0000 (13:54 -0400)]
cephadm: fix upgrade name already in use

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit eece84dada04b99ea5debc694e0bb3452bf94093)

3 years agomgr/cephadm: allow osd spec removal
Sage Weil [Fri, 5 Nov 2021 15:39:07 +0000 (11:39 -0400)]
mgr/cephadm: allow osd spec removal

OSD specs/drivegroups are essentially templates for OSD creation but do
not map to the full lifecycle of the OSDs that they create.  When a spec
is removed, remove it immediately.

If no --force is provided, the error lists which OSDs will be left behind.
If --force is passed, the service is removed.

This leaves behind a few oddities:

- When you list services, OSDs that were created by the drivegroup may
  still exist, causing the drivegroup to appear in the list as
  unmanaged services.
- If you create a new drivegroup with the same name, the prior OSDs will
  appear to belong to the new spec instance, regardless of whether the
  spec/drivegroup parameters are the same.

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

3 years agomgr/orchestrator: pass 'force' flag down for remove_service
Sage Weil [Mon, 8 Nov 2021 17:04:27 +0000 (12:04 -0500)]
mgr/orchestrator: pass 'force' flag down for remove_service

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

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

3 years agomgr/cephadm/services/osd: less noisy
Sage Weil [Fri, 5 Nov 2021 18:37:58 +0000 (14:37 -0400)]
mgr/cephadm/services/osd: less noisy

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

3 years agomgr/cephadm/services/osd: do not log ok-to-stop/safe-to-destroy failures
Sage Weil [Fri, 5 Nov 2021 18:37:47 +0000 (14:37 -0400)]
mgr/cephadm/services/osd: do not log ok-to-stop/safe-to-destroy failures

These failures are normal and expected; they should not pollute the log.

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

3 years agomgr/orchestrator: clean up 'orch osd rm status'
Sage Weil [Fri, 5 Nov 2021 18:24:47 +0000 (14:24 -0400)]
mgr/orchestrator: clean up 'orch osd rm status'

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

3 years agomgr/cephadm: Fixed spawning ip addresses list for public network interface.
AndrewSharapov [Fri, 29 Oct 2021 15:10:20 +0000 (18:10 +0300)]
mgr/cephadm: Fixed spawning ip addresses list for public network interface.

Eevery call of find_ip_on_host() actually  duplicates the list of public ip
addresses in self.networks, while it should NOT change it. As the result
value of key mgr/cephadm/host.<hostname> in kv store becomes very large
and may cause crash of ceph mgr.

Signed-off-by: Andrew Sharapov <andrewshar@gmail.com>
(cherry picked from commit b605b786a2ec95606a2c2791cc643dda3fbe24cc)

3 years agodoc/cephadm: purge
Sebastian Wagner [Wed, 3 Nov 2021 13:11:00 +0000 (14:11 +0100)]
doc/cephadm: purge

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

3 years agodoc/cephadm: Calling miscellaneous ceph tools
Sebastian Wagner [Mon, 1 Nov 2021 21:37:55 +0000 (22:37 +0100)]
doc/cephadm: Calling miscellaneous ceph tools

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 4ac06bc9befb476cbc0350a0e1d40a9cf25af198)

3 years agocephadm: exclude zram and cdrom from device list
Paul Cuzner [Fri, 22 Oct 2021 02:29:30 +0000 (15:29 +1300)]
cephadm: exclude zram and cdrom from device list

When compiling eligible block devices, we need to
exclude zram* and cdrom (srX) devices.

Fixes: https://tracker.ceph.com/issues/52905
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3e7d474e1ae6eb8029a6a7d6c3f6322c4908911e)

3 years agomgr/cephadm: unit test for daemon post actions missing in cache
Daniel Pivonka [Tue, 26 Oct 2021 19:39:17 +0000 (15:39 -0400)]
mgr/cephadm: unit test for daemon post actions missing in cache

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit afb7736e677daa3f65890a9dc2d5e46e9b60d71b)

3 years agomgr/cephadm: track daemon deployment post actions by daemon name instead of type
Daniel Pivonka [Thu, 7 Oct 2021 19:52:05 +0000 (15:52 -0400)]
mgr/cephadm: track daemon deployment post actions by daemon name instead of type

in rare cases tracking by type can cause a daemon to be missed when doing post actions if it is not in the cache yet

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit 008b41bfc7a80d215314ece61af9291094e3f274)

3 years agocephadm: fix tracebacks that could occur during apply spec
Daniel Pivonka [Wed, 18 Aug 2021 21:04:05 +0000 (17:04 -0400)]
cephadm: fix tracebacks that could occur during apply spec

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit d546498bc9ab5c44ce9e90d71ee4f69fed2b8429)

3 years agocephadm: --config-json overrides --config or --keyring args
Sage Weil [Fri, 29 Oct 2021 14:49:17 +0000 (09:49 -0500)]
cephadm: --config-json overrides --config or --keyring args

These args aren't normally combined, but if --fsid and --name are
provided, they may be inferred.

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

3 years agomgr/cephadm: unit test for osd preview limit warning
Adam King [Tue, 26 Oct 2021 15:47:50 +0000 (11:47 -0400)]
mgr/cephadm: unit test for osd preview limit warning

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 70c9c3d341f168e491d5aed22c95fade7f0067f4)

3 years agomgr/cephadm: inform users if limit set for data devices is not met
Adam King [Mon, 25 Oct 2021 17:40:19 +0000 (13:40 -0400)]
mgr/cephadm: inform users if limit set for data devices is not met

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 212f88cbbc2b4edb7976a2abff27ed9b45c5ae3b)

3 years agomgr/cephadm: Fix RGW ipv6 frontend configuration
Sebastian Wagner [Wed, 20 Oct 2021 13:41:18 +0000 (15:41 +0200)]
mgr/cephadm: Fix RGW ipv6 frontend configuration

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit f127e0829b3c512a380bedca46b868fc0c0c7f56)

Conflicts:

  src/pybind/mgr/cephadm/tests/test_services.py

  fix tox test: AttributeError: 'HostCache' object has no
  attribute 'update_host_networks' which was introduced in
  78983ad0d0cce422da32dc4876ac186f6d32c3f5 (not yet in pacific)

3 years agomgr/cephadm: set health check warning for apply spec failures and daemon place failur...
Melissa Li [Thu, 5 Aug 2021 18:14:38 +0000 (14:14 -0400)]
mgr/cephadm: set health check warning for apply spec failures and daemon place failures in serve

Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit 1ccdd941c938d6fc3cd8996353495b28545427b1)

Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py

3 years agomgr/dashboard: Spelling mistake in host-form Network address field 43973/head
Avan Thakkar [Wed, 10 Nov 2021 18:00:41 +0000 (23:30 +0530)]
mgr/dashboard: Spelling mistake in host-form Network address field

Fixes: https://tracker.ceph.com/issues/53215
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 14b62820371a2e031937443b2b6fb49c2b8cb30b)