]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agotest/librbd: use really invalid domain 42010/head
Mykola Golub [Thu, 24 Jun 2021 10:23:21 +0000 (11:23 +0100)]
test/librbd: use really invalid domain

in TestMockMigrationHttpClient.OpenResolveFail

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

4 years agoMerge pull request #41987 from rhcs-dashboard/wip-51326-pacific
Ernesto Puerta [Thu, 24 Jun 2021 12:22:23 +0000 (14:22 +0200)]
Merge pull request #41987 from rhcs-dashboard/wip-51326-pacific

pacific: mgr/dashboard: Alertmanager fails to POST alerts

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: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #41768 from neha-ojha/wip-50797-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:30:57 +0000 (08:30 -0700)]
Merge pull request #41768 from neha-ojha/wip-50797-pacific

pacific: mon: load stashed map before mkfs monmap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #41872 from kamoltat/wip-ksirivad-backport-pacific-fix-49988
Yuri Weinstein [Wed, 23 Jun 2021 15:29:15 +0000 (08:29 -0700)]
Merge pull request #41872 from kamoltat/wip-ksirivad-backport-pacific-fix-49988

pacific: pybind/mgr/progress: Disregard unreported pgs

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41893 from cfsnyder/wip-51001-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:09:13 +0000 (08:09 -0700)]
Merge pull request #41893 from cfsnyder/wip-51001-pacific

pacific: rgw: crash on multipart upload to bucket with policy

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #41877 from ideepika/wip-51241-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:08:51 +0000 (08:08 -0700)]
Merge pull request #41877 from ideepika/wip-51241-pacific

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

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #41863 from cfsnyder/wip-50710-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:08:14 +0000 (08:08 -0700)]
Merge pull request #41863 from cfsnyder/wip-50710-pacific

pacific: rgw: radosgw_admin remove bucket not purging past 1,000 objects

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #41862 from cfsnyder/wip-51094-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:07:00 +0000 (08:07 -0700)]
Merge pull request #41862 from cfsnyder/wip-51094-pacific

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

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41755 from ifed01/wip-ifed-tchaikov-wip-rocksdb-pac
Yuri Weinstein [Wed, 23 Jun 2021 15:06:14 +0000 (08:06 -0700)]
Merge pull request #41755 from ifed01/wip-ifed-tchaikov-wip-rocksdb-pac

pacific: bluestore: use string_view and strip trailing slash for dir listing

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40819 from ivancich/wip-50301-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:05:37 +0000 (08:05 -0700)]
Merge pull request #40819 from ivancich/wip-50301-pacific

pacific: rgw: radoslist incomplete multipart parts marker

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #40804 from k0ste/wip-50294-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:04:09 +0000 (08:04 -0700)]
Merge pull request #40804 from k0ste/wip-50294-pacific

pacific: mgr/prometheus:Improve the pool metadata

Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agomgr/dashboard: Alertmanager fails to POST alerts 41987/head
Avan Thakkar [Tue, 22 Jun 2021 11:46:45 +0000 (17:16 +0530)]
mgr/dashboard: Alertmanager fails to POST alerts

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

4 years agoMerge pull request #41714 from k0ste/wip-51105-pacific
Guillaume Abrioux [Tue, 22 Jun 2021 06:41:06 +0000 (08:41 +0200)]
Merge pull request #41714 from k0ste/wip-51105-pacific

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

4 years agoMerge pull request #41891 from s0nea/wip-51053-pacific
Ernesto Puerta [Fri, 18 Jun 2021 18:06:35 +0000 (20:06 +0200)]
Merge pull request #41891 from s0nea/wip-51053-pacific

pacific: mgr/dashboard: show partially deleted RBDs

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #41818 from rhcs-dashboard/wip-api_label-pacific
Ernesto Puerta [Fri, 18 Jun 2021 18:03:12 +0000 (20:03 +0200)]
Merge pull request #41818 from rhcs-dashboard/wip-api_label-pacific

pacific: .github/labeler: add api-change label

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41823 from batrick/i51186
Yuri Weinstein [Thu, 17 Jun 2021 19:55:37 +0000 (12:55 -0700)]
Merge pull request #41823 from batrick/i51186

pacific: qa: add async dirops testing

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41822 from batrick/i51185
Yuri Weinstein [Thu, 17 Jun 2021 19:53:22 +0000 (12:53 -0700)]
Merge pull request #41822 from batrick/i51185

pacific: qa: update RHEL to 8.4

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41811 from batrick/i51170
Yuri Weinstein [Thu, 17 Jun 2021 19:52:41 +0000 (12:52 -0700)]
Merge pull request #41811 from batrick/i51170

pacific: qa: AttributeError: 'RemoteProcess' object has no attribute 'split'

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41691 from kotreshhr/wip-51084-pacific
Yuri Weinstein [Thu, 17 Jun 2021 19:52:16 +0000 (12:52 -0700)]
Merge pull request #41691 from kotreshhr/wip-51084-pacific

pacific: mds: Add full caps to avoid osd full check

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41294 from kotreshhr/wip-50627-pacific
Yuri Weinstein [Thu, 17 Jun 2021 19:51:46 +0000 (12:51 -0700)]
Merge pull request #41294 from kotreshhr/wip-50627-pacific

pacific: client: Fix executeable access check for the root user

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41915 from rhcs-dashboard/wip-51259-pacific
Ernesto Puerta [Thu, 17 Jun 2021 15:42:09 +0000 (17:42 +0200)]
Merge pull request #41915 from rhcs-dashboard/wip-51259-pacific

pacific: mgr/dashboard: Fix 500 error while exiting out of maintenance

Reviewed-by: Alfonso Martínez <almartin@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 agomgr/dashboard: Fix 500 error while exiting out of maintenance 41915/head
Nizamudeen A [Tue, 15 Jun 2021 08:47:58 +0000 (14:17 +0530)]
mgr/dashboard: Fix 500 error while exiting out of maintenance

When you add a host in maintenance mode and then exit the maintenance
mode, a 500 server error will popup which will interrupt the whole
exit maintenance process and leave the host in an unknown/offline state.
It happened when I was setting the status of the host through the
HostSpec(). With this change, I am using the enter_maintenance api of
the orch to enable the maintenance.

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

Conflicts:
     src/pybind/mgr/dashboard/controllers/host.py
 - Removed the addr and label variables since its not backported yet to
   pacific
 - Removed Versioning since for pacific this endpoint is not yet
   versioned to 0.1
src/pybind/mgr/dashboard/services/orchestrator.py
 - Removed the addr and label variables since its not backported yet to
   pacific
src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.ts
 - Didn't included this file because the changes in there are irrelevant
   in pacific
src/pybind/mgr/dashboard/openapi.yaml
 - Regenerated the openapi file

4 years agodebian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook anymore 41877/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 agorgw: crash on multipart upload to bucket with policy 41893/head
Or Friedmann [Thu, 13 May 2021 12:39:02 +0000 (15:39 +0300)]
rgw: crash on multipart upload to bucket with policy

crash on multipart upload to bucket with policy Fixes: https://tracker.ceph.com/issues/50556

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 413b23a5483d1feb5ea087ee96bd31b14bc0a285)

Conflicts:
  src/rgw/rgw_op.cc
- rgw::sal::RGWObject renamed to rgw::sal::Object

4 years agomgr/dashboard: show partially deleted RBDs 41891/head
Tatjana Dehler [Thu, 27 May 2021 09:46:50 +0000 (11:46 +0200)]
mgr/dashboard: show partially deleted RBDs

An RBD might be partially deleted if the deletion
process has been started but was interrupted. In
this case return the RBD as part of the RBD list
and mark it as partially deleted.

Fixes: https://tracker.ceph.com/issues/48603
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit d83c277ac1861df31d2a39d16e20c7bebbea676e)

Conflicts:
src/pybind/mgr/dashboard/services/rbd.py
Fixed minor imports conflict.

4 years agoMerge pull request #41815 from sebastian-philipp/pacific-backport-41555-41444-41693...
Sebastian Wagner [Wed, 16 Jun 2021 11:57:42 +0000 (13:57 +0200)]
Merge pull request #41815 from sebastian-philipp/pacific-backport-41555-41444-41693-41653-41241-41242

pacific: cephadm: june batch 2

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #41680 from neha-ojha/wip-50706-pacific
Yuri Weinstein [Tue, 15 Jun 2021 18:50:20 +0000 (11:50 -0700)]
Merge pull request #41680 from neha-ojha/wip-50706-pacific

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

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agopybind/mg/progress: Disregard unreported pgs 41872/head
Kamoltat [Thu, 13 May 2021 17:38:10 +0000 (17:38 +0000)]
pybind/mg/progress: Disregard unreported pgs

The global recovery event progress calculations only
takes into account pgs with `reported_epoch < start_epoch_of_event`
but sometimes the pgs doesn't get move before or after the creation
of the global recovery event, therefore this might result in a bug
where the global event gets stuck forever unless there is another
event that specifically makes the pgs that get stuck moves and updates
its `reported_epoch`.

Therefore, we decided to disregard pgs that are in active+clean state
but has `reported_epoch < start_epoch_of_event`.

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

4 years agorgw: radosgw_admin remove bucket not purging past 1,000 objects 41863/head
J. Eric Ivancich [Mon, 3 May 2021 21:52:22 +0000 (17:52 -0400)]
rgw: radosgw_admin remove bucket not purging past 1,000 objects

The zipper refactoring combines use of old is_truncated variable and
newer structure that manages is_truncated. This prevented advancing
past the first page of 1,000 entries.

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

Conflicts:
src/rgw/rgw_sal_rados.cc

4 years agomgr/DaemonServer.cc: prevent integer underflow that is triggered by large increases... 41862/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: test nowsync option in kernel client workflows 41823/head
Patrick Donnelly [Wed, 17 Feb 2021 02:38:29 +0000 (18:38 -0800)]
qa: test nowsync option in kernel client workflows

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

4 years agoqa: deep merge top level overrides for fuse/kclient
Patrick Donnelly [Wed, 17 Feb 2021 02:37:35 +0000 (18:37 -0800)]
qa: deep merge top level overrides for fuse/kclient

This allows for array/dict configs like mntopts to accumulate changes
from multiple yaml fragments.

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

4 years agoqa: update RHEL to 8.4 41822/head
Patrick Donnelly [Thu, 3 Jun 2021 19:41:57 +0000 (12:41 -0700)]
qa: update RHEL to 8.4

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

4 years agoMerge pull request #41634 from rhcs-dashboard/wip-51038-pacific
Ernesto Puerta [Fri, 11 Jun 2021 17:45:23 +0000 (19:45 +0200)]
Merge pull request #41634 from rhcs-dashboard/wip-51038-pacific

pacific: mgr/dashboard: fix base-href

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>
4 years ago.github/labeler: add api-change label 41818/head
Ernesto Puerta [Tue, 8 Jun 2021 15:12:36 +0000 (17:12 +0200)]
.github/labeler: add api-change label

To flag PRs changing the Ceph REST API. It might also work for another
APIs.

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 756d4b18aa9cb8590d2edb92de803b8f589247df)

4 years agodoc/dev/cephadm: cephadm bootstrap --shared_ceph_folder 41815/head
Sebastian Wagner [Fri, 4 Jun 2021 09:24:48 +0000 (11:24 +0200)]
doc/dev/cephadm: cephadm bootstrap --shared_ceph_folder

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

4 years agomgr/cephadm: allow monitoring stack services to bind to network and port
Daniel Pivonka [Wed, 12 May 2021 17:46:11 +0000 (13:46 -0400)]
mgr/cephadm: allow monitoring stack services to bind to network and port

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

4 years agodoc/cephadm: enriching "setting a limit"
Zac Dover [Wed, 2 Jun 2021 14:11:59 +0000 (00:11 +1000)]
doc/cephadm: enriching "setting a limit"

This PR improves the flow and syntax of the
sentences in the "Setting a Limit" section of the
"Service Management" chapter of the cephadm documentation.
(This section is about setting limits to the number of
daemons created, and about limiting the creation of daemons
to a specified number of hosts.)

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 8db4a8458f4fbaad2b556ec9c2313d370467e5d3)

4 years agocephadm: add `--allow-fqdn-hostname` test
Michael Fritch [Fri, 28 May 2021 17:12:12 +0000 (11:12 -0600)]
cephadm: add `--allow-fqdn-hostname` test

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0f210b0578cddd5cf6cd21d85d72c21b75209bea)

4 years agocephadm: add `--config` test
Michael Fritch [Thu, 27 May 2021 13:49:01 +0000 (07:49 -0600)]
cephadm: add `--config` test

follow-up test for:
https://github.com/ceph/ceph/pull/41351

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 9bfdf31166ceadb3f9452a5f84116162eb252c55)

4 years agocephadm: add `bootstrap --mon-ip` test
Michael Fritch [Thu, 27 May 2021 13:18:40 +0000 (07:18 -0600)]
cephadm: add `bootstrap --mon-ip` test

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit b3e2c4393bbf390c99090469166b31f4445b3686)

4 years agocephadm: add `bootstrap --skip-mon-network` test
Michael Fritch [Thu, 27 May 2021 13:17:37 +0000 (07:17 -0600)]
cephadm: add `bootstrap --skip-mon-network` test

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 849d00b1a5645363f1f37fb19c54b86214cf91d2)

4 years agocephadm: add basic `bootstrap` test
Michael Fritch [Thu, 27 May 2021 13:17:27 +0000 (07:17 -0600)]
cephadm: add basic `bootstrap` test

bootstrap requires --mon-ip or --mon-addrv

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit c61f80560bac367a339210bebfd3d3676b956964)

4 years agocephadm: move podman/docker test mock
Michael Fritch [Wed, 26 May 2021 13:05:24 +0000 (07:05 -0600)]
cephadm: move podman/docker test mock

to use as a default value in the fixtures

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3060962926bc69f03e11352f637d3586143d4ac6)

Conflicts:
src/cephadm/tests/test_cephadm.py

4 years agocephadm: add cephadm ContextManager
Michael Fritch [Mon, 24 May 2021 13:53:04 +0000 (07:53 -0600)]
cephadm: add cephadm ContextManager

to mock the CephadmContext during unit tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3e714ef1dcd4d30816932fdb35e8abcde773dca8)

4 years agocephadm: add pyfakefs fixture
Michael Fritch [Mon, 24 May 2021 14:03:55 +0000 (08:03 -0600)]
cephadm: add pyfakefs fixture

to mock the cephadm filesystem

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d5eac27833ea830f35fb0d75bc205cf85e4256e4)

4 years agocephadm: clean-up imports
Michael Fritch [Wed, 26 May 2021 10:29:00 +0000 (04:29 -0600)]
cephadm: clean-up imports

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 8fb0a5019c8ba7bf031eed7020bce10afff988e1)

4 years agocephadm: rework mismatched release check
Michael Fritch [Wed, 26 May 2021 10:28:50 +0000 (04:28 -0600)]
cephadm: rework mismatched release check

allow for `--allow-mismatched-release` to be passed during unit tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 969eccffe92f337f8111347043063c665c67db94)

4 years agocephadm: move `json_loads_retry` func
Michael Fritch [Tue, 18 May 2021 16:21:23 +0000 (10:21 -0600)]
cephadm: move `json_loads_retry` func

move inner func `json_loads_retry` so it can be mocked during unit tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit dc8b7db7729cbb24b350de3c8bf2db34e73cd789)

4 years agocephadm: always require a CephadmContext
Michael Fritch [Mon, 24 May 2021 13:52:53 +0000 (07:52 -0600)]
cephadm: always require a CephadmContext

it's not possible for the CephadmContext to be a NoneType

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 054f555afb6c0081f7b37a23932ff51d901092c7)

4 years agodoc/cephadm: rewrite "deploy. mon. w/cephadm" 2/2
Zac Dover [Sun, 9 May 2021 15:06:02 +0000 (01:06 +1000)]
doc/cephadm: rewrite "deploy. mon. w/cephadm" 2/2

This is the second half of PR#41241.

This PR creates a sub-subsection that explains
a configuration step that is sometimes necessary
when configuring monitoring in Ceph clusters. (The
configuration step involves DNS zones.)

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 808c91233c005ca7df8a7b43279915d6382ea26b)

4 years agodoc/cephadm: rewrite "deploy. mon. w/cephadm"
Zac Dover [Sun, 9 May 2021 14:39:47 +0000 (00:39 +1000)]
doc/cephadm: rewrite "deploy. mon. w/cephadm"

This PR corrects various minor usage errors in
the subsection "Deploying Monitoring with cephadm"
of the "monitoring" section of the cephadm guide.

It also adds prompts, and cleans up the list rst a
bit.

This is the first of two PRs planned for this section.
The second PR will create a sub-subsection that explains
an additional installation step that is necessary when
a Ceph cluster and a user accessing that cluster are in
different DNS zones. But that's another story, for another
PR.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit e8419b53fbfd143c37ae80b0eeb441c26c5316f1)

4 years agoMerge pull request #41086 from smithfarm/wip-50358-pacific
Yuri Weinstein [Thu, 10 Jun 2021 19:28:31 +0000 (12:28 -0700)]
Merge pull request #41086 from smithfarm/wip-50358-pacific

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #41596 into pacific
Patrick Donnelly [Thu, 10 Jun 2021 19:09:56 +0000 (12:09 -0700)]
Merge PR #41596 into pacific

* refs/pull/41596/head:
mds: do not infinitely recursively print a metric
mds: do not assert when receiving a unknow metric type

Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41685 from batrick/i51085
Yuri Weinstein [Thu, 10 Jun 2021 19:08:00 +0000 (12:08 -0700)]
Merge pull request #41685 from batrick/i51085

pacific: mds: scrub error on inode 0x1

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41659 from batrick/i51070
Yuri Weinstein [Thu, 10 Jun 2021 19:06:53 +0000 (12:06 -0700)]
Merge pull request #41659 from batrick/i51070

pacific: qa: test_ephemeral_pin_distribution failure

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: fetch stdout from rados calls 41811/head
Patrick Donnelly [Thu, 10 Jun 2021 19:06:43 +0000 (12:06 -0700)]
qa: fetch stdout from rados calls

This test no longer exist in master so the changes were misapplied
during backport.

Fixes: https://tracker.ceph.com/issues/51170
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41044 from leseb/bkp-40157
Yuri Weinstein [Thu, 10 Jun 2021 19:04:28 +0000 (12:04 -0700)]
Merge pull request #41044 from leseb/bkp-40157

pacific: mgr/pybind/snap_schedule: do not fail when no fs snapshots are available

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41577 from rhcs-dashboard/wip-50664-pacific
Ernesto Puerta [Wed, 9 Jun 2021 16:12:26 +0000 (18:12 +0200)]
Merge pull request #41577 from rhcs-dashboard/wip-50664-pacific

pacific: mgr/dashboard:include compression stats on pool dashboard

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #41769 from ivancich/wip-51138-pacific
J. Eric Ivancich [Wed, 9 Jun 2021 15:53:44 +0000 (11:53 -0400)]
Merge pull request #41769 from ivancich/wip-51138-pacific

pacific: rgw: completion of multipart upload leaves delete marker

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #41777 from rhcs-dashboard/wip-51135-pacific
Ernesto Puerta [Wed, 9 Jun 2021 11:57:03 +0000 (13:57 +0200)]
Merge pull request #41777 from rhcs-dashboard/wip-51135-pacific

pacific: mgr/dashboard: simplify object locking fields in 'Bucket Creation' form

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41549 from rhcs-dashboard/pacific-npm-revert
Ernesto Puerta [Wed, 9 Jun 2021 08:24:33 +0000 (10:24 +0200)]
Merge pull request #41549 from rhcs-dashboard/pacific-npm-revert

Revert "pacific: mgr/dashboard: Generate NPM dependencies manifest"

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/dashboard: simplify object locking fields in 'Bucket Creation' form 41777/head
Alfonso Martínez [Thu, 3 Jun 2021 10:25:45 +0000 (12:25 +0200)]
mgr/dashboard: simplify object locking fields in 'Bucket Creation' form

- UI: The object locking retention period must be expressed in days.
  Years value from API (as API keeps param parity with RGW API) are converted to days.
- API: add more validation and increase test coverage.

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

4 years agomon: load stashed map before mkfs monmap 41768/head
Dan van der Ster [Thu, 8 Apr 2021 10:12:55 +0000 (12:12 +0200)]
mon: load stashed map before mkfs monmap

After mkfs the store may not yet contain monmap:last_committed but
might be respawning after setting mon_sync:temp_newer_monmap.
Load that stashed map before falling back to the mkfs:monmap.

Fixes: https://tracker.ceph.com/issues/50230
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit cc0b4c77753962717da8a280a585990f7eec3c7b)

4 years agorgw: completion of multipart upload leaves delete marker 41769/head
J. Eric Ivancich [Tue, 1 Jun 2021 19:17:23 +0000 (15:17 -0400)]
rgw: completion of multipart upload leaves delete marker

The multipart upload meta object is deleted when the multipart upload
is completed. When the bucket is versioned, it needs to be deleted
from the bucket index rather than go through versioning delete process
that adds a delete marker to the bucket index rather than simply
removing it from the bucket index.

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

Conflicts:
  src/rgw/rgw_op.cc        : adapted to significant Zipper mods
  src/rgw/rgw_rados.cc     : adapted to significant Zipper mods
  src/rgw/rgw_rados.h      : adapted to significant Zipper mods
  src/rgw/rgw_sal.h        : adapted to significant Zipper mods
  src/rgw/rgw_sal_rados.cc : adapted to significant Zipper mods
  src/rgw/rgw_sal_rados.h  : adapted to significant Zipper mods

4 years agoMerge pull request #41675 from aaSharma14/wip-51037-pacific
Ernesto Puerta [Tue, 8 Jun 2021 15:57:59 +0000 (17:57 +0200)]
Merge pull request #41675 from aaSharma14/wip-51037-pacific

pacific: mgr/dashboard: API Version changes do not apply to pre-defined methods (list, create etc.)

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #41475 from vshankar/wip-cephfs-mirror-pacific-backports
Yuri Weinstein [Tue, 8 Jun 2021 14:34:48 +0000 (07:34 -0700)]
Merge pull request #41475 from vshankar/wip-cephfs-mirror-pacific-backports

pacific: cephfs-mirror backports

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41576 from adamemerson/wip-50982-pacific
Yuri Weinstein [Tue, 8 Jun 2021 13:09:58 +0000 (06:09 -0700)]
Merge pull request #41576 from adamemerson/wip-50982-pacific

rgw: Simplify log shard probing and err on the side of omap

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoos/bluestore: strip trailing slash for directory listings 41755/head
Jonas Jelten [Mon, 15 Mar 2021 22:21:07 +0000 (23:21 +0100)]
os/bluestore: strip trailing slash for directory listings

Calls to BlueRocksEnv::GetChildren may contain a trailing / in the
queried directory, which is stripped away with this patch.

If it's not stripped, the directory entry is not found in BlueFS:
```
10 bluefs readdir db/
20 bluefs readdir dir db/ not found
 3 rocksdb: [db/db_impl/db_impl_open.cc:1785] Persisting Option File error: OK
```

Fixes: https://tracker.ceph.com/issues/49815
Signed-off-by: Jonas Jelten <jj@sft.lol>
(cherry picked from commit 3aa31813980d22719277a04797df48310acdff66)

4 years agoos/bluestore: let split() return string_view
Kefu Chai [Tue, 16 Mar 2021 02:42:43 +0000 (10:42 +0800)]
os/bluestore: let split() return string_view

instead of creating two strings, just return string_views, for better
performance. and for better readability.

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

4 years agoos/bluestore: use string_view in BlueFS
Kefu Chai [Tue, 16 Mar 2021 01:38:41 +0000 (09:38 +0800)]
os/bluestore: use string_view in BlueFS

this improves the performance of lookup. when it comes to mutation
operations, std::map<> always require an instance of string, but
it only require a single instance of string for each mutation operation
in general, so this does not incurs performance regression due to
multiple copies of the same string_view object.

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

4 years agoos/bluestore: use transparent comparator
Kefu Chai [Tue, 16 Mar 2021 01:29:41 +0000 (09:29 +0800)]
os/bluestore: use transparent comparator

so we don't need to create an instance of `std::string` just for looking
up in those maps.

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

4 years agoos/bluestore: move BlueRocksEnv::split() to .cc
Kefu Chai [Tue, 16 Mar 2021 01:13:00 +0000 (09:13 +0800)]
os/bluestore: move BlueRocksEnv::split() to .cc

this helper is only used by the functions in the .cc file, and it does
not reference BlueRocksEnv member variable or methods. so move it to
an anonymous namespace.

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

4 years agoMerge PR #41684 into pacific
Sage Weil [Mon, 7 Jun 2021 18:44:27 +0000 (13:44 -0500)]
Merge PR #41684 into pacific

* refs/pull/41684/head:
cephadm: improve is_container_running()
mgr/cephadm:fix alerts sent to wrong URL
mgr/cephadm: Warn about OSDs to be deleted manually when deleting an OSD service
doc: add ceph-nfs link
mgr: Fix orch osd rm stop help message
mgr/cephadm/inventory: do not try to resolve current mgr host
pybind/mgr/mgr_module: make get_mgr_ip() return mgr's IP from mgrmap
mgr/restful: use get_mgr_ip() instead of hostname
doc/cephadm: s/the the/the
doc/cephadm: enriching "daemon status"
doc/cephadm: enriching "Service Specification"
mgr/cephadm: Don't call _check_host without hosts
cephadm: stop passing --no-hosts to podman
mgr/nfs: use host.addr for backend IP where possible
mgr/cephadm: convert host addr if non-IP to IP
mgr/dashboard,prometheus: new method of getting mgr IP
doc/cephadm: remove any reference to the use of DNS or /etc/hosts
mgr/cephadm: use known host addr
mgr/cephadm: resolve IP at 'orch host add' time
doc/cephadm: enrich "service status"
doc/cephadm: recommend redeploying monitoring stack daemon after changing image
cephadm: clean-up error message
cephadm: raise an error when `--config` file is not found
cephadm: manage cephadm log with logrotated
mgr/cephadm: progress item for service apply
mgr: expose ceph.conf path to modules
common/config: track the path to the conf file we loaded
qa/tasks/cephfs/test_nfs: fix info test
doc/cephfs/fs-nfs-exports: document --ingress --virtual-ip
mgr/nfs: move ingress vs virtual_ip check to cluster interface
PendingReleaseNotes: clarify deprecated
PendingReleaseNotes: note breaking CLI changes
doc/cephadm/nfs: document nfs+ingress
qa/suites/rados/cephadm/smoke-roleless: test nfs, nfs + ingress
mgr/nfs: take --ingress argument to 'nfs cluster create'
mgr/cephadm: adjust debug output for device refresh
mgr/cephadm: ingress: fix log msg
mgr/cephadm: fix logging of config/placement errors
common/options: enable nfs module for new clusters
cephadm: --stop-signal=SIGTERM
mgr/orchestrator: default nfs pool, namespaces
mgr/cephadm: nfs: create pool if it doesn't yet exist
doc/cephadm/nfs: update
mgr/nfs: change 'nfs cluster info'
mgr/nfs: take optional virtual_ip for deploying ingress
mgr/nfs: remove 'nfs cluster update'
mgr/nfs: factor out ganesha pool creation
mgr/nfs: delete -> rm for CLI
mgr/nfs: add some type annotations
python-common: fix IngressSpec yaml dump
mgr/cephadm: ingress: remove eth0 default
qa/tasks/cephadm: allow mounting volumes in shell
cephadm: add -v arg to shell
qa/tasks/vip: add 'vip.exec' task
mgr/orchestrator: add --port arg to 'orch apply nfs'
mgr/cephadm: nfs: add purge
mgr/cephadm: ingress: support nfs
mgr/cephadm: do not reconfigure daemons on deleted services
mgr/cephadm: nfs: shell out to rados tool for conf creation
mgr/cephadm: nfs: add rank to grace file from mgr module
mgr/cephadm: nfs: bind ganesha to appropriate ip:port
mgr/cephadm: enable ranked daemons for nfs
mgr/cephadm: support creation of daemons with ranks
mgr/cephadm: make _plan show removed daemon names
mgr/cephadm/schedule: assign/map ranks
mgr/cephadm: add rank[_generation] properties
mgr/cephadm/inventory: store optional rank_map along with specs
mgr/cephadm: include service_name is generated DaemonDescription
mgr/orchestrator: include service_name in DaemonDescription dump
mgr/cephadm/inventory: fix deleted check
mgr/cephadm: simplify
mgr/cephadm/schedule: make placement shuffle deterministic
mgr/cephadm: document CephadmService flags
doc/cephadm: fix prompts in service-management.rst
qa/tasks/cephadm: Include bootstrap registry options for downstream
qa/suites/rados: include rook test in rados

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agocephadm: improve is_container_running() 41684/head
Sage Weil [Sat, 5 Jun 2021 15:05:48 +0000 (10:05 -0500)]
cephadm: improve is_container_running()

The 'podman ps' command sporatically exits with 125, I suspect due
to some race/bug in podman itself.

However, our goal here is just to check if a specific container
is running.  Use inspect for that instead--it's even (a bit) faster.

Fixes: https://tracker.ceph.com/issues/51109
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 4757a13dc62d34d3649b1df3bd9f17793c201c1f)

4 years agomgr/cephadm:fix alerts sent to wrong URL
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 agomgr/cephadm: Warn about OSDs to be deleted manually when deleting an OSD service
Juan Miguel Olmo Martínez [Thu, 25 Mar 2021 15:59:55 +0000 (16:59 +0100)]
mgr/cephadm: Warn about OSDs to be deleted manually when deleting an OSD service

Provide information about what OSDs must be deleted in order to delete
completelly a OSD Service.

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 84ac0b326dca8e9d44594a319c020250ea0709c0)

4 years agoMerge pull request #41664 from idryomov/wip-rbd-trash-purge-pacific
Yuri Weinstein [Mon, 7 Jun 2021 13:45:43 +0000 (06:45 -0700)]
Merge pull request #41664 from idryomov/wip-rbd-trash-purge-pacific

pacific: librbd: don't stop at the first unremovable image when purging

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #41643 from idryomov/wip-rbd-qemu-precise-repos-pacific
Yuri Weinstein [Mon, 7 Jun 2021 13:44:38 +0000 (06:44 -0700)]
Merge pull request #41643 from idryomov/wip-rbd-qemu-precise-repos-pacific

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

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoceph-volume: respect the value of bluestore_block_db_size from ceph.conf 41714/head
Andrew Schoen [Mon, 24 May 2021 17:19:38 +0000 (12:19 -0500)]
ceph-volume: respect the value of bluestore_block_db_size from ceph.conf

If --block-db-size is not given args.block_db_size is set to None,
so we should check for it's value in ceph.conf

Resolves: RHBZ#1962744
Fixes: https://tracker.ceph.com/issues/50958
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit cd70a6f583a651e71b5e1b4cf381467cb85039f6)

4 years agoceph-volume: calculate % of device correctly in lvm batch --report
Andrew Schoen [Mon, 24 May 2021 17:04:00 +0000 (12:04 -0500)]
ceph-volume: calculate % of device correctly in lvm batch --report

If using --block-db-size, the % of device calculation is incorrect
and always reads 100%.

Resolves: RHBZ#1946478
Fixes: https://tracker.ceph.com/issues/50957
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit ed5ab92dc3e67a670b33f7c36c651571682bf8e2)

4 years agoMerge pull request #41655 from neha-ojha/wip-51040-pacific
Yuri Weinstein [Sat, 5 Jun 2021 14:37:25 +0000 (07:37 -0700)]
Merge pull request #41655 from neha-ojha/wip-51040-pacific

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

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #41131 from gregsfortytwo/pacific-mmonjoin-leader
Gregory Farnum [Fri, 4 Jun 2021 21:54:25 +0000 (14:54 -0700)]
Merge pull request #41131 from gregsfortytwo/pacific-mmonjoin-leader

Pacific: Direct MMonJoin messages to leader, not first rank [Merge after 41130]

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41130 from gregsfortytwo/pacific-stretch-mon-state
Gregory Farnum [Fri, 4 Jun 2021 21:54:08 +0000 (14:54 -0700)]
Merge pull request #41130 from gregsfortytwo/pacific-stretch-mon-state

Pacific stretch mon state [Merge after 40484]

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agodoc: add ceph-nfs link
Sage Weil [Fri, 4 Jun 2021 17:56:04 +0000 (12:56 -0500)]
doc: add ceph-nfs link

This is a small piece of da4dcd673bda49a709c5457a2ef9de943f6de479,
which covers too much else to backport.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agotest: Add test for mgr hang when osd is full 41691/head
Kotresh HR [Thu, 11 Mar 2021 16:44:55 +0000 (22:14 +0530)]
test: Add test for mgr hang when osd is full

Add fs suite for tests requiring one node as well.

Fixes: https://tracker.ceph.com/issues/50532
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 2bd6ba8026d9374e990abbb2cddd39a87290f261)

4 years agomgr: Set client_check_pool_perm to false
Kotresh HR [Tue, 11 May 2021 11:58:05 +0000 (17:28 +0530)]
mgr: Set client_check_pool_perm to false

When osd is full, checking pool permission causes
mgr to hang. Hence disabling it.

Fixes: https://tracker.ceph.com/issues/50532
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit d95655cc4879c0e3e6edb0edd6e4114c1bdfc226)

4 years agomds: Add full caps to avoid osd full check
Kotresh HR [Mon, 8 Mar 2021 12:08:26 +0000 (17:38 +0530)]
mds: Add full caps to avoid osd full check

Fixes: https://tracker.ceph.com/issues/50532
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 6db81d8479b539d3ca6b98dc244c525e71a36437)

4 years agomds: do not infinitely recursively print a metric 41596/head
Patrick Donnelly [Wed, 2 Jun 2021 14:28:49 +0000 (07:28 -0700)]
mds: do not infinitely recursively print a metric

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

4 years agomds/scrub: write root inode backtrace at creation 41685/head
Milind Changire [Wed, 2 Jun 2021 09:42:09 +0000 (15:12 +0530)]
mds/scrub: write root inode backtrace at creation

Write root inode backtrace as soon as it is created;
Unwritten backtrace always caused scrub to fail for root inode.

Fixes: https://tracker.ceph.com/issues/50976
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 7757f3ea3c1aebb71fd34454751634a822c021bd)

4 years agomgr: Fix orch osd rm stop help message
VasishtaShastry [Mon, 10 May 2021 06:38:59 +0000 (12:08 +0530)]
mgr: Fix orch osd rm stop help message

Corrects help message of `ceph orch osd rm --help`
Doc link - https://docs.ceph.com/en/latest/cephadm/osd/#stopping-osd-removal

Signed-off-by: VasishtaShastry <vipin.indiasmg@gmail.com>
(cherry picked from commit 87fe9cec8ada9ef5d905d2d16f1726e05699398e)

4 years agomgr/cephadm/inventory: do not try to resolve current mgr host
Sage Weil [Thu, 3 Jun 2021 14:29:00 +0000 (10:29 -0400)]
mgr/cephadm/inventory: do not try to resolve current mgr host

The CNI configuration may set up a private network for the container, which
is mapped to the hostname in /etc/hosts.  For example, my test box sets
up 10.88.0.0/24 because I was using crio + kubeadm on this host earlier
(at least I think that's why):

$ sudo podman run --rm --name test123 --entrypoint /bin/bash -it quay.ceph.io/ceph-ci/ceph:master -c "cat /etc/hosts"
127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
10.88.0.8 f9e91bf2478f test123

In any case, we should never trust a lookup of our own hostname from inside
a container!

This isn't quite sufficient, though: if this is a single-host cluster, then
we fall back to using get_mgr_ip(). That value may be distorted by the
public_network option on the mgr, but we don't have any other good
options here, and single-node clusters are unlikely to have complex
network configs.

Refactor a bit to avoid the try/except nesting.

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

4 years agopybind/mgr/mgr_module: make get_mgr_ip() return mgr's IP from mgrmap
Sage Weil [Wed, 2 Jun 2021 02:31:11 +0000 (22:31 -0400)]
pybind/mgr/mgr_module: make get_mgr_ip() return mgr's IP from mgrmap

The previous approach was convoluted: we tried to do a DNS lookup on the
hostname, which would fail if /etc/hosts had an entry.  Which, with podman,
it does.  And the IP it has will vary in all sorts of weird ways.  For
example, CNI on my host means that I get a dynamic address in 10.88.0.0/24.

Avoid all of that nonsense and use the IP that is in the mgrmap.  There
may be multiple IPs (v2 + v1, or maybe even IPv4 + v6 in the future); in
that case, use the first one.

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

4 years agomgr/restful: use get_mgr_ip() instead of hostname
Sage Weil [Wed, 2 Jun 2021 02:31:47 +0000 (22:31 -0400)]
mgr/restful: use get_mgr_ip() instead of hostname

Now we match dashboard!

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

4 years agoosd/PG.cc: handle removal of pgmeta object 41680/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 agomgr/dashboard: API Version changes do not apply to pre-defined methods (list, create... 41675/head
Aashish Sharma [Tue, 1 Jun 2021 05:09:24 +0000 (10:39 +0530)]
mgr/dashboard: API Version changes do not apply to pre-defined methods (list, create etc.)

Methods like list(), create(), get() etc doesn't get applied the version.Also for the endpoints that get the version changed, the docs and the request header has still the version v1.0+ in them. So with the version reduced it gives 415 error when trying to make the request. This PR fixes this issue.

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

Conflicts:
    src/pybind/mgr/dashboard/controllers/__init__.py(resolved conflicts due to https://github.com/ceph/ceph/pull/40063)

4 years agomgr/dashboard: API Version changes doesnt appy to pre-defined methods(list, create...
Aashish Sharma [Wed, 19 May 2021 05:57:13 +0000 (11:27 +0530)]
mgr/dashboard: API Version changes doesnt appy to pre-defined methods(list, create etc.)

Methods like list(), create(), get() etc doesn't get applied the version.Also for the endpoints that get the version changed, the docs and the request header has still the version v1.0+ in them. So with the version reduced it gives 415 error when trying to make the request. This PR fixes this issue.

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

Conflicts:
    src/pybind/mgr/dashboard/controllers/__init__.py(resolved conflicts due to https://github.com/ceph/ceph/pull/40063)
    src/pybind/mgr/dashboard/tests/test_docs.py(removed unused import DEFAULT_VERSION)

4 years agodoc/cephadm: s/the the/the
Zac Dover [Wed, 2 Jun 2021 14:06:06 +0000 (00:06 +1000)]
doc/cephadm: s/the the/the

This removes an extraneous "the" and reworks a
sentence so that it adheres to the grammatical
rules of the English language.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 52701fe8651f9416dbb144284ab1043747e39449)

4 years agodoc/cephadm: enriching "daemon status"
Zac Dover [Mon, 31 May 2021 03:55:20 +0000 (13:55 +1000)]
doc/cephadm: enriching "daemon status"

This PR creates parallel structure for the
text in the "Daemon Status" section of the
cephadm Service Management chapter.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 80dcbc80190c7fc5c25c2df9bb35ad8af1a41a19)

4 years agodoc/cephadm: enriching "Service Specification"
Zac Dover [Mon, 31 May 2021 04:15:56 +0000 (14:15 +1000)]
doc/cephadm: enriching "Service Specification"

This PR adds parallel construction to the "Service
Specification" section of the "Service Managment"
chapter of the cephadm documentation.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit c02fb2b25bc976decabb24cbbb8514ed43f6eddc)