]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/cephadm:fix alerts sent to wrong URL 41660/head
Paul Cuzner [Wed, 2 Jun 2021 23:34:19 +0000 (11:34 +1200)]
mgr/cephadm:fix alerts sent to wrong URL

The path_prefix in prometheus.yml was specifying an
endpoint prefix, which was invalid. This resulted in 404
errors when trying to send alerts to alertmanager and
blocked alerts being sent on to the ceph-dashboard API
receiver. This fix remves this prefix.

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

4 years agocephadm: write config files as utf-8
Sage Weil [Tue, 18 May 2021 12:23:36 +0000 (08:23 -0400)]
cephadm: write config files as utf-8

If we don't specify the encoding, python may use something like 'latin-1',
which cannot handle unicode characters.

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

Conflicts:
    src/cephadm/cephadm

4 years agomgr/cephadm: fix issue with missing prometheus alerts
Patrick Seidensal [Tue, 16 Mar 2021 16:01:48 +0000 (17:01 +0100)]
mgr/cephadm: fix issue with missing prometheus alerts

Files passed as configuration to the cephadm binary had not been created
and mapped to the container, if those files weren't included in the
required files section inside cephadm. This prevented optional file
includes in the configuration.

The configuration file for the Prometheus default alerts is not
mandatory and hence wasn't included in the required files section, still it
needs to be added to the container by cephadm.

This change enables optional files to be included in the configuration
for monitoring components, so that those files are created and mapped
within the container.

Note that a `required_files` variable has been removed at one position
in these changes, though it wasn't used to ensure that required files
were included in the configuration at that point anyway. The test which
ensures that all required files are passed is somewhere else.

Fixes: https://tracker.ceph.com/issues/49856
Conflicts:
    src/cephadm/cephadm
    src/cephadm/tests/test_cephadm.py

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 38f9846d13ae2c5f12bde3397d2826b1cf43759b)
(cherry picked from commit aacd8d195c1a202a54a7c12b2d0239d5b3e828b3)

4 years agoMerge pull request #41878 from ideepika/wip-51242-octopus
Deepika Upadhyay [Mon, 28 Jun 2021 18:10:35 +0000 (23:40 +0530)]
Merge pull request #41878 from ideepika/wip-51242-octopus

octopus: debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41922 from ideepika/wip-51269-octopus
Deepika Upadhyay [Mon, 28 Jun 2021 17:49:55 +0000 (23:19 +0530)]
Merge pull request #41922 from ideepika/wip-51269-octopus

octopus: qa/suites/rados/perf: pin to 18.04

4 years agoMerge pull request #41478 from ideepika/wip-remove-bionic
Yuri Weinstein [Mon, 28 Jun 2021 17:40:30 +0000 (10:40 -0700)]
Merge pull request #41478 from ideepika/wip-remove-bionic

octopus: qa/distros: move to latest version on supported distro's

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoqa/tasks/cephadm: include first mgr host when applying mgrs 41478/head
Josh Durgin [Wed, 23 Dec 2020 00:25:48 +0000 (19:25 -0500)]
qa/tasks/cephadm: include first mgr host when applying mgrs

This prevents the first mgr from being shut down due to lack of
appropriate placements.

trivial fix: removed octopus upgrade configs.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit c79fa6d780580f99b62117e54326a4ef4b7adfef)

4 years agoqa/upgrade: replace ubuntu_latest to ubuntu_18.04
Deepika Upadhyay [Wed, 16 Jun 2021 20:42:12 +0000 (02:12 +0530)]
qa/upgrade: replace ubuntu_latest to ubuntu_18.04

since mimic and nautilus does not support focal builds, keep using
ubuntu_18.

octopus only, since master and pacific support focal

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoqa/distros/supported-random-distro$: keep support for bionic
Deepika Upadhyay [Wed, 26 May 2021 14:29:58 +0000 (19:59 +0530)]
qa/distros/supported-random-distro$: keep support for bionic

we still want to keep supporting 18.04 LTS for octopus, don't want to
use it for cephadm, since podman dropped support for bionic.

this is octopus only commit, since it's octopus specific support and we
dropped bionic in master.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #41618 from cfsnyder/wip-50990-octopus
Kefu Chai [Fri, 25 Jun 2021 06:47:59 +0000 (14:47 +0800)]
Merge pull request #41618 from cfsnyder/wip-50990-octopus

octopus: mon/OSDMonitor: drop stale failure_info even if can_mark_down()

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41619 from cfsnyder/wip-50383-octopus
Kefu Chai [Fri, 25 Jun 2021 06:46:52 +0000 (14:46 +0800)]
Merge pull request #41619 from cfsnyder/wip-50383-octopus

octopus: test: bump DecayCounter.steady acceptable error

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41764 from cfsnyder/wip-51093-octopus
Yuri Weinstein [Wed, 23 Jun 2021 18:17:30 +0000 (11:17 -0700)]
Merge pull request #41764 from cfsnyder/wip-51093-octopus

octopus: mgr/DaemonServer.cc: prevent mgr crashes caused by integer underflow that is triggered by large increases to pg_num/pgp_num

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #41586 from cfsnyder/wip-50661-octopus
Yuri Weinstein [Wed, 23 Jun 2021 18:10:56 +0000 (11:10 -0700)]
Merge pull request #41586 from cfsnyder/wip-50661-octopus

octopus: ceph: ignore BrokenPipeError when printing help

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #41658 from neha-ojha/wip-51041-octopus
Yuri Weinstein [Tue, 22 Jun 2021 17:22:34 +0000 (10:22 -0700)]
Merge pull request #41658 from neha-ojha/wip-51041-octopus

octopus:  os/bluestore: fix unexpected ENOSPC in Avl/Hybrid allocators.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #41623 from cfsnyder/wip-50705-octopus
Yuri Weinstein [Tue, 22 Jun 2021 17:21:45 +0000 (10:21 -0700)]
Merge pull request #41623 from cfsnyder/wip-50705-octopus

octopus: osd/PG.cc: handle removal of pgmeta object

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41609 from dvanders/dvanders_40572_octopus
Yuri Weinstein [Tue, 22 Jun 2021 17:20:47 +0000 (10:20 -0700)]
Merge pull request #41609 from dvanders/dvanders_40572_octopus

octopus: osd/PeeringState: fix acting_set_writeable min_size check

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #41602 from p-se/backport-octopus-port-in-use
Yuri Weinstein [Tue, 22 Jun 2021 17:19:24 +0000 (10:19 -0700)]
Merge pull request #41602 from p-se/backport-octopus-port-in-use

octopus: cephadm: fix port_in_use when IPv6 is disabled

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoqa/workunits/cephadm/test_repos: adjust target version
Sage Weil [Sun, 24 Jan 2021 00:56:42 +0000 (18:56 -0600)]
qa/workunits/cephadm/test_repos: adjust target version

15.2.7 is available for 20.04; 15.1.1 is not

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

4 years agorados/cephadm/qa/distros: update to latest distros
Deepika Upadhyay [Wed, 26 May 2021 09:11:55 +0000 (14:41 +0530)]
rados/cephadm/qa/distros: update to latest distros

- removes ubuntu_18.04 support for podman, instead we move to focal.
- use rhel_8.3 for all rhel_8 references
- use {centos/rhel}_8 instead of {rhel/centos}_latest: to keep things
  same in master and octopus since we use: rhel_8 and centos_8 as latest
  version symlinks, which differentiated after an octopus only commit.

this was not cherry picked from master as octopus had some of the
symlinks, not in sync with master, this commit does cleanup for them,
and tries to make them similar to master.

(updates introduced change by: 126217febf023a6f561fe88dbdb87b5b2f379798)
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoqa/distros/podman: preserve registries.conf
Sage Weil [Mon, 5 Apr 2021 18:49:18 +0000 (13:49 -0500)]
qa/distros/podman: preserve registries.conf

Otherwise we'll lose the mirror configuration.

trivial-fix:

specify location for container registry since we use sepia labs as our
container registery, which otherwise can't find registries.conf

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

4 years agoqa: new kubic distro files; use kubic podman for centos/rhel
Sage Weil [Wed, 3 Mar 2021 14:14:29 +0000 (08:14 -0600)]
qa: new kubic distro files; use kubic podman for centos/rhel

The current centos/rhel version of podman (2.2.1) is broken.

- create new qa/distros/podman/* files that install kubic podman
- include centos/rhel variants
- adjust cephadm jobs to use new yaml files
- remove old qa/distros/all/*_podman.yaml files

trivial fix: we do not have cephadm/thrash suite in octopus(removed)
- distro(from octopus) renamed to 0-distro(from pacific)

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

4 years agoqa/suites/rados/cephadm: add back centos+rhel with kubic podman
Sage Weil [Thu, 11 Mar 2021 19:46:23 +0000 (13:46 -0600)]
qa/suites/rados/cephadm: add back centos+rhel with kubic podman

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

4 years agoqa/suites/rados/cephadm: add 20.04 target
Sage Weil [Sat, 23 Jan 2021 17:23:13 +0000 (11:23 -0600)]
qa/suites/rados/cephadm: add 20.04 target

Link directly to the distro version... no need to use _latest here since
it obscures the podman vs docker difference.

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

4 years agoqa/tests: replaced ubuntu_latest.yaml with ubuntu 20.04
Kefu Chai [Mon, 29 Mar 2021 16:06:16 +0000 (00:06 +0800)]
qa/tests: replaced ubuntu_latest.yaml with ubuntu 20.04

resurrect 835f2f5f511e7363f4056e5137382982aac1bfbf, which was reverted by
1f885b6c2fdde1f3ab249a56f7b4b763556f4373

so all tests for `pacific` will be tested on the latest ubuntu version

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

4 years agoqa/distros: add centos 8.3
Patrick Donnelly [Fri, 5 Mar 2021 21:11:30 +0000 (13:11 -0800)]
qa/distros: add centos 8.3

trivial fix: adding centos_8 symlink

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

4 years agoqa/distros: add ubuntu 20.04 targets
Sage Weil [Sat, 23 Jan 2021 17:20:52 +0000 (11:20 -0600)]
qa/distros: add ubuntu 20.04 targets

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

4 years agoqa/distros: add RHEL 8.3 and use RHEL 8.3 as default
rakeshgm [Tue, 17 Nov 2020 13:14:16 +0000 (18:44 +0530)]
qa/distros: add RHEL 8.3 and use RHEL 8.3 as default

Signed-off-by: rakeshgm <rakeshgm@redhat.com>
(cherry picked from commit 5eabe906e6d15dec48224fd29b45e1155e751314)

4 years agoqa/distros: centos7 -> centos8, rhel7 -> rhel8
Sage Weil [Tue, 10 Dec 2019 13:45:06 +0000 (07:45 -0600)]
qa/distros: centos7 -> centos8, rhel7 -> rhel8

trivial fix: removing skipping log warning needed for previous versions

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1eb8198d0b25be38eae707fc79e8d13d2a3a9788)

4 years agoqa/suites/perf-basic: pin to 18.04 41922/head
Neha Ojha [Wed, 3 Feb 2021 18:57:50 +0000 (18:57 +0000)]
qa/suites/perf-basic: pin to 18.04

This will have same problems as https://tracker.ceph.com/issues/49139

trivial fix: removed ubuntu_latest having bionic as entry.

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

4 years agoqa/suites/rados/perf: pin to 18.04
Neha Ojha [Wed, 3 Feb 2021 17:29:59 +0000 (17:29 +0000)]
qa/suites/rados/perf: pin to 18.04

Caused by a07ca4c5c0f04c43c71231a898c2a89e99a80606

Fixes: https://tracker.ceph.com/issues/49139
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 6a03b4cec9be39b2c3217e5f28372e1db3999781)

4 years agoMerge pull request #41087 from smithfarm/wip-50357-octopus
Nathan Cutler [Wed, 16 Jun 2021 20:20:01 +0000 (22:20 +0200)]
Merge pull request #41087 from smithfarm/wip-50357-octopus

octopus: make-dist: refuse to run if script path contains a colon

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agodebian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook anymore 41878/head
Kefu Chai [Fri, 4 Jun 2021 03:25:12 +0000 (11:25 +0800)]
debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook anymore

per https://www.debian.org/doc/debian-policy/ch-relationships.html

> Recommends
>   This declares a strong, but not absolute, dependency.
>
> The Recommends field should list packages that would be found together
> with this one in all but unusual installations.

ceph-mgr-modules-core provides a set of ceph-mgr modules which are
always enabeld. but the rook module enables ceph-mgr to install and
configure a Ceph cluster using Rook. this module is very useful but
it does not have such a strong connection with ceph-mgr-modules-core.
we can always install it separately for using better intergration with
Rook.

See-also: https://tracker.ceph.com/issues/45574
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 814fb28892370bef3337f90edccfd6f9c00bf350)

4 years agoMerge pull request #41624 from cfsnyder/wip-50750-octopus
Yuri Weinstein [Tue, 15 Jun 2021 16:12:12 +0000 (09:12 -0700)]
Merge pull request #41624 from cfsnyder/wip-50750-octopus

octopus: doc/rados/operations: s/max_misplaced/target_max_misplaced_ratio/

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #41766 from cfsnyder/wip-50727-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:57:57 +0000 (07:57 -0700)]
Merge pull request #41766 from cfsnyder/wip-50727-octopus

octopus: rgw : add check empty for sync url

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41765 from cfsnyder/wip-51079-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:57:31 +0000 (07:57 -0700)]
Merge pull request #41765 from cfsnyder/wip-51079-octopus

octopus: rgw: require bucket name in bucket chown

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41420 from cfsnyder/wip-50677-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:57:05 +0000 (07:57 -0700)]
Merge pull request #41420 from cfsnyder/wip-50677-octopus

octopus: rgw: fix segfault related to explicit object manifest handling

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41419 from cfsnyder/wip-50423-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:56:15 +0000 (07:56 -0700)]
Merge pull request #41419 from cfsnyder/wip-50423-octopus

octopus: rgw: send headers of quota settings

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41418 from cfsnyder/wip-50380-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:55:38 +0000 (07:55 -0700)]
Merge pull request #41418 from cfsnyder/wip-50380-octopus

octopus: rgw/amqp/test: fix mock prototype for librabbitmq-0.11.0

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41417 from cfsnyder/wip-50643-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:55:06 +0000 (07:55 -0700)]
Merge pull request #41417 from cfsnyder/wip-50643-octopus

octopus: rgw: allow rgw-orphan-list to process multiple data pools

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41416 from cfsnyder/wip-50730-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:54:37 +0000 (07:54 -0700)]
Merge pull request #41416 from cfsnyder/wip-50730-octopus

octopus: rgw/rgw_file: Fix the return value of read() and readlink()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41415 from cfsnyder/wip-50640-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:54:08 +0000 (07:54 -0700)]
Merge pull request #41415 from cfsnyder/wip-50640-octopus

octopus: rgw/sts: read_obj_policy() consults iam_user_policies on ENOENT

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41413 from cfsnyder/wip-50709-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:53:39 +0000 (07:53 -0700)]
Merge pull request #41413 from cfsnyder/wip-50709-octopus

octopus: rgw: fix bucket object listing when marker matches prefix

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41412 from cfsnyder/wip-50464-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:52:56 +0000 (07:52 -0700)]
Merge pull request #41412 from cfsnyder/wip-50464-octopus

octopus: rgw/notifications: delete bucket notification object when empty

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40768 from smithfarm/wip-49513-octopus
Yuri Weinstein [Tue, 15 Jun 2021 14:46:06 +0000 (07:46 -0700)]
Merge pull request #40768 from smithfarm/wip-49513-octopus

octopus: cephfs: client: add ability to lookup snapped inodes by inode number

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge pull request #41647 from rhcs-dashboard/wip-51065-octopus
Ernesto Puerta [Mon, 14 Jun 2021 08:29:50 +0000 (10:29 +0200)]
Merge pull request #41647 from rhcs-dashboard/wip-51065-octopus

octopus: mgr/dashboard: fix bucket objects and size calculations

Reviewed-by: Waad Alkhoury <walkhour@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>
4 years agoMerge pull request #41530 from rhcs-dashboard/wip-50884-octopus
Ernesto Puerta [Fri, 11 Jun 2021 18:01:02 +0000 (20:01 +0200)]
Merge pull request #41530 from rhcs-dashboard/wip-50884-octopus

octopus: mgr/dashboard: fix OSDs Host details/overview grafana graphs

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@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: wornet-mwo <NOT@FOUND>
4 years agoMerge pull request #41508 from rhcs-dashboard/wip-50960-octopus
Ernesto Puerta [Fri, 11 Jun 2021 17:59:41 +0000 (19:59 +0200)]
Merge pull request #41508 from rhcs-dashboard/wip-50960-octopus

octopus: mgr/dashboard: fix API docs link

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #41199 from votdev/wip-50663-octopus
Ernesto Puerta [Fri, 11 Jun 2021 08:40:56 +0000 (10:40 +0200)]
Merge pull request #41199 from votdev/wip-50663-octopus

octopus: mgr/dashboard: disable NFSv3 support in dashboard

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: sebastian-philipp <NOT@FOUND>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #41642 from idryomov/wip-rbd-qemu-precise-repos-octopus
Yuri Weinstein [Wed, 9 Jun 2021 18:45:55 +0000 (11:45 -0700)]
Merge pull request #41642 from idryomov/wip-rbd-qemu-precise-repos-octopus

octopus: qa/tasks/qemu: precise repos have been archived

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #41031 from trociny/wip-48424-octopus
Yuri Weinstein [Wed, 9 Jun 2021 16:24:25 +0000 (09:24 -0700)]
Merge pull request #41031 from trociny/wip-48424-octopus

octopus: rgw: check object locks in multi-object delete

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agorgw : add check empty for sync url 41766/head
cao.leilc [Fri, 2 Apr 2021 03:55:54 +0000 (11:55 +0800)]
rgw : add check empty for sync url

Fixes: https://tracker.ceph.com/issues/50103
Signed-off-by: caolei <halei15848934852@163.com>
(cherry picked from commit 3a4e0b79310b21eeee37043d5419887bb41c0cf6)

4 years agorgw: require bucket name in bucket chown 41765/head
Zulai Wang [Thu, 3 Jun 2021 05:13:15 +0000 (13:13 +0800)]
rgw: require bucket name in bucket chown

Checking and reporting missing the mandatory parameter avoid clueless error
message for bucket chown.

Signed-off-by: Zulai Wang <zl31wang@gmail.com>
(cherry picked from commit 158a1f4313c0fa206031ede6f48a26c0c7467d57)

4 years agomgr/DaemonServer.cc: prevent integer underflow that is triggered by large increases... 41764/head
Cory Snyder [Fri, 28 May 2021 19:08:49 +0000 (15:08 -0400)]
mgr/DaemonServer.cc: prevent integer underflow that is triggered by large increases to pg_num/pgp_num

This fixes a scenario where mgrs continually crash while attempting to apply large increases to pg_num/pgp_num. The max step size (estmax) for each incremental update to the pgp_num is calculated as a percentage of the pg_num, which permits the possibility for the max step size (estmax) to be greater than the current pgp_num when the increase is large; this causes an integer underflow when the max step size is subtracted from the pgp_num in order to calculate the next step size with std::clamp. The integer underflow causes hi < lo in args passed to std::clamp, which causes a failed assertion, SIGABRT, and ultimately crashing mgr.

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

4 years agoqa/tasks/qemu: precise repos have been archived 41642/head
Ilya Dryomov [Tue, 1 Jun 2021 10:46:32 +0000 (12:46 +0200)]
qa/tasks/qemu: precise repos have been archived

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

4 years agoos/bluestore: fix unexpected ENOSPC in Avl/Hybrid allocators. 41658/head
Igor Fedotov [Mon, 17 May 2021 19:23:26 +0000 (22:23 +0300)]
os/bluestore: fix unexpected ENOSPC in Avl/Hybrid allocators.

Avl allocator mode was returning unexpected ENOSPC in first-fit mode if all size-
matching available extents were unaligned but applying the alignment made all of
them shorter than required. Since no lookup retry with smaller size -
ENOSPC is returned.
Additionally we should proceed with a lookup in best-fit mode even when
original size has been truncated to match the avail size.
(force_range_size_alloc==true)

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

4 years agotest/allocator_replay_test: make allocator type configurable
Igor Fedotov [Mon, 17 May 2021 19:21:53 +0000 (22:21 +0300)]
test/allocator_replay_test: make allocator type configurable

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

 Conflicts:
src/test/objectstore/allocator_replay_test.cc - use bmap_allocator_replay_test

4 years agomgr/dashboard: fix bucket objects and size calculations 41647/head
Avan Thakkar [Tue, 1 Jun 2021 14:21:16 +0000 (19:51 +0530)]
mgr/dashboard: fix bucket objects and size calculations

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

4 years agoMerge pull request #41511 from ideepika/wip-49592-upgrade-octopus
Ilya Dryomov [Tue, 1 Jun 2021 22:04:54 +0000 (00:04 +0200)]
Merge pull request #41511 from ideepika/wip-49592-upgrade-octopus

octopus: qa/upgrade: disable update_features test_notify with older client as lockowner

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agooctopus: qa/upgrade: disable update_features test_notify with older client as lockowner 41511/head
Deepika Upadhyay [Wed, 26 May 2021 19:18:38 +0000 (00:48 +0530)]
octopus: qa/upgrade: disable update_features test_notify with older client as lockowner

 * with the recent support for async rbd operations from pacific+ when an
 older client(non async support) goes on upgrade, and simultaneously
 interacts with a newer client which expects the requests to be async,
 experiences hang; considering the return code for request completion to
 be acknowledgement for async request, which then keeps waiting for
 another acknowledgement of request completion.

 this if happens should be a rare only when lockowner is an old client
 and should be deferred if compatibility issues arises.

 * qa/upgrade: amend upgrade test workunits to use respective stable branches

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agodoc/rados/operations: s/max_misplaced/target_max_misplaced_ratio/ 41624/head
Kefu Chai [Tue, 11 May 2021 04:18:56 +0000 (12:18 +0800)]
doc/rados/operations: s/max_misplaced/target_max_misplaced_ratio/

max_misplaced with replaced by in target_max_misplaced_ratio
edbd592ee44e02a5328e1510879555c2f9dcfc9e, but the document was not
sync'ed. let's update it accordingly.

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

4 years agoosd/PG.cc: handle removal of pgmeta object 41623/head
Neha Ojha [Thu, 22 Apr 2021 17:13:40 +0000 (17:13 +0000)]
osd/PG.cc: handle removal of pgmeta object

In 7f047005fc72e1f37a45cde2d742bb2eb1e62881, we made the pg removal code
much more efficient. But it started marking the pgmeta object as an unexpected
onode, which in reality is expected to be removed after all the other objects.

This behavior is very easily reproducible in a vstart cluster:

ceph osd pool create test 1 1
rados -p test bench 10 write --no-cleanup
ceph osd pool delete test test  --yes-i-really-really-mean-it

Before this patch:

"do_delete_work additional unexpected onode list (new onodes has appeared
since PG removal started[#2:00000000::::head#]" seen in the OSD logs.

After this patch:

"do_delete_work removing pgmeta object #2:00000000::::head#" is seen.

Related to:https://tracker.ceph.com/issues/50466
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 0e917f1b1e18ca9e48b3f91110d3a46b086f7d83)

4 years agotest: bump DecayCounter.steady acceptable error 41619/head
Patrick Donnelly [Thu, 15 Apr 2021 13:57:57 +0000 (06:57 -0700)]
test: bump DecayCounter.steady acceptable error

The test is often run on heavily loaded machines which will effect the
precision of the test.

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

4 years agomon/OSDMonitor: drop stale failure_info even if can_mark_down() 41618/head
Kefu Chai [Tue, 25 May 2021 06:17:34 +0000 (14:17 +0800)]
mon/OSDMonitor: drop stale failure_info even if can_mark_down()

in a124ee85b03e15f4ea371358008ecac65f9f4e50, we add a check to drop
stale failure_info reports. but if osdmap does not prohibit us from
marking the osd in question down, the branch checking the stale info
is not executed. in general, it is allowed to mark an osd down, so
the fix of a124ee85b03e15f4ea371358008ecac65f9f4e50 just fails to
work.

in this change, we check for stale failure report of osd in question
as long as the osd is not marked down in the same function. this should
address the slow ops of failure report issue.

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

4 years agoosd/PeeringState: fix acting_set_writeable min_size check 41609/head
Samuel Just [Fri, 2 Apr 2021 22:30:54 +0000 (22:30 +0000)]
osd/PeeringState: fix acting_set_writeable min_size check

acting.size() >= pool.info.min_size is meant to check min_size against
acting set participants, but acting is a vector with placeholders.
actingset is the representation with placeholders removed.

The upshot of this bug is that the activation process will basically
ignore min_size for an ec pool allowing writes in cases where it
shouldn't.  PastIntervals::check_new_interval, however, performs
the check correctly, and will therefore discount intervals in which
we really did serve writes as not writeable.  This can trigger many
different problem conditions including but not limited to:
  - Unfound objects due to accepting a last_update with insufficient
    osds
  - Lost writes
  - Crashes due to peering rules being violated

This bug was originally introduced with recovery below min_size in
e5a96fd, and then preserved through refactors in 749a13d and 95bec9.

7cb818a exposed it with with expansion of recovery below min_size
to include ec pools (acting.size() is sufficient for replicated
pools).

Fixes: https://tracker.ceph.com/issues/48613
Fixes: https://tracker.ceph.com/issues/48417
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 642a1c165499bcbd4cfdf907af313ac7ffe44ff4)

Conflicts:
src/osd/PeeringState.h

Fixes the callers rather than also backporting 95bec9873.

4 years agoosd/PeeringState: fix get_backfill_priority min_size comparison
Samuel Just [Fri, 2 Apr 2021 23:06:14 +0000 (23:06 +0000)]
osd/PeeringState: fix get_backfill_priority min_size comparison

acting has placeholders for ec, need to use actingset.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 7b2e0f4fd1c9071495dae9189428aa1cb8774c30)

4 years agocephadm: fix port_in_use when IPv6 is disabled 41602/head
Patrick Seidensal [Thu, 11 Feb 2021 15:22:06 +0000 (16:22 +0100)]
cephadm: fix port_in_use when IPv6 is disabled

Do not return "port is in use" when the protocol family tested is not
supported (due to being deactivated).

Fixes: https://tracker.ceph.com/issues/49273
Conflicts:
    src/cephadm/cephadm
    src/cephadm/tests/test_cephadm.py

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit a0ffcec4af7a6f464439023d3dd0ccb62c8a856c)

4 years agorgw: send headers of quota settings 41419/head
Or Friedmann [Thu, 15 Oct 2020 15:40:27 +0000 (18:40 +0300)]
rgw: send headers of quota settings

Make the quota settings visible to s3 and swift users
rgw send headers of quota settings

Fixes: https://tracker.ceph.com/issues/47752
Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 706e077a79306f9c1efd66af7e5d9fdb474f629b)

 Conflicts:
src/rgw/rgw_op.cc

4 years agoceph: ignore BrokenPipeError when printing help 41586/head
Ernesto Puerta [Fri, 11 Sep 2020 10:10:16 +0000 (12:10 +0200)]
ceph: ignore BrokenPipeError when printing help

ignore BrokenPipeError which is thrown when piping the output of ceph
CLI to a tool which might close its stdin before ceph CLI sends the
whole help message.

Follow approach suggested by Kefu: https://github.com/python/cpython/commit/7b0ed43af55c1e2844aa0ccd5e088b2ddd38dbdb
This doesn't manage the clean-up/exit logic, as that's deferred to the
last part of the __main__ code.

Fixes: https://tracker.ceph.com/issues/47400
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 39768459f6e542dc4c18407fed4f8412abe759fe)

4 years agotest: add ceph_mksnap and ceph_rmsnap replacements 40768/head
Jeff Layton [Wed, 26 May 2021 11:05:13 +0000 (07:05 -0400)]
test: add ceph_mksnap and ceph_rmsnap replacements

Signed-off-by: Jeff Layton <jlayton@redhat.com>
4 years ago15.2.13 v15.2.13
Jenkins Build Slave User [Wed, 26 May 2021 19:24:07 +0000 (19:24 +0000)]
15.2.13

4 years agotest: add test case for MDS privated inos accessing
Xiubo Li [Wed, 28 Apr 2021 01:32:24 +0000 (09:32 +0800)]
test: add test case for MDS privated inos accessing

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

Conflicts:
src/test/libcephfs/test.cc
- octopus version of this file is missing lots of tests that were added to
  master post-octopus

4 years agomds: make the lost+found dir accessible from clients
Xiubo Li [Mon, 19 Apr 2021 02:34:02 +0000 (10:34 +0800)]
mds: make the lost+found dir accessible from clients

Inode number 0x4 is reserved for the lost+found dir, and the apps
or recovery apps need to access it.

At the same time the 0x3 is reserved for the global snaprealm, which
will also be lookup by the clients when looking up the snaprealm inodes.

Here will make all the inode less than 100 accessible by clients.

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

Conflicts:
src/mds/Server.cc
- code being changed does not exist in octopus: change omitted

4 years agomds: move the inos 1,2 and 3 macros to ceph_fs.h
Xiubo Li [Tue, 20 Apr 2021 01:08:20 +0000 (09:08 +0800)]
mds: move the inos 1,2 and 3 macros to ceph_fs.h

For inos 1 and 2 there has two places are defining them, to make
sure we won't miss any one of them, let's define them in only one
header file.

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

Conflicts:
src/client/Inode.h
src/mds/CInode.h
src/mds/MDCache.cc
src/mds/Server.cc
        src/mds/SnapServer.h
- change MDS_INO_ROOT to CEPH_INO_ROOT in src/mds/SnapServer.h (octopus-only)

4 years agoclient: don't allow access to MDS-private inodes
Xiubo Li [Wed, 7 Apr 2021 11:37:26 +0000 (19:37 +0800)]
client: don't allow access to MDS-private inodes

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

Conflicts:
src/client/Client.cc
- octopus wants ESTALE instead of CEPHFS_ESTALE

4 years agoclient: add testcase for ceph_ll_lookup_vino
Jeff Layton [Wed, 3 Feb 2021 15:24:16 +0000 (10:24 -0500)]
client: add testcase for ceph_ll_lookup_vino

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit a956c7986fd43da851918b87c71524f9a2bb1162)

Conflicts:
src/test/libcephfs/test.cc
- octopus is missing a bunch of tests, but this doesn't matter because the
  commit being cherry-picked did not touch those

4 years agoclient: add ceph_ll_lookup_vino
Jeff Layton [Mon, 1 Feb 2021 16:04:07 +0000 (11:04 -0500)]
client: add ceph_ll_lookup_vino

Add a new API function for looking up an inode via a vinodeno_t. This
should give ganesha a way to reliably look up snapshot inodes.

We do need to add some special handling for CEPH_SNAPDIRs. If we're
looking for one, then find the non-snapped parent, and then call
open_snapdir to get the snapdir inode.

Also, have the function check the local cache before calling the MDS
to look up an inode.

Fixes: https://tracker.ceph.com/issues/48991
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 70622079c2ec55222a139fa5042902e0b19bd839)

Conflicts:
src/client/Client.cc

4 years agoclient: make _lookup_ino take a vinodeno_t
Jeff Layton [Mon, 1 Feb 2021 15:41:14 +0000 (10:41 -0500)]
client: make _lookup_ino take a vinodeno_t

Currently, it always leaves the snapid as 0. Rename it to
_lookup_vino and make it fill the snapid from the vinodeno_t
instead, but only when it's a "real" snapid.

Change the existing callers to pass in a vinodeno_t with the
snapid set to CEPH_NOSNAP.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 0e0bebd22dc1abea3f0132debc0b524a01fadf63)

Conflicts:
src/client/Client.cc

4 years agoclient: stop doing unnecessary work in ll_lookup_inode
Jeff Layton [Wed, 3 Feb 2021 13:12:41 +0000 (08:12 -0500)]
client: stop doing unnecessary work in ll_lookup_inode

It's not clear to me why we're looking up the parent and name of the
inode in ll_lookup_inode, as we don't actually do anything with them.
Just return once we get an inode reference.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 2b0b895e888c0f3dece3c1e717ca6e1552e588d8)

4 years agomgr/dashboard: fix OSDs Host details/overview grafana graphs 41530/head
Alfonso Martínez [Fri, 7 May 2021 13:38:07 +0000 (15:38 +0200)]
mgr/dashboard: fix OSDs Host details/overview grafana graphs

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

4 years agodashboard: Fixed name clash when hostname similar to anaother
Michael Wodniok [Fri, 12 Mar 2021 16:08:54 +0000 (17:08 +0100)]
dashboard: Fixed name clash when hostname similar to anaother

Fixes: #49769
Signed-off-by: Michael Wodniok <wodniok@wor.net>
(cherry picked from commit e97e27ebdbb394c01aa1cf502039a798d9c4e110)
(cherry picked from commit 9f729ff34d487adc7b38913b92fce4f5241b6c43)

4 years agomgr/dashboard: fix API docs link 41508/head
Avan Thakkar [Wed, 19 May 2021 23:57:29 +0000 (05:27 +0530)]
mgr/dashboard: fix API docs link

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
      - Adopt the master branch changes.

4 years agoMerge pull request #41387 from votdev/wip-47471-octopus
Yuri Weinstein [Fri, 21 May 2021 16:00:59 +0000 (09:00 -0700)]
Merge pull request #41387 from votdev/wip-47471-octopus

octopus: mgr/dashboard: allow getting fresh inventory data from the orchestrator

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #40382 from singuliere/wip-48934-octopus
Yuri Weinstein [Fri, 21 May 2021 14:02:23 +0000 (07:02 -0700)]
Merge pull request #40382 from singuliere/wip-48934-octopus

octopus: rgw/amqp: fix race condition in amqp manager initialization

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
4 years agoMerge pull request #41302 from MrFreezeex/wip-50712-octopus
Yuri Weinstein [Fri, 21 May 2021 14:01:18 +0000 (07:01 -0700)]
Merge pull request #41302 from MrFreezeex/wip-50712-octopus

octopus: librbd/mirror/snapshot: avoid UnlinkPeerRequest with a unlinked peer

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 years agoMerge pull request #40388 from singuliere/wip-49024-octopus
Yuri Weinstein [Fri, 21 May 2021 14:00:48 +0000 (07:00 -0700)]
Merge pull request #40388 from singuliere/wip-49024-octopus

octopus: rbd/bench: include used headers

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 years agoMerge pull request #40387 from singuliere/wip-49766-octopus
Yuri Weinstein [Fri, 21 May 2021 14:00:21 +0000 (07:00 -0700)]
Merge pull request #40387 from singuliere/wip-49766-octopus

octopus: librbd: allow interrupted trash move request to be restarted

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 years agoMerge pull request #40386 from singuliere/wip-49772-octopus
Yuri Weinstein [Fri, 21 May 2021 13:59:51 +0000 (06:59 -0700)]
Merge pull request #40386 from singuliere/wip-49772-octopus

octopus: librbd/io: send alloc_hint when compression hint is set

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 years agoMerge pull request #41321 from trociny/wip-50793-octopus
Yuri Weinstein [Fri, 21 May 2021 13:57:46 +0000 (06:57 -0700)]
Merge pull request #41321 from trociny/wip-50793-octopus

octopus: osd: don't assert in-flight backfill is always in recovery list

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41311 from k0ste/wip-50778-octopus
Yuri Weinstein [Fri, 21 May 2021 13:57:06 +0000 (06:57 -0700)]
Merge pull request #41311 from k0ste/wip-50778-octopus

octopus: mgr/progress: ensure progress stays between [0,1]

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agorgw: fix segfault related to explicit object manifest handling 41420/head
Mark Kogan [Mon, 26 Apr 2021 12:36:08 +0000 (15:36 +0300)]
rgw: fix segfault related to explicit object manifest handling

Fixes: https://tracker.ceph.com/issues/50467
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit ae00453515b17d25a5d42430e744855b020ccec6)

4 years agorgw/amqp/test: fix mock prototype for librabbitmq-0.11.0 41418/head
Yuval Lifshitz [Sun, 11 Apr 2021 16:37:39 +0000 (19:37 +0300)]
rgw/amqp/test: fix mock prototype for librabbitmq-0.11.0

also use extern C for to get compilation errors when
function prototype change

Fixes: https://tracker.ceph.com/issues/50291
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
(cherry picked from commit 2ba598ec4c294bd09d2df18ccd2096382e303d39)

4 years agorgw: allow rgw-orphan-list to process multiple data pools 41417/head
J. Eric Ivancich [Thu, 15 Apr 2021 21:18:09 +0000 (17:18 -0400)]
rgw: allow rgw-orphan-list to process multiple data pools

We now allow multiple data pools to be specified either on the
command-line or at the prompt. The list should be space-separated.

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

4 years agorgw/rgw_file: Fix the return value of read() and readlink() 41416/head
luo rixin [Tue, 29 Dec 2020 06:39:21 +0000 (14:39 +0800)]
rgw/rgw_file: Fix the return value of read() and readlink()

Fixes: https://tracker.ceph.com/issues/49189
Signed-off-by: Dai zhiwei <daizhiwei3@huawei.com>
Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit bfd83e8fa142873a0bdf09a4d1ad1b04127f5885)

4 years agorgw: read_obj_policy() consults iam_user_policies on ENOENT 41415/head
Casey Bodley [Tue, 6 Apr 2021 19:35:54 +0000 (15:35 -0400)]
rgw: read_obj_policy() consults iam_user_policies on ENOENT

when the head object doesn't exist, read_obj_policy() has to decide
whether to return ENOENT or EACCES

when there's a bucket policy, we check whether it has s3ListBucket
permissions. when there's an assumed role, we also need to check
against the role's policies in s->iam_user_policies

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

 Conflicts:
src/rgw/rgw_op.cc

4 years agorgw: fix bucket object listing when marker matches prefix 41413/head
J. Eric Ivancich [Fri, 30 Apr 2021 20:07:54 +0000 (16:07 -0400)]
rgw: fix bucket object listing when marker matches prefix

When an iniitial marker that ends with a delimiter is provided, it
prevents listing of that "subdirectory" due to new logic at the cls
level to make listing more efficient. The fix catches that situation.

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

4 years agorgw/notifications: delete bucket notification object when empty 41412/head
Yuval Lifshitz [Tue, 9 Mar 2021 10:36:09 +0000 (12:36 +0200)]
rgw/notifications: delete bucket notification object when empty

Fixes: https://tracker.ceph.com/issues/49650
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
(cherry picked from commit 08e9846fd5a040887e2ddbfca36da97777fc76f6)

 Conflicts:
src/rgw/rgw_pubsub.cc
 - octopus does not have optional_yield arg

4 years agomgr/dashboard: allow getting fresh inventory data from the orchestrator 41387/head
Kiefer Chang [Mon, 27 Apr 2020 08:08:22 +0000 (16:08 +0800)]
mgr/dashboard: allow getting fresh inventory data from the orchestrator

When there is a device change, a `ceph orch device ls --refresh` command
needs to be called so the orchestrator can invalidate its cache and
refresh all devices on all nodes. Currently, the call is asynchronous and
there is no way to determine is a refresh is done or not.

To allow doing a refresh in the Dashboard:
- The inventory device list is periodically updated with cached data.
- If the user clicks the refresh button, a refresh call is sent to the
  orchestrator. Thus if there are device changes, it will be revealed soon
  because of the periodical update.

Fixes: https://tracker.ceph.com/issues/44803
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 1147d6dca04fe6e45b385b549db37775fce54edd)

Conflicts:
src/pybind/mgr/dashboard/controllers/orchestrator.py
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.ts

4 years agoMerge pull request #40945 from badone/wip-octopus-tracker-50414
Yuri Weinstein [Sat, 15 May 2021 20:39:24 +0000 (13:39 -0700)]
Merge pull request #40945 from badone/wip-octopus-tracker-50414

octopus: qa/ceph-ansible: Update ansible version and ceph_stable_release

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #41157 from smithfarm/wip-50365-octopus
Yuri Weinstein [Sat, 15 May 2021 16:49:58 +0000 (09:49 -0700)]
Merge pull request #41157 from smithfarm/wip-50365-octopus

octopus: rgw: during reshard lock contention, adjust logging

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #40767 from smithfarm/wip-49472-octopus
Yuri Weinstein [Sat, 15 May 2021 16:15:36 +0000 (09:15 -0700)]
Merge pull request #40767 from smithfarm/wip-49472-octopus

octopus: qa: bump osd heartbeat grace for ffsb workload

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>