]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agoceph-volume: fix lvm activate arguments 43117/head
Dimitri Savineau [Thu, 26 Aug 2021 21:11:12 +0000 (17:11 -0400)]
ceph-volume: fix lvm activate arguments

When using the `lvm activate` subcommand without any osd ID or osd FSID
then ceph-volume fails.

Currently we can either activate with:
 - both osd ID and osd FSID
 - only the osd FSID (because it's unique)

The remaining scenarios aren't covered and generate a stack trace:
 - only the osd ID
 - no osd ID nor osd FSID

This ends up with an error like:

-->  UnboundLocalError: local variable 'tags' referenced before assignment

Fixes: https://tracker.ceph.com/issues/50665
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit b77ed5f99d3cb14a46bb36bb74e4136c22edf48a)

3 years agoMerge pull request #43092 from guits/wip-52544-octopus
Guillaume Abrioux [Thu, 9 Sep 2021 07:30:32 +0000 (09:30 +0200)]
Merge pull request #43092 from guits/wip-52544-octopus

octopus: ceph-volume: support no_systemd with lvm migrate

3 years agoMerge pull request #43097 from guits/wip-52546-octopus
Guillaume Abrioux [Thu, 9 Sep 2021 07:30:17 +0000 (09:30 +0200)]
Merge pull request #43097 from guits/wip-52546-octopus

octopus: ceph-volume: remove --all ref from deactivate help

3 years agoceph-volume: support no_systemd with lvm migrate 43092/head
Dimitri Savineau [Fri, 3 Sep 2021 16:47:25 +0000 (12:47 -0400)]
ceph-volume: support no_systemd with lvm migrate

The `ceph-volume lvm migrate/new-db/new-wal` commands don't support
running on non systemd systems or within containers.
Like other ceph-volume commands (lvm activate/batch/zap or raw activate)
we also need to be able to use the --no-systemd flag.

Fixes: https://tracker.ceph.com/issues/51854
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 96d84acf5aedc9cf462230fd5fb685f0562a1371)

3 years agoceph-volume: remove --all ref from deactivate help 43097/head
Dimitri Savineau [Fri, 3 Sep 2021 23:06:42 +0000 (19:06 -0400)]
ceph-volume: remove --all ref from deactivate help

Until the `--all` feature is implemented.

This was partially removed in c13901f but not from the help command.

Fixes: https://tracker.ceph.com/issues/50109
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 3a385bc38686e45c734ffaa182a23837aaceaaa2)

3 years agoMerge pull request #43077 from guits/wip-52524-octopus
Guillaume Abrioux [Wed, 8 Sep 2021 15:30:45 +0000 (17:30 +0200)]
Merge pull request #43077 from guits/wip-52524-octopus

octopus: ceph-volume: pvs --noheadings replace pvs --no-heading

3 years agoMerge pull request #43088 from guits/wip-52540-octopus
Guillaume Abrioux [Wed, 8 Sep 2021 15:24:04 +0000 (17:24 +0200)]
Merge pull request #43088 from guits/wip-52540-octopus

octopus: ceph-volume: fix raw list with logical partition

3 years agoMerge pull request #43090 from guits/wip-52543-octopus
Guillaume Abrioux [Wed, 8 Sep 2021 15:21:57 +0000 (17:21 +0200)]
Merge pull request #43090 from guits/wip-52543-octopus

octopus: doc/ceph-volume: add lvm migrate/new-db/new-wal

3 years agoMerge pull request #42978 from idryomov/wip-52063-octopus
Yuri Weinstein [Wed, 8 Sep 2021 15:15:33 +0000 (08:15 -0700)]
Merge pull request #42978 from idryomov/wip-52063-octopus

octopus: rbd-mirror: fix potential async op tracker leak in start_image_replayers

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
3 years agoMerge pull request #42971 from idryomov/wip-51867-octopus
Yuri Weinstein [Wed, 8 Sep 2021 15:14:57 +0000 (08:14 -0700)]
Merge pull request #42971 from idryomov/wip-51867-octopus

octopus: pybind/rbd: fix mirror_image_get_status

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agodoc/ceph-volume: add lvm migrate/new-db/new-wal 43090/head
Dimitri Savineau [Fri, 3 Sep 2021 19:44:39 +0000 (15:44 -0400)]
doc/ceph-volume: add lvm migrate/new-db/new-wal

The inital PR was implementing those new commands only adds the man page
and not the online documentation.

Fixes: https://tracker.ceph.com/issues/51814
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 22de626220e6145fce8e1fd963802170f099f733)

3 years agoceph-volume: test the lsblk command in list.py 43088/head
Guillaume Abrioux [Tue, 7 Sep 2021 13:38:33 +0000 (15:38 +0200)]
ceph-volume: test the lsblk command in list.py

Let's test we use the expected args when we build the `lsblk` command
to list the devices present on the node.

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

3 years agoceph-volume: fix raw list with logical partition
Dimitri Savineau [Fri, 3 Sep 2021 18:24:48 +0000 (14:24 -0400)]
ceph-volume: fix raw list with logical partition

This is a regression introduced by 9212420, when the host is using a
logical partition then lsblk reports that partition as a child from the
physical device.
That logical partition is prefixed by the `└─` character.

This leads the `raw list` subcommand to show the lsblk error on the stderr.

```
$ ceph-volume raw list
{}
 stderr: lsblk: `-/dev/sda1: not a block device
```

The lsblk command output looks like:

```
$ lsblk --paths --output=NAME --noheadings
/dev/sda
└─/dev/sda1
/dev/sdb
/dev/sdc
/dev/sdd
```

Using the `--list` option with lsblk solves the issue.

```
$ lsblk --list --paths --output=NAME --noheadings
/dev/sda
/dev/sda1
/dev/sdb
/dev/sdc
/dev/sdd
```

Fixes: https://tracker.ceph.com/issues/52504
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 7a6486bf4ddb2d789cc16047d8163baa8473e253)

3 years agoceph-volume: pvs --noheadings replace pvs --no-heading 43077/head
FengJiankui [Wed, 1 Sep 2021 09:37:25 +0000 (17:37 +0800)]
ceph-volume: pvs --noheadings replace pvs --no-heading

Fixes: https://tracker.ceph.com/issues/52482
Signed-off-by: FengJiankui <fengjiankui@inspur.com>
(cherry picked from commit 7083c4ffc63274bdd3103e9c5296bc70acbe745f)

3 years agoMerge pull request #42892 from rhcs-dashboard/wip-52377-octopus
Ernesto Puerta [Wed, 1 Sep 2021 10:24:56 +0000 (12:24 +0200)]
Merge pull request #42892 from rhcs-dashboard/wip-52377-octopus

octopus: mgr/dashboard: stats=false not working when listing buckets

Reviewed-by: Aashish Sharma <aasharma@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 #42968 from idryomov/wip-krbd-escape-match-sysattr-octopus
Ilya Dryomov [Tue, 31 Aug 2021 21:39:48 +0000 (23:39 +0200)]
Merge pull request #42968 from idryomov/wip-krbd-escape-match-sysattr-octopus

octopus: 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 42968/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)

Conflicts:
src/test/cli-integration/rbd/unmap.t [ drop --no-progress,
  "rbd snap create" does not show progress in octopus ]

3 years agorbd-mirror: fix potential async op tracker leak in start_image_replayers 42978/head
Mykola Golub [Thu, 5 Aug 2021 07:03:20 +0000 (08:03 +0100)]
rbd-mirror: fix potential async op tracker leak in start_image_replayers

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

3 years agopybind/rbd: explain why "primary" isn't exposed in mirror_image_status_list() 42971/head
Ilya Dryomov [Tue, 27 Jul 2021 16:45:20 +0000 (18:45 +0200)]
pybind/rbd: explain why "primary" isn't exposed in mirror_image_status_list()

"primary" is part of mirror image info (rbd_mirror_image_info_t) and
is exposed in mirror_image_get_status().  mirror_image_status_list(),
even though it is often thought of as an equivalent of repeated calls
to mirror_image_get_status(), doesn't actually fetch the mirror image
info.

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

3 years agopybind/rbd: actually append site_status dict to remote_statuses
Ilya Dryomov [Tue, 27 Jul 2021 15:20:08 +0000 (17:20 +0200)]
pybind/rbd: actually append site_status dict to remote_statuses

Using += operator is wrong -- only site_status keys get appended
(and repeatedly at that in case there is more than one remote site
as the keys are added one by one).

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

3 years agorbd: Fix mirror_image_get_status in rbd python bindings
Will Smith [Fri, 23 Jul 2021 19:18:12 +0000 (15:18 -0400)]
rbd: Fix mirror_image_get_status in rbd python bindings

When retrieving the status of a mirrored image from the Python rbd
library, a TypeError is raised.

*To Reproduce:*

Set up two Ceph clusters for block storage, and configure image
mirroring between their pools.  Create a least one image with mirroring
enabled, then run the following script on either cluster (once the image
exists everywhere):

```python
import rados, rbd

CONF_PATH = "YOUR-CONF-PATH"
POOL_NAME = "YOUR-POOL-NAME"
IMAGE_LABEL = "YOUR-IMAGE-LABEL"

with rados.Rados(conffile=CONF_PATH) as cluster:
  with cluster.open_ioctx(POOL_NAME) as ioctx:
    with rbd.Image(ioctx, IMAGE_LABEL) as image:
      image.mirror_image_get_status()
```

This will result in the following stack trace:

```
Traceback (most recent call last):
  File "repo-bug.py", line 10, in <module>
    image.mirror_image_get_status()
  File "rbd.pyx", line 3363, in rbd.requires_not_closed.wrapper
  File "rbd.pyx", line 5209, in rbd.Image.mirror_image_get_status
TypeError: list indices must be integers or slices, not str
```

Fixes: https://tracker.ceph.com/issues/51867
Signed-off-by: Will Smith <wsmith@linode.com>
(cherry picked from commit 5dfda932b2012bb11a1860d8a81de3208b17f622)

3 years agoMerge pull request #42761 from ceph/wip-yuriw-p2p-octopus
Yuri Weinstein [Mon, 23 Aug 2021 21:13:07 +0000 (14:13 -0700)]
Merge pull request #42761 from ceph/wip-yuriw-p2p-octopus

octopus: qa/tests: advanced version to 15.2.14 to match the latest release

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agomgr/dashboard: stats=false not working when listing buckets 42892/head
Avan Thakkar [Fri, 20 Aug 2021 09:07:17 +0000 (14:37 +0530)]
mgr/dashboard: stats=false not working when listing buckets

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

 Conflicts:
src/pybind/mgr/dashboard/controllers/rgw.py
      - rgw-list endpoint doesn't have daemon_name parameter in octopus, so adopted
changes accordingly.

3 years agoMerge pull request #42849 from ceph/wip-81356-octopus
Kefu Chai [Fri, 20 Aug 2021 14:39:21 +0000 (22:39 +0800)]
Merge pull request #42849 from ceph/wip-81356-octopus

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

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agorun-make-check.sh: Increase failure output log size 42849/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 #42676 from callithea/wip-51635-octopus
Alfonso Martínez [Wed, 18 Aug 2021 15:28:23 +0000 (17:28 +0200)]
Merge pull request #42676 from callithea/wip-51635-octopus

octopus: monitoring: fix Physical Device Latency unit

3 years agoMerge pull request #42752 from guits/wip-52132-octopus
Guillaume Abrioux [Wed, 18 Aug 2021 14:33:52 +0000 (16:33 +0200)]
Merge pull request #42752 from guits/wip-52132-octopus

octopus: ceph-volume: work around phantom atari partitions

3 years agoMerge pull request #42675 from callithea/wip-51993-octopus
Alfonso Martínez [Tue, 17 Aug 2021 13:37:43 +0000 (15:37 +0200)]
Merge pull request #42675 from callithea/wip-51993-octopus

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

3 years agoMerge pull request #42794 from rhcs-dashboard/wip-52249-octopus
Alfonso Martínez [Tue, 17 Aug 2021 10:07:54 +0000 (12:07 +0200)]
Merge pull request #42794 from rhcs-dashboard/wip-52249-octopus

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

3 years agomgr/dashboard: run-cephadm-e2e-tests.sh improvements 42794/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)

 Conflicts:
.github/pull_request_template.md
      - Update jenkins trigger phrases: cephadm e2e; api tests.

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)

 Conflicts:
doc/dev/developer_guide/dash-devel.rst
      - Add changes to HACKING.rst (dash-devel.rst not in octopus)

3 years agoceph-volume: work around phantom atari partitions 42752/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 agoMerge pull request #41115 from k0ste/wip-48649-octopus
Guillaume Abrioux [Thu, 12 Aug 2021 11:10:35 +0000 (13:10 +0200)]
Merge pull request #41115 from k0ste/wip-48649-octopus

octopus: ceph-volume: disable cache for blkid calls

3 years agoqa/tests: advanced version to 15.2.14 to match the latest release 42761/head
Yuri Weinstein [Wed, 11 Aug 2021 17:05:58 +0000 (10:05 -0700)]
qa/tests: advanced version to 15.2.14 to match the latest release

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
3 years agoMerge pull request #42547 from dsavineau/wip-51959-octopus
Dimitri Savineau [Wed, 11 Aug 2021 15:45:14 +0000 (11:45 -0400)]
Merge pull request #42547 from dsavineau/wip-51959-octopus

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

3 years agoMerge pull request #41715 from k0ste/wip-51106-octopus
Guillaume Abrioux [Wed, 11 Aug 2021 15:15:06 +0000 (17:15 +0200)]
Merge pull request #41715 from k0ste/wip-51106-octopus

octopus: ceph-volume: fix batch report and respect ceph.conf config values

3 years agoMerge pull request #42494 from dsavineau/wip-51853-octopus
Guillaume Abrioux [Wed, 11 Aug 2021 14:33:06 +0000 (16:33 +0200)]
Merge pull request #42494 from dsavineau/wip-51853-octopus

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

3 years ago15.2.14 v15.2.14
Jenkins Build Slave User [Thu, 5 Aug 2021 17:11:54 +0000 (17:11 +0000)]
15.2.14

3 years agomonitoring: fix Physical Device Latency unit 42676/head
Seena Fallah [Wed, 7 Jul 2021 12:30:30 +0000 (17:00 +0430)]
monitoring: fix Physical Device Latency unit

Based on the expr it should be seconds

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit feb8f784d23d6fece93a08a156e38b8bf07dde63)

3 years agomonitoring/grafana/cluster: use per-unit max and limit values 42675/head
David Caro [Wed, 16 Jun 2021 08:32:15 +0000 (10:32 +0200)]
monitoring/grafana/cluster: use per-unit max and limit values

The value we get is a perunit, so the limits and the max value should
be over 1, not 100. Note that the value being shown was correct, it
was the gauge that was not showing the correct indicators.

Signed-off-by: David Caro <david@dcaro.es>
(cherry picked from commit c98129803935e720bb068fcf3700812c550f61b4)

3 years agoMerge pull request #42599 from ideepika/wip-fix-symlink
Yuri Weinstein [Wed, 4 Aug 2021 15:08:02 +0000 (08:08 -0700)]
Merge pull request #42599 from ideepika/wip-fix-symlink

octopus: qa/upgrade: drop broken symlink, introduced in octopus only qa

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42618 from neha-ojha/wip-42421-2-octopus
Yuri Weinstein [Wed, 4 Aug 2021 14:18:26 +0000 (07:18 -0700)]
Merge pull request #42618 from neha-ojha/wip-42421-2-octopus

octopus: qa/*/test_envlibrados_for_rocksdb.sh: fix libarchive dependency

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
3 years agoqa/upgrade: drop broken symlink 42599/head
Deepika Upadhyay [Mon, 2 Aug 2021 21:40:23 +0000 (03:10 +0530)]
qa/upgrade: drop broken symlink

octopus-only: this change was introduced in: c2486c7239f2efff1f87a0c6064ccbf792e90bf0
as a linking unintentional typo while creating symlink, the parent
commit was octopus only hence we don't require it in other branches.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoqa/*/test_envlibrados_for_rocksdb.sh: fix libarchive dependency 42618/head
Neha Ojha [Tue, 3 Aug 2021 20:02:48 +0000 (20:02 +0000)]
qa/*/test_envlibrados_for_rocksdb.sh: fix libarchive dependency

Fixes failures like the following with rhel 8.3 in octopus

```
2021-08-03T17:32:19.328 INFO:tasks.workunit.client.0.smithi148.stdout:No match for argument: libarchive-3.3.3
2021-08-03T17:32:19.338 INFO:tasks.workunit.client.0.smithi148.stderr:Error: Unable to find a match: libarchive-3.3.3
2021-08-03T17:32:19.376 DEBUG:teuthology.orchestra.run:got remote process result: 1
2021-08-03T17:32:19.377 INFO:tasks.workunit:Stopping ['rados/test_envlibrados_for_rocksdb.sh'] on client.0...
```

Follow-up to https://github.com/ceph/ceph/pull/42421

Signed-off-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42586 from rhcs-dashboard/wip-51995-octopus
Ernesto Puerta [Tue, 3 Aug 2021 15:56:40 +0000 (17:56 +0200)]
Merge pull request #42586 from rhcs-dashboard/wip-51995-octopus

octopus: mgr/dashboard: cephadm-e2e job script: improvements

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agomgr/dashboard: cephadm-e2e script: improvements 42586/head
Alfonso Martínez [Mon, 2 Aug 2021 12:34:20 +0000 (14:34 +0200)]
mgr/dashboard: cephadm-e2e script: improvements

Improvements and some adaptations related to the jenkins job.

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

    Conflicts:
        doc/dev/developer_guide/dash-devel.rst
        - Put changes in HACKING.rst as this file does not exist in the octopus branch.
        src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
        - Resolve conflict originated by code that is deleted anyway.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
3 years agoMerge pull request #42509 from smithfarm/wip-51837-octopus
Yuri Weinstein [Fri, 30 Jul 2021 16:05:41 +0000 (09:05 -0700)]
Merge pull request #42509 from smithfarm/wip-51837-octopus

octopus: rpm: drop use of $FIRST_ARG in ceph-immutable-object-cache

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #42412 from votdev/wip-51730-octopus
Yuri Weinstein [Fri, 30 Jul 2021 15:31:09 +0000 (08:31 -0700)]
Merge pull request #42412 from votdev/wip-51730-octopus

octopus: mgr/dashboard: Add configurable MOTD or wall notification

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
3 years agoMerge pull request #42484 from MrFreezeex/wip-51841-octopus
Yuri Weinstein [Fri, 30 Jul 2021 14:51:13 +0000 (07:51 -0700)]
Merge pull request #42484 from MrFreezeex/wip-51841-octopus

octopus: osd: log snaptrim message to dout

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge PR #42537 into octopus
Patrick Donnelly [Fri, 30 Jul 2021 02:35:13 +0000 (19:35 -0700)]
Merge PR #42537 into octopus

* refs/pull/42537/head:
mon/MDSMonitor: propose if FSMap struct_v is too old
mon/MDSMonitor: give a proper error message if FSMap struct_v is too old
qa: add tests for fs dump of epoch and trimming
qa: add file system support for dumping epoch
mon/MDSMonitor: return mon_mds_force_trim_to even if equal to current epoch
mon: add debugging for trimming methods
mon: fix debug spacing

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agomon/MDSMonitor: propose if FSMap struct_v is too old 42537/head
Patrick Donnelly [Thu, 15 Jul 2021 01:02:20 +0000 (18:02 -0700)]
mon/MDSMonitor: propose if FSMap struct_v is too old

To flush older versions which may still be an empty MDSMap (for clusters
that have never used CephFS), we need to force a proposal so older
versions of the struct are trimmed.

This is the main fix of this branch. We removed code which processed old
encodings of the MDSMap in the mon store via 60bc524. That broke old
ceph clusters which never used CephFS (see cited ticket below).  This is
because the initial epoch is an empty MDSMap (back in Infernalis/Hammer)
that is never updated. So, the fix here is to just do proposals
periodically until all of the old structs are automatically trimmed by
the mons.

Fixes: 60bc524827bac072658203e56b1fa3dede9641c5
Fixes: https://tracker.ceph.com/issues/51673
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 56c3fc802ee8848ba85da4300adcc2ee8bd95416)

Conflicts:
src/mds/FSMap.cc: adjust for octopus which decodes old MDSMaps
src/mon/MDSMonitor.h: trivial conflicts

3 years agomon/MDSMonitor: give a proper error message if FSMap struct_v is too old
Patrick Donnelly [Thu, 15 Jul 2021 01:00:24 +0000 (18:00 -0700)]
mon/MDSMonitor: give a proper error message if FSMap struct_v is too old

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

3 years agoqa: add tests for fs dump of epoch and trimming
Patrick Donnelly [Wed, 14 Jul 2021 21:00:09 +0000 (14:00 -0700)]
qa: add tests for fs dump of epoch and trimming

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

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

3 years agoqa: add file system support for dumping epoch
Patrick Donnelly [Wed, 14 Jul 2021 20:59:48 +0000 (13:59 -0700)]
qa: add file system support for dumping epoch

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

3 years agomon/MDSMonitor: return mon_mds_force_trim_to even if equal to current epoch
Patrick Donnelly [Wed, 14 Jul 2021 20:31:21 +0000 (13:31 -0700)]
mon/MDSMonitor: return mon_mds_force_trim_to even if equal to current epoch

The PaxosService code already excludes the value returned by
PaxosService::get_trim_to as the upper bound of the range of epochs to
trim. Without this fix, you need to set mon_mds_force_trim_to to one
greater than the epoch you want to trim _and_ force the current epoch to
be one greater than that; the net result being that you can only force
trimming up to 2 epochs behind the current epoch.

This change is helpful for resolving issue 51673, but not strictly
necessary.

Related-to: https://tracker.ceph.com/issues/51673
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d9dc2f11d56fb4341ba5823f8d17459d10f3b2c1)

Conflicts:
src/common/options/mon.yaml.in: drop doc change

3 years agomon: add debugging for trimming methods
Patrick Donnelly [Wed, 14 Jul 2021 19:04:03 +0000 (12:04 -0700)]
mon: add debugging for trimming methods

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

Conflicts:
src/mon/PaxosService.cc: trivial operator change

3 years agomon: fix debug spacing
Patrick Donnelly [Wed, 14 Jul 2021 20:23:47 +0000 (13:23 -0700)]
mon: fix debug spacing

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

Conflicts:
src/mon/PaxosService.cc: add dout msg

3 years agoceph-volume/tests: retry when destroying osd 42547/head
Guillaume Abrioux [Wed, 28 Jul 2021 14:22:09 +0000 (16:22 +0200)]
ceph-volume/tests: retry when destroying osd

Sometimes, it can happen that the osds being destroyed in those tests
are not yet marked as 'down' for some reason. Let's add some retries on
those tasks to avoid CI failures.

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

3 years agoMerge pull request #42374 from ifed01/wip-ifed-bluefs-safer-flush-oct
Yuri Weinstein [Wed, 28 Jul 2021 18:39:44 +0000 (11:39 -0700)]
Merge pull request #42374 from ifed01/wip-ifed-bluefs-safer-flush-oct

octopus: os/bluestore: Remove possibility of replay log and file inconsistency

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #42375 from ifed01/wip-ifed-compact-after-upgrade-oct
Yuri Weinstein [Wed, 28 Jul 2021 18:38:08 +0000 (11:38 -0700)]
Merge pull request #42375 from ifed01/wip-ifed-compact-after-upgrade-oct

octopus: os/bluestore: compact db after bulk omap naming upgrade

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42478 from tchaikov/octopus-50456
Yuri Weinstein [Wed, 28 Jul 2021 14:58:24 +0000 (07:58 -0700)]
Merge pull request #42478 from tchaikov/octopus-50456

octopus: bind on loopback address if no other addresses are available

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agorpm: drop use of $FIRST_ARG in ceph-immutable-object-cache 42509/head
Nathan Cutler [Thu, 22 Jul 2021 20:52:39 +0000 (22:52 +0200)]
rpm: drop use of $FIRST_ARG in ceph-immutable-object-cache

The use of $FIRST_ARG was probably required because the SUSE-specific
%service_* rpm macros were playing tricks on the shell positional parameters.
This is bad practice and error-prone, so let's assume that no macros should do
that anymore and hence it's safe to assume that positional parameters remain
unchanged after any rpm macro call.

Thanks to Franck Bui for providing the original patch
926433f5d45e557c42f050b43798ba29dc495e02 that this patch is modeled after.

NOTE: the use of FIRST_ARG had already been eliminated by
926433f5d45e557c42f050b43798ba29dc495e02 but was re-introduced later by
9466d7098573dafcfede5e9c852374fbbd99f9e7

Fixes: 9466d7098573dafcfede5e9c852374fbbd99f9e7
Fixes: https://tracker.ceph.com/issues/51797
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 1cb84a1160ed4108cae30100682b1e3ee7c7721d)

3 years agoMerge pull request #42377 from ifed01/wip-ifed-migrate-oct
Yuri Weinstein [Tue, 27 Jul 2021 15:19:15 +0000 (08:19 -0700)]
Merge pull request #42377 from ifed01/wip-ifed-migrate-oct

octopus: ceph-volume: implement bluefs volume migration.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
3 years agoMerge pull request #42368 from trociny/wip-51698-octopus
Yuri Weinstein [Tue, 27 Jul 2021 15:16:12 +0000 (08:16 -0700)]
Merge pull request #42368 from trociny/wip-51698-octopus

octopus: rgw: allow to set ssl options and ciphers for beast frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #40383 from singuliere/wip-49745-octopus
Yuri Weinstein [Tue, 27 Jul 2021 15:14:01 +0000 (08:14 -0700)]
Merge pull request #40383 from singuliere/wip-49745-octopus

octopus: rgw: limit rgw_gc_max_objs to RGW_SHARDS_PRIME_1

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #39904 from singuliere/wip-49378-octopus
Yuri Weinstein [Tue, 27 Jul 2021 15:12:01 +0000 (08:12 -0700)]
Merge pull request #39904 from singuliere/wip-49378-octopus

octopus: cmake: build static libs if they are internal ones

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #42440 from smithfarm/wip-51769-octopus
Yuri Weinstein [Tue, 27 Jul 2021 15:07:29 +0000 (08:07 -0700)]
Merge pull request #42440 from smithfarm/wip-51769-octopus

octopus: rpm: three spec file cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoceph-volume: lvm batch: fast_allocations(): avoid ZeroDivisionError 42494/head
Jonas Zeiger [Mon, 5 Jul 2021 12:59:57 +0000 (14:59 +0200)]
ceph-volume: lvm batch: fast_allocations(): avoid ZeroDivisionError

 * Fixes Bug #51526 ( https://tracker.ceph.com/issues/51526 )

Signed-off-by: Jonas Zeiger <jonas.zeiger@talpidae.net>
(cherry picked from commit d83d4f35863309637c178197d8a59e746678afba)

3 years agoMerge pull request #42491 from dsavineau/wip-51850-octopus
Guillaume Abrioux [Mon, 26 Jul 2021 20:03:59 +0000 (22:03 +0200)]
Merge pull request #42491 from dsavineau/wip-51850-octopus

octopus: ceph-volume/tests: update ansible environment variables in tox

3 years agoMerge pull request #41784 from pponnuvel/wip-51139-octopus
Yuri Weinstein [Mon, 26 Jul 2021 19:16:03 +0000 (12:16 -0700)]
Merge pull request #41784 from pponnuvel/wip-51139-octopus

octopus: rgw: Improve error message on email id reuse

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoceph-volume/tests: use ansible_facts 42491/head
Dimitri Savineau [Thu, 22 Jul 2021 13:58:03 +0000 (09:58 -0400)]
ceph-volume/tests: use ansible_facts

Since inject_facts_as_vars is set to false in the ansible.cfg file then we
have to update the references to use ansible_facts[<thing>] instead of
ansible_<thing>.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 842fc2b605a2321a031a240c4aa4348c1be24e14)

3 years agoceph-volume/tests: use pytest rerunfailures
Dimitri Savineau [Wed, 21 Jul 2021 21:07:24 +0000 (17:07 -0400)]
ceph-volume/tests: use pytest rerunfailures

We already install the dependency from ceph-ansible requirements.txt and to
avoid false positive (like after rebooting a node) we can retry failing test.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 95056a24e4fbc19307f5b32724bfdb459a42f7ab)

3 years agoceph-volume/tests: set ANSIBLE_CONFIG env var
Dimitri Savineau [Wed, 21 Jul 2021 20:54:57 +0000 (16:54 -0400)]
ceph-volume/tests: set ANSIBLE_CONFIG env var

Without loading the ansible.cfg file from ceph-ansible project, we don't
have the pipelining enabled which can result in significant performance
improvement.
This removes the ANSIBLE_ACTION_PLUGINS, ANSIBLE_RETRY_FILES_ENABLED and
ANSIBLE_SSH_RETRIES environment variables as it is already included in the
ansible.cfg file.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit b758fdd829e3b4d7b790e6d35a02c97f3962d13e)

3 years agoceph-volume/tests: update ansible ssh_args env var
Dimitri Savineau [Wed, 21 Jul 2021 20:44:57 +0000 (16:44 -0400)]
ceph-volume/tests: update ansible ssh_args env var

The ansible ssh_args parameter is usually defined in the ansible.cfg file.
Currently this variable is overrided in tox to manage the vagrant ssh file
but we lost all default values.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 0ad615bab555d9965aec36d025acb28708b07cf0)

3 years agoosd: log snaptrim message to dout 42484/head
Arthur Outhenin-Chalandre [Fri, 23 Jul 2021 07:27:00 +0000 (09:27 +0200)]
osd: log snaptrim message to dout

This log message is not an error and is done on every tick of the
snaptrim process. Replace the derr logging to dout(10) to not log it
by default.

Fixes: https://tracker.ceph.com/issues/51799
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit e2b2faef11c18df6c2f1f083d32d279e51b63e82)

3 years agocommon/pick_addr: use grading machinery to refactor pick_address() 42478/head
Kefu Chai [Thu, 22 Apr 2021 17:03:54 +0000 (01:03 +0800)]
common/pick_addr: use grading machinery to refactor pick_address()

as picking iface on the same NUMA node is not a hard requirement, the
grading machinery is a nice fit for this purpose.

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

3 years agocommon/pick_address: prefer non-loopback addresses
Kefu Chai [Wed, 21 Apr 2021 11:50:48 +0000 (19:50 +0800)]
common/pick_address: prefer non-loopback addresses

instead of filtering out loopback ifaces, check for loopback addresses,
and prefer non-loopback addresses over loopback addresses.

before this change, iface named "lo" is filtered out by default,
and "lo" is allowed if `ms_bind_exclude_lo_iface` is false.

after this change, iface with address out of 127/8 is prefered.
the iface marked down is not considered.

the option of "ms_bind_exclude_lo_iface" is removed. the tests are
updated accordingly.

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

Conflicts:
src/common/options/global.yaml.in
src/common/pick_address.cc: trivial resolution

3 years agocommon/pick_address: Allow binding on loopback iface
Kefu Chai [Fri, 26 Mar 2021 12:03:09 +0000 (20:03 +0800)]
common/pick_address: Allow binding on loopback iface

in 6147c0917157efd2d35610e759685656a4989abb, "lo" is also skipped when
daemon is trying to find an address to bind. but that change reverts the
fix of 201b59204374ebdab91bb554b986577a97b19c36, to address the problem.

an option named "ms_bind_exclude_lo_iface" is added, it defaults to
"true". but it can be changed to false to allow daemon to bind on "lo".

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

3 years agocommon/pick_address: document find_ip_in_subnet_list()
Kefu Chai [Fri, 26 Mar 2021 07:36:21 +0000 (15:36 +0800)]
common/pick_address: document find_ip_in_subnet_list()

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

3 years agocommon/pick_address: pass string by reference
Kefu Chai [Sat, 27 Mar 2021 02:03:02 +0000 (10:03 +0800)]
common/pick_address: pass string by reference

to silence warnings from clang-tidy.

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

3 years agocommon/pick_addr: refactor pick_address.cc and ipaddr.cc
Kefu Chai [Fri, 26 Mar 2021 10:23:35 +0000 (18:23 +0800)]
common/pick_addr: refactor pick_address.cc and ipaddr.cc

* do not replicate the same logic in IPv4 and IPv6 paths
* use helpers returning bool for filtering the candidate addresses
  for better readability

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

Conflicts:
src/common/ipaddr.cc
src/common/pick_address.cc: trivial resolution

3 years agocommon/pick_address: use scope_guard for freeifaddrs()
Kefu Chai [Fri, 26 Mar 2021 10:34:32 +0000 (18:34 +0800)]
common/pick_address: use scope_guard for freeifaddrs()

for better readability

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

3 years agocommon/pick_address: fail if cannot bind with specified network family
Kefu Chai [Mon, 19 Oct 2020 13:50:45 +0000 (21:50 +0800)]
common/pick_address: fail if cannot bind with specified network family

this change partially reverts 9f75dfbf364f5140b3f291e0a2c6769bc3d8cbac

we should not proceed against user's will if dual stack is specified but
only one network for a network family can be found. the right fix is
have better error message and documentation, not to tolerate the
failure.

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

3 years agopick_address: Warn and continue when you find at least 1 IPv4 or IPv6 address
Matthew Oliver [Mon, 10 Aug 2020 04:46:21 +0000 (04:46 +0000)]
pick_address: Warn and continue when you find at least 1 IPv4 or IPv6 address

Currently if specify a single public or cluster network, yet have both
`ms bind ipv4` and `ms bind ipv6` set daemons crash when they can't find
both IPs from the same network:

    unable to find any IPv4 address in networks '2001:db8:11d::/120' interfaces ''

And rightly so, of course it can't find an IPv4 network in an IPv6
network.
This patch, adds a new helper method, networks_address_family_coverage,
that takes the list of networks and returns a bitmap of address families
supported.
We then check to see if we have enough networks defined and if you don't
it'll warn and then continue.

Also update the network-config-ref to mention having to define both
address family addresses for cluster and or public networks.

As well as a warning about `ms bind ipv4` being enabled by default which
is easy to miss, there by enabling dual stack when you may only be
expect single stack IPv6.

Thee is also a drive by to fix a `note` that wan't being displayed due
to missing RST syntax.

Signed-off-by: Matthew Oliver <moliver@suse.com>
Fixes: https://tracker.ceph.com/issues/46845
Fixes: https://tracker.ceph.com/issues/39711
(cherry picked from commit 9f75dfbf364f5140b3f291e0a2c6769bc3d8cbac)

3 years agoMerge pull request #42373 from ifed01/wip-ifed-fix-missing-shared-blob
Yuri Weinstein [Fri, 23 Jul 2021 22:02:43 +0000 (15:02 -0700)]
Merge pull request #42373 from ifed01/wip-ifed-fix-missing-shared-blob

octopus: os/bluestore: fix erroneous SharedBlob record removal during repair

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #42239 from trociny/wip-51582-octopus
Yuri Weinstein [Fri, 23 Jul 2021 21:58:31 +0000 (14:58 -0700)]
Merge pull request #42239 from trociny/wip-51582-octopus

octopus: osd: move down peers out from peer_purged

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoos/bluestore/bluefs: Add test that detects bluefs inconsistency 42374/head
Adam Kupczyk [Mon, 24 May 2021 12:27:05 +0000 (14:27 +0200)]
os/bluestore/bluefs: Add test that detects bluefs inconsistency

Add test that detects possible scenario that will cause BlueFS to have file
that contains data that has never been written. This is done by tricking
replay log to already accept file metadata (size, allocations), but actual data
stored in these allocations is not yet synced to disk.

Scenario:
1) write to file h1 on SLOW device
2) flush h1 (and trigger h1 mark to be added to bluefs replay log)
3) write to file h2
4) fsync h2 (forces replay log to be written)

The result is:
- bluefs log now has stable state of h1
- SLOW device is not yet flushed (no fdatasync())

Test detects this condition and fails.

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

4 years agoMerge pull request #42421 from neha-ojha/wip-51662-octopus
Yuri Weinstein [Fri, 23 Jul 2021 18:42:22 +0000 (11:42 -0700)]
Merge pull request #42421 from neha-ojha/wip-51662-octopus

octopus: qa/*/test_envlibrados_for_rocksdb.sh: install libarchive-3.3.3

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42420 from neha-ojha/wip-51496-octopus
Yuri Weinstein [Thu, 22 Jul 2021 16:25:09 +0000 (09:25 -0700)]
Merge pull request #42420 from neha-ojha/wip-51496-octopus

octopus: mgr/DaemonServer: skip redundant update of pgp_num_actual

Reviewed-by: Dan van der Ster <daniel.vanderster@cern.ch>
4 years agoMerge pull request #42422 from neha-ojha/wip-51452-octopus
Yuri Weinstein [Wed, 21 Jul 2021 21:32:16 +0000 (14:32 -0700)]
Merge pull request #42422 from neha-ojha/wip-51452-octopus

octopus: qa/suites/rados: add simultaneous scrubs to the thrasher

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agoMerge pull request #42257 from k0ste/wip-51456-octopus
Yuri Weinstein [Wed, 21 Jul 2021 21:29:25 +0000 (14:29 -0700)]
Merge pull request #42257 from k0ste/wip-51456-octopus

octopus: osd/osd_type: use f->dump_unsigned() when appropriate

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41972 from trociny/wip-51314-octopus
Yuri Weinstein [Wed, 21 Jul 2021 21:27:58 +0000 (14:27 -0700)]
Merge pull request #41972 from trociny/wip-51314-octopus

octopus: osd: fix scrub reschedule bug

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #41449 from idryomov/wip-monc-rotating-timeout-octopus
Yuri Weinstein [Wed, 21 Jul 2021 21:26:52 +0000 (14:26 -0700)]
Merge pull request #41449 from idryomov/wip-monc-rotating-timeout-octopus

octopus: mon/MonClient: tolerate a rotating key that is slightly out of date

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40385 from singuliere/wip-49836-octopus
Yuri Weinstein [Wed, 21 Jul 2021 16:52:44 +0000 (09:52 -0700)]
Merge pull request #40385 from singuliere/wip-49836-octopus

octopus: rgw: qa/tasks/barbican.py: fix year2021 problem

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40381 from singuliere/wip-48659-octopus
Yuri Weinstein [Wed, 21 Jul 2021 16:50:52 +0000 (09:50 -0700)]
Merge pull request #40381 from singuliere/wip-48659-octopus

octopus: rgw/amqp/kafka: prevent concurrent shutdowns from happening

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
4 years agorpm: cleanup: drop useless conditional block in %postun base 42440/head
Nathan Cutler [Tue, 29 Sep 2020 13:52:05 +0000 (15:52 +0200)]
rpm: cleanup: drop useless conditional block in %postun base

The "meat" of this conditional was ripped out by
328807f80bb6b5d1aa40631e88d755a194d5d2c2, leaving only an empty shell
behind.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3b53003f011cfbe51d3471ab9b6cdb9a24ecd4f7)

4 years agorpm: cleanup: drop %service_del_postun_without_restart
Nathan Cutler [Tue, 29 Sep 2020 13:46:35 +0000 (15:46 +0200)]
rpm: cleanup: drop %service_del_postun_without_restart

SUSE needs %service_del_postun (with or without restart) *only* if there
is a possibility that the RPM containing the unit file will be upgraded
from a version that packaged SysVinit scripts instead of systemd unit
files. (Which is not the case here.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit f69aa5abfb2279919026144aa51e3c72f593e935)

4 years agorpm: cleanup: drop use of DISABLE_RESTART_ON_UPDATE
Franck Bui [Tue, 29 Sep 2020 12:35:51 +0000 (14:35 +0200)]
rpm: cleanup: drop use of DISABLE_RESTART_ON_UPDATE

This SUSE-specific variable is deprecated and use of
%service_del_postun_without_restart macro should be preferred these
days.

Signed-off-by: Franck Bui <fbui@suse.com>
(cherry picked from commit 7d99e786df9654d896c43339c684519de4a9afa2)

4 years agomgr/dashboard: Add configurable MOTD or wall notification 42412/head
Volker Theile [Mon, 5 Jul 2021 09:49:33 +0000 (11:49 +0200)]
mgr/dashboard: Add configurable MOTD or wall notification

Fixes: https://tracker.ceph.com/issues/51408
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit f7f163e75cf5fb6cd022a8d13c28f5b923e01aed)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
    src/pybind/mgr/dashboard/frontend/src/app/shared/api/motd.service.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
    src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/sanitize-html.pipe.spec.ts
    src/pybind/mgr/dashboard/frontend/src/app/shared/services/motd-notification.service.ts
    src/pybind/mgr/dashboard/frontend/src/app/shared/services/motd-notification.service.spec.ts
src/pybind/mgr/dashboard/module.py
    src/pybind/mgr/dashboard/plugins/motd.py
src/python-common/tox.ini
    src/python-common/ceph/utils.py