]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agomgr/dashboard: fix unmanaged snmp service creation
Nizamudeen A [Wed, 24 Aug 2022 10:16:54 +0000 (15:46 +0530)]
mgr/dashboard: fix unmanaged snmp service creation

Resolves: rhbz#2080316

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit a35651ee8586133fa666de189b9d324c0846c3ca)
(cherry picked from commit 088c5d05dcdd4278e6e5c39abe41bb525bddcfe1)

2 years agomgr/dashboard: fix unmanged iscsi service creation
Nizamudeen A [Wed, 24 Aug 2022 10:16:10 +0000 (15:46 +0530)]
mgr/dashboard: fix unmanged iscsi service creation

Resolves: rhbz#2080316

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 7d157fe48e21945ef51e21f206639f9abfa44fa5)
(cherry picked from commit 55a0740ef777fb1cb01919a700c463bf6443939c)

2 years agomgr/dashboard: fix unable to create ingress unmanaged
Nizamudeen A [Wed, 24 Aug 2022 07:47:50 +0000 (13:17 +0530)]
mgr/dashboard: fix unable to create ingress unmanaged

the following snipped is the error from backend

```
 File "/lib/python3.6/site-packages/ceph/deployment/service_spec.py", line 698, in _from_json_impl
                                                  _cls.validate()
                                                File "/lib/python3.6/site-packages/ceph/deployment/service_spec.py", line 1058, in validate
                                                  'Cannot add ingress: No frontend_port specified')
                                              ceph.deployment.hostspec.SpecValidationError: Cannot add ingress: No frontend_port specified
```

It looks like even if we set unmanaged flag, we need to input the
backend_service, frontend_port, monitor_port and virtual_ip, because there is a
validation going for that in the backend.

https://github.com/ceph/ceph/blob/main/src/python-common/ceph/deployment/service_spec.py#L1050

Resolves: rhbz#2080316

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

2 years agomgr/dashboard: Add daemon logs tab to Logs component
Aashish Sharma [Fri, 6 May 2022 07:09:02 +0000 (12:39 +0530)]
mgr/dashboard: Add daemon logs tab to Logs component

Add Daemon logs to the logs component

Resolves: rhbz#2032839

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit a581660f47d85da0e985c5bcba6e9a6cd6b47dae)
(cherry picked from commit 3374c905b278f37425790a3cc81650f1f7c9376e)

2 years agomgr/dashboard: fix rbdconfiguration init type
Pere Diaz Bou [Wed, 6 Jul 2022 15:47:31 +0000 (17:47 +0200)]
mgr/dashboard: fix rbdconfiguration init type

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 80964fb5204ab18208d1033c927a620448802451)
(cherry picked from commit 110b099e4dee0de6ac6c91746397d9aa2922637f)

Resolves: rhbz#2125432

2 years agomgr/dashboard: fix api tests + lint
Pere Diaz Bou [Tue, 5 Jul 2022 12:57:16 +0000 (14:57 +0200)]
mgr/dashboard: fix api tests + lint

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 08c980ede37f1d2eba08b43ce624994b939a3ca3)
(cherry picked from commit 065c9d4bd10aae24641b3905b060b8b2fc57bbc0)

Resolves: rhbz#2125432

2 years agomgr/dashboard: cleanups
Pere Diaz Bou [Tue, 5 Jul 2022 11:22:42 +0000 (13:22 +0200)]
mgr/dashboard: cleanups

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 23615b3e1b0d479595929d6483856afce67502d2)
(cherry picked from commit c685773a691afe25666166af28fc250b285b6e1b)

Resolves: rhbz#2125432

2 years agomgr/dashboard: RbdConfiguration.list reuse image context.
Pere Diaz Bou [Tue, 5 Jul 2022 10:39:12 +0000 (12:39 +0200)]
mgr/dashboard: RbdConfiguration.list reuse image context.

Image contexts are reopen even though we pass the context as an
argument. This commit changes that so you can forget about reopening
a rbd image context again.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 5a0ead8cc88fd677d882391bddcff5b474a63a9b)
(cherry picked from commit ab6bb136916d62ac9f9919bad4a773f7131e64c8)

Resolves: rhbz#2125432

2 years agomgr/dashboard: change sort char to '+' and page icons
Pere Diaz Bou [Tue, 5 Jul 2022 09:55:51 +0000 (11:55 +0200)]
mgr/dashboard: change sort char to '+' and page icons

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit c01ce41266aeec229d60c302b4da8ed6fac6f2d0)
(cherry picked from commit 25b8ce92f93407bf29cb0dd4015c4a35cb37d4dd)
Resolves: rhbz#2125432

2 years agomgr/dashboard: fix linting errors
Pere Diaz Bou [Tue, 5 Jul 2022 08:10:23 +0000 (10:10 +0200)]
mgr/dashboard: fix linting errors

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 90869173ee4cbe2d9e24e354608995e04793bc7d)
(cherry picked from commit 493873b86be4e4c98b3369f004a00d80ac5084c9)

Resolves: rhbz#2125432

2 years agomgr/dashboard: add rbd list sorting support
Pere Diaz Bou [Mon, 4 Jul 2022 14:57:43 +0000 (16:57 +0200)]
mgr/dashboard: add rbd list sorting support

Support sorting with name, pool name and namespace

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 3c308804d5a7a5e96842e3234edbf6ad42509e93)

Conflict:
- src/pybind/mgr/dashboard/services/rbd.py

remove _rbd_image_stat_parent function because it doesn't exist in quincy.

(cherry picked from commit b115baf9a5e9248cf7e337dd9dbca34749a26c7b)
Resolves: rhbz#2125432

2 years agomgr/dashboard: update rbd list api version to 2
Pere Diaz Bou [Mon, 4 Jul 2022 10:56:03 +0000 (12:56 +0200)]
mgr/dashboard: update rbd list api version to 2

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 5386dd1cb3195e7bc2dd80dafa1f0d29e8e0eb9e)
(cherry picked from commit 076a0d7f86783779d2903d5ce59445e4bd88f59f)

Resolves: rhbz#2125432

2 years agomgr/dashboard: debounce reload data with serverSide
Pere Diaz Bou [Mon, 4 Jul 2022 10:33:36 +0000 (12:33 +0200)]
mgr/dashboard: debounce reload data with serverSide

Whenever we use serverSide (paginate through backend) we should
debounce reloadData since it might call api calls too much times.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit c832464998ed3ed34af3bda37056dfdc1729f4a6)
(cherry picked from commit 84a6f5dad5f1f7f842a5d4283c9b2b246db894ca)

Resolves: rhbz#2125432

2 years agomgr/dashboard: add rbd list search and disable sorting
Pere Diaz Bou [Fri, 1 Jul 2022 08:16:13 +0000 (10:16 +0200)]
mgr/dashboard: add rbd list search and disable sorting

- Disable sorting in each column because it will not be possible to
sort with this pagination implementation.
- Add search capabilities to the rbd list pagination endpoint.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 68ef0b83e9b0ce3ccf854eff9cbf599a263b3e7e)
(cherry picked from commit cd6c679eacb59cf61c3c32c838651375f1655ff6)

Resolves: rhbz#2125432

2 years agomgr/dashboard: fix rbd list tests
Pere Diaz Bou [Wed, 29 Jun 2022 11:37:17 +0000 (13:37 +0200)]
mgr/dashboard: fix rbd list tests

X-Total-Count header was missing from rbdservice.list spy mock

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 08b6f22807c14967fb49495ca9f18124d495b19b)
(cherry picked from commit f8fecbe4c4ffcffe65b8e588fbe3d36a2d85f3f7)

Resolves: rhbz#2125432

2 years agomgr/dashboard: fix frontend unit tests
Nizamudeen A [Tue, 28 Jun 2022 17:33:04 +0000 (23:03 +0530)]
mgr/dashboard: fix frontend unit tests

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit a27eea3e8c834eb6e148aeef72a5e8522d81ef97)
(cherry picked from commit 6e6ca42b0106b586bc5a3f9c606e8639968ecad8)

Resolves: rhbz#2125432

2 years agomgr/dashboard: if null tablecontext then create empty one
Pere Diaz Bou [Tue, 28 Jun 2022 13:58:11 +0000 (15:58 +0200)]
mgr/dashboard: if null tablecontext then create empty one

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 4060061014506ed1edd32936f54ed46d489c0f11)
(cherry picked from commit d80a53bd477a44d2de11d1c787b043c28f3bfd07)

Resolves: rhbz#2125432

2 years agomgr/dashboard: more linting
Pere Diaz Bou [Fri, 17 Jun 2022 11:57:53 +0000 (13:57 +0200)]
mgr/dashboard: more linting

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 27f40514ebc87a05144989be9aa1abb700f49566)
(cherry picked from commit e42e70ff7fb04aec88654dfa4a36b611d46929dd)

Resolves: rhbz#2125432

2 years agomgr/dashboard: fix tests and iscsi rbd list
Pere Diaz Bou [Fri, 17 Jun 2022 11:02:28 +0000 (13:02 +0200)]
mgr/dashboard: fix tests and iscsi rbd list

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 78523ec030621be548c4e3ecb8802d0b5c7bd8e8)
(cherry picked from commit 1a02e9c98e8afb8242323ad0b34e71e3e4fa3644)

Conflicts:
  src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
remove timer import

Resolves: rhbz#2125432

2 years agomgr/dashboard: bind serverSide to externalPaging
Pere Diaz Bou [Thu, 16 Jun 2022 09:15:35 +0000 (11:15 +0200)]
mgr/dashboard: bind serverSide to externalPaging

Count won't be used unless externalPaging is set to true.
remove paginated import

task list service needed to be updated in order to have extra
params. This commit introduces that param.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit dbf2552ca57d90f6551553d25ca493375eb1e700)
(cherry picked from commit d154d4383c9a2196daabcc906e6077129dd1db04)

Resolves: rhbz#2125432

2 years agomgr/dashboard: rbd pagination poc
Pere Diaz Bou [Mon, 13 Jun 2022 15:15:45 +0000 (17:15 +0200)]
mgr/dashboard: rbd pagination poc

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit efd9a8ba5c9194e89b95aae021f62f3e164f3581)
(cherry picked from commit a1fbe19b0aae53bead3d7d4feebc71f4af2eb5a7)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts

Add pageinfo import

Resolves: rhbz#2125432

2 years agomgr/cephadm: Fix how we check if a host belongs to public network
Redouane Kachach [Wed, 31 Aug 2022 11:49:37 +0000 (13:49 +0200)]
mgr/cephadm: Fix how we check if a host belongs to public network
Fixes: https://tracker.ceph.com/issues/57060
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 1c8833feaf42fd518e19c9a347c6c5781943862a)
(cherry picked from commit 511996b755d333fba60c843634a02a11c9b3ba38)

Resolves: rhbz#2104947

2 years agomgr/cephadm: allow binding to loopback for rgw daemons
Redouane Kachach [Fri, 26 Aug 2022 12:00:05 +0000 (14:00 +0200)]
mgr/cephadm: allow binding to loopback for rgw daemons
Fixes: https://tracker.ceph.com/issues/57304
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 1a722f35c1f40353dbdf06fdb63364822ebaeffc)
(cherry picked from commit e9fc20351b74be2d44c63f7bc3aeddb5a87b02f9)

Resolves: rhbz#2018245

2 years agomgr/cephadm: recreate osd config when redeploy/reconfiguring
Adam King [Tue, 2 Aug 2022 20:29:04 +0000 (16:29 -0400)]
mgr/cephadm: recreate osd config when redeploy/reconfiguring

OSDs have a config file that includes addresses for the mon daemons.
We already have in place logic to cause a reconfig of OSDs if the mon map
changes, but when we do we aren't actually regenerating the config
so it's never updated with the new mon addresses. This change is to
have us recreate the OSD config when we redeploy or reconfig an OSD
so it gets the new mon addresses.

Fixes: https://tracker.ceph.com/issues/57007
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 13358f52e0e1b57fa0e7afc27956e1503a373fc2)
(cherry picked from commit ba5bdcf698050d17b5b400284150c506f225c0d4)

Resolves: rhbz#2111525

2 years agocephadm: return nonzero exit code when applying spec fails in bootstrap
Adam King [Wed, 17 Aug 2022 20:54:54 +0000 (16:54 -0400)]
cephadm: return nonzero exit code when applying spec fails in bootstrap

This is mostly useful for testing automation, but right now if applying the
spec provided with --apply-spec fails, the return code remains zero. We don't
want to error out entirely in that case as we still want to print the remaining
output (e.g. the dashboard password). Continuing onward and then returning a
nonzero code could provide a balance where we still give all the output but
still have something to make it easier for those writing automation around bootstrap.

Fixes: https://tracker.ceph.com/issues/57173
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit be17f1d4b30e19aa6039fa5d6a694129cb5f3583)
(cherry picked from commit 04be5915de52d399efcfb93f7bcd4c6fed4e22ef)

Resolves: rhbz#2116689

2 years agomgr/cephadm: unit test for draining with explicit placements
Adam King [Thu, 11 Aug 2022 17:48:48 +0000 (13:48 -0400)]
mgr/cephadm: unit test for draining with explicit placements

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 5cabdbdaa9569ab071167146e8685f8675b53f6d)
(cherry picked from commit 51bcb23bf82fc9480ea5da5c38622a6581c22118)

Revoles: rhbz#2112768

2 years agomgr/cephadm: fix handling of draining hosts with explicit placement specs
Adam King [Fri, 29 Jul 2022 20:10:09 +0000 (16:10 -0400)]
mgr/cephadm: fix handling of draining hosts with explicit placement specs

Basically, if you have a placement that explicitly defines the hosts
to place on, and then add _no_schedule label to one of the hosts (which
should cause all daemons to be removed from the host) cpehadm will simply
fail to apply the spec, saying the host with the _no_schedule label is "Unknown".
This is due to the fact that we remove hosts with the _no_schedule label from
the pool of hosts the scheduler has to work with entirely. If we also provide
the scheduler with a list of currently draining hosts, it can handle this
better and the daemon can be drained off the host as expected.

Fixes: https://tracker.ceph.com/issues/56972
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7e8c07a3dd998dd3745b7f36919a21ca613484e4)
(cherry picked from commit ccdc075ad97d3ed5e58cb15713bd1b548e6e61ca)

Resolves: rhbz#2112768

2 years agoosd, kv: add debugs along the pg_log_t::dups paths.
Radoslaw Zarzynski [Mon, 11 Jul 2022 14:30:34 +0000 (14:30 +0000)]
osd, kv: add debugs along the pg_log_t::dups paths.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 0a986bff372f81e7ea8e015754bb0342c4edfa87)
(cherry picked from commit b06c8ff5bcded20cd5071ed107532d8d84bcfa65)

Resolves: rhbz#2093106

2 years agoosd: write_log_and_missing variants of PGLog take DoutPrefixProvider
Radoslaw Zarzynski [Mon, 11 Jul 2022 16:39:59 +0000 (16:39 +0000)]
osd: write_log_and_missing variants of PGLog take DoutPrefixProvider

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit ff8dccda951db39fd9b669e167b4366fb26323c0)
(cherry picked from commit 623014d931e20e3eaae9f260ccd2558ce46cac32)

Resolves: rhbz#2093106

2 years agoosd: warn about too many dups when loading PGLog
Radoslaw Zarzynski [Mon, 11 Jul 2022 14:08:32 +0000 (14:08 +0000)]
osd: warn about too many dups when loading PGLog

Fixes: https://tracker.ceph.com/issues/53729
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 7376caac965d303d8ee92de6f663405e4f96fe4c)
(cherry picked from commit f2cdf5b457df141305f491ab37a33af3569f6983)

Resolves: rhbz#2093106

2 years agoosd, tools: read_log_and_missing of PGLog takes CephContext
Radoslaw Zarzynski [Mon, 11 Jul 2022 17:02:20 +0000 (17:02 +0000)]
osd, tools: read_log_and_missing of PGLog takes CephContext

Will be needed for dealing with the conf.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit fb746dd346f350e43ad1c35244dc3a1eb6bc22f3)
(cherry picked from commit 145b331eb82e0b3acc619f54faf761c3d9f59a6f)

Resolves: rhbz#2093106

2 years agotest/PGlog: cherry-pick PGLogTrimTest changes for size-based trimming
NitzanMordhai [Tue, 9 Aug 2022 09:37:13 +0000 (09:37 +0000)]
test/PGlog: cherry-pick PGLogTrimTest changes for size-based trimming

This commit brings the changes to the `PGLogTrimTest` that were a part
of the initial fix for dups trimming issue (commit 0d253bcc09a5540fa6c724f6128fb7436ded5ec1)
that got reverted in the meantime by 9bf0053bc99971c0e8591490acbdd635a5bb5145.

Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>
(cherry picked from commit 245fa4883fae8d1e13614999ae01e2d71ae81809)
(cherry picked from commit b67e852da8059d1fdba26961a232a3e56283c9c7)

Resolves: rhbz#2093106

2 years agoosd: trim dups regardless of their versions
Radosław Zarzyński [Wed, 15 Jun 2022 15:19:30 +0000 (17:19 +0200)]
osd: trim dups regardless of their versions

Fixes: https://tracker.ceph.com/issues/53729
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit aada08acde7a05ad769bb7a886ebcece628d522c)
(cherry picked from commit 9461ab0bd447ba8a4e05d59841b4aaff1951a7f3)

Resolves: rhbz#2093106

2 years agotools/ceph_objectstore_tool: Add duplicate pg log entries injection
NitzanMordhai [Wed, 15 Jun 2022 10:58:26 +0000 (10:58 +0000)]
tools/ceph_objectstore_tool: Add duplicate pg log entries injection

To be able to recreate and test pg log duplicate entries, a new option
added to the COT: --op pg-log-inject-dups we will also need to provide
--file json_arry of dups, it can get as many dups that need to be inject

the json for dups is in the following format:
{"reqid": "client.n.n:n", "version": "n'n", "user_version": n, "return_code": n}

Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>
(cherry picked from commit b59ccfd3fda52121e78ce5d0e04f9ef931480861)
(cherry picked from commit 124d097a86d273cfebd8d54a467ad220f56bcc21)

Resolves: rhbz#2093106

2 years agoosd/scrub: Reintroduce scrub starts message
Prashant D [Tue, 31 May 2022 05:07:47 +0000 (06:07 +0100)]
osd/scrub: Reintroduce scrub starts message

Whenever the scrubbing process starts for a PG, We used to log
scrub/deep-scrub "starts" message in the cluster log. We are
not seeing scrub "starts" messages anymore. Reintroduce scrub
starts message in order to calculate exact time taken to
scrub/deep-scrub the PG.

Fixes: https://tracker.ceph.com/issues/55798
Resolves: rhbz#2094955

Signed-off-by: Prashant D <pdhange@redhat.com>
(cherry picked from commit 2f6272ac8546070cbc78447c558db47dbdff113c)

2 years agotools/ceph-dencoder: add MMgrUpdate to ceph-dencoder tool
Laura Flores [Tue, 5 Jul 2022 14:59:07 +0000 (14:59 +0000)]
tools/ceph-dencoder: add MMgrUpdate to ceph-dencoder tool

Resolves: rhbz#2121265

Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit e2ddf9fea5f714f4934910cebef846f11e859f15)

2 years agomgr: Remove service_daemon handling from MMgrUpdate
Prashant D [Fri, 24 Jun 2022 15:10:03 +0000 (11:10 -0400)]
mgr: Remove service_daemon handling from MMgrUpdate

The service_daemon is only required if client services
needs to be registered with mgr. The service_daemon
handling is not required in case of MMgrUpdate as it
handles mon metadata updates only.

Fixes: https://tracker.ceph.com/issues/55322
Resolves: rhbz#2121265

Signed-off-by: Prashant D <pdhange@redhat.com>
(cherry picked from commit 6540937a6d1865642dd799b4996d85d2ee9a99ad)

2 years agomgr, mon: Keep upto date metadata with mgr for MONs
Prashant D [Mon, 28 Mar 2022 13:02:08 +0000 (14:02 +0100)]
mgr, mon: Keep upto date metadata with mgr for MONs

The mgr updates mon metadata through handle_mon_map which
gets triggered when MONs were removed/added from/to cluster or
the active mgr is restarted or mgr failsover.
We could have handled metadata update through MMgrOpen or
early MMgrReport messages but these are sent before monitor
electin completes and lead monitor updates pending metadata
in monstore. Instead of relying on fetching mon metadata using
'ceph mon metadata <id>' command, explicitly send metadata
update request with mon metadata to mgr.

Fixes: https://tracker.ceph.com/issues/55088
Resolves: rhbz#2121265

Signed-off-by: Prashant D <pdhange@redhat.com>
(cherry picked from commit 1a065043b964f8c014ebb5bc890a243c398ff07c)

2 years agomgr/dashboard: Improve column spacing in alerts tab
Aashish Sharma [Wed, 22 Jun 2022 11:47:24 +0000 (17:17 +0530)]
mgr/dashboard: Improve column spacing in alerts tab

This PR intends to fix the column spacing in the alert list in the alerts tab
Fixes:https://tracker.ceph.com/issues/56165

Resolves rhbz#2047629

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit d60ca04c965446cfde20a0b7bfdd76393815c1bb)
(cherry picked from commit 41788f0b611dae1934fb9678bcefcf7284f85004)

2 years agomgr/dashboard: disable iscsi
Pedro Gonzalez Gomez [Tue, 23 Aug 2022 11:21:48 +0000 (13:21 +0200)]
mgr/dashboard: disable iscsi

Resolves: rhbz#2119931
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
2 years agomgr/dashboard: Hide maintenance option on expand cluster
Nizamudeen A [Wed, 15 Jun 2022 18:52:12 +0000 (00:22 +0530)]
mgr/dashboard: Hide maintenance option on expand cluster

Resolves: rhbz#2041405

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

2 years agomsg: Log at higher level when Throttle::get_or_fail() fails
Brad Hubbard [Tue, 30 Aug 2022 03:44:22 +0000 (13:44 +1000)]
msg: Log at higher level when Throttle::get_or_fail() fails

Fixes: https://tracker.ceph.com/issues/56495
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 9c2a18f794afb617c35925ae1aeae02517be85d1)

Resolves: rhbz#1647624

2 years agocmake: remove spaces in macro used for compiling cython code
Kefu Chai [Fri, 5 Aug 2022 08:40:41 +0000 (16:40 +0800)]
cmake: remove spaces in macro used for compiling cython code

we are facing following FTBFS on jammy + GCC-11.2 + Cython 0.29 +
CMake 3.22:

creating /home/jenkins-build/build/workspace/ceph-api/build/lib/cython_modules/temp.linux-x86_64-3.10/home/jenkins-build/build/workspace/ceph-api/build/src/pybind/cephfs
compile options: '-I/usr/include/python3.10 -I/usr/include/python3.10 -c'
extra options: '-Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O2 -Wall -g -fstack-protector-strong -Wformat -Werror=format-security -g -fwrapv -O2 -iquote/home/jenkins-build/build/workspace/ceph-api/src/include -w -Dvoid0=dead_function(void) -D__Pyx_check_single_interpreter(ARG)=ARG ## 0 -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O2 -Wall -g -fstack-protector-strong -Wformat -Werror=format-security -g -fwrapv -O2'
cc: /home/jenkins-build/build/workspace/ceph-api/build/src/pybind/cephfs/cephfs.c
cc: warning: ##: linker input file unused because linking not done
cc: error: ##: linker input file not found: No such file or directory
cc: warning: 0: linker input file unused because linking not done
cc: error: 0: linker input file not found: No such file or directory

it seems cython is not able to escape the space in the "extra options"
anymore, so the "##" and "0" are considered as object files passed to
compiler in addition to cephfs.c.

in this change the spaces are removed to help cython to make the right
decision.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 5824fed5b427f1d055fb7104fea2e68cd36e6844)
Resolves: rhbz#118423
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agorgw: Guard against malformed bucket URLs
Adam C. Emerson [Fri, 8 Jul 2022 18:58:16 +0000 (14:58 -0400)]
rgw: Guard against malformed bucket URLs

Misplaced colons can result in radosgw thinking is has a bucket URL
but with no bucket name, leading to a crash later on.

Fixes: https://tracker.ceph.com/issues/55765
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 3ee9a3b41a289a926fed8b8927ca2a93b4f120a6)
Fixes: https://tracker.ceph.com/issues/56585
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit f0da8c00a849ab739ba2adfa600616ce921a2055)
Resolves: rhbz#118423
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agorgw: Fix `rgw::sal::Bucket::empty` static method signatures
Adam C. Emerson [Mon, 11 Jul 2022 15:52:09 +0000 (11:52 -0400)]
rgw: Fix `rgw::sal::Bucket::empty` static method signatures

`unique_ptr` overload should take by reference.

Both should be const.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit b1d3e6c00674ebf6bde08968789a426d65db73d9)

Conflicts:
src/rgw/rgw_sal.h
 - `unique_ptr` overload of empty

Fixes: https://tracker.ceph.com/issues/56585
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit e40ce4a3511e669e761da5f39d81b14e6cdbdeba)
Resolves: rhbz#118423
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agocephadm: continue to support --yes-i-know flag
Adam King [Mon, 22 Aug 2022 13:34:12 +0000 (09:34 -0400)]
cephadm: continue to support --yes-i-know flag

Signed-off-by: Adam King <adking@redhat.com>
Resolves: rhbz#2073030

2 years agocephadm: add "su root root" to cephadm.log logrotate config
Adam King [Tue, 19 Jul 2022 19:02:47 +0000 (15:02 -0400)]
cephadm: add "su root root" to cephadm.log logrotate config

Fixes: https://tracker.ceph.com/issues/56639
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit c0929e7e3ea14b0f8bfc71dc8ff74efddafb3ffc)
(cherry picked from commit e890629d694f28ab288ae8e1b17824c306b7afe0)

Resolves: rhbz#2099670

2 years agomgr/cephadm: use hostname from crush map for osd memory autotuning
Adam King [Fri, 3 Jun 2022 01:32:53 +0000 (21:32 -0400)]
mgr/cephadm: use hostname from crush map for osd memory autotuning

Fixes: https://tracker.ceph.com/issues/55841
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 50f28aa56edd348c3816335bef3bbfaf5133ae54)
(cherry picked from commit 8ac0eaed304f151ec3d9801abbca7eed9c88383a)

Resolves: rhbz#2107849

2 years agomgr/cephadm: store device info separately from rest of host cache
Adam King [Mon, 23 May 2022 19:57:14 +0000 (15:57 -0400)]
mgr/cephadm: store device info separately from rest of host cache

device info tends to take up the most space out of
everything, so the hope is by giving it its own
location in the config key store we can avoid hitting
issues where the host cache value we attempt to
place in the config key store exceeds the size limit

Fixes: https://tracker.ceph.com/issues/54251
Fixes: https://tracker.ceph.com/issues/53624
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit e35d4144d380cef190a04517b4d7b30d520d5b4f)
(cherry picked from commit f9cf5f1316e4ea2e9e86ddd70351b644198a582b)

Resolves: rhbz#2053276

2 years agoosd/SnapMapper: fix pacific legacy key conversion and introduce test
Manuel Lausch [Thu, 30 Jun 2022 12:29:53 +0000 (14:29 +0200)]
osd/SnapMapper: fix pacific legacy key conversion and introduce test

Octopus modified the SnapMapper key format from

  <LEGACY_MAPPING_PREFIX><snapid>_<shardid>_<hobject_t::to_str()>

to

  <MAPPING_PREFIX><pool>_<snapid>_<shardid>_<hobject_t::to_str()>

When this change was introduced, 94ebe0ea also introduced a conversion
with a crucial bug which essentially destroyed legacy keys by mapping them
to

  <MAPPING_PREFIX><poolid>_<snapid>_

without the object-unique suffix.  This commit fixes this conversion going
forward, but a fix for existing clusters still needs to be developed.

Fixes: https://tracker.ceph.com/issues/56147
Signed-off-by: Manuel Lausch <manuel.lausch@1und1.de>
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 66bea86ab447b2db8a948c7913dc6c7a4a995c31)
(cherry picked from commit 9b5fbb8cb80c1d606f138bdbdce62686c084207a)

Resolves: rhbz#2107404

2 years agomgr: relax "pending_service_map.epoch > service_map.epoch" assert
Mykola Golub [Thu, 21 Apr 2022 08:57:25 +0000 (11:57 +0300)]
mgr: relax "pending_service_map.epoch > service_map.epoch" assert

When we are activating we may receive several service map updates
initiated by the previous active mgr. Treat them all as initial map.

The code also adds "pending_service_map_dirty == 0" assert, which we
expect is true when receiving an initial map -- otherwise we can't
just initialize pending_service_map with received map.

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

Resolves: rhbz#1984881

2 years agomgr/dashboard: add rbd primary info
Pere Diaz Bou [Wed, 1 Jun 2022 10:44:35 +0000 (12:44 +0200)]
mgr/dashboard: add rbd primary info

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Resolves: rhbz#2115243

2 years agomgr/dashboard: add cephadm e2e tests for checking count for services instances
Avan Thakkar [Wed, 3 Aug 2022 08:45:02 +0000 (14:15 +0530)]
mgr/dashboard: add cephadm e2e tests for checking count for services instances

Resolves: rhbz#2101771

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 25b03d85153e368098ebe5bf066f0872449af729)

2 years agomgr/dashboard: cluster > hosts: host list tables doesn't show all services deployed
Avan Thakkar [Mon, 25 Jul 2022 13:49:22 +0000 (19:19 +0530)]
mgr/dashboard: cluster > hosts: host list tables doesn't show all services deployed

Resolves: rhbz#2101771

Fixes: https://tracker.ceph.com/issues/53210
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Service instances was displaying only the ceph services, but with these changes it'll display instances
of cephadm services as well.

(cherry picked from commit 4d50da7629145d40da3a2820c3b5c8cdb2bca33f)

2 years agomgr/dashboard: rbd image primary ui
Pedro Gonzalez Gomez [Fri, 3 Jun 2022 10:13:44 +0000 (12:13 +0200)]
mgr/dashboard: rbd image primary ui

Resolves: rhbz#2115243

Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 1a17bd27a08d87ef24457788542f064f4e917d54)

2 years agomgr/dashboard: fix linting issues
Pere Diaz Bou [Tue, 21 Jun 2022 08:34:56 +0000 (10:34 +0200)]
mgr/dashboard: fix linting issues

Resolves: rhbz#1891012

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 536c3833d990c95cd7b8e46e84abc43d7ffe8607)

2 years agomgr/dashboard: Error page cleanup
Nizamudeen A [Wed, 15 Jun 2022 17:22:39 +0000 (22:52 +0530)]
mgr/dashboard: Error page cleanup

Resolves: rhbz#1891012

Some error page cleanups

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit ec899f2de30760edd6aa10fb7d5bdd61fadf83af)

2 years agomgr/dashboard: configure rbd mirroring
Nizamudeen A [Mon, 6 Jun 2022 05:51:29 +0000 (11:21 +0530)]
mgr/dashboard: configure rbd mirroring

Resolves: rhbz#1891012

One-click button in the case of an orch cluster for configuring the
rbd-mirroring when its not properly setup. This button will create an
rbd-mirror service and also an rbd labelled pool(replicated: size-3) (if they are not
existing)

Fixes: https://tracker.ceph.com/issues/55646
Signed-off-by: Nizamudeen A <nia@redhat.com>
 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/error/error.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.ts

This commits had minor conflicts where the addition of dashboardButton
had to be explicitly added and the state of api/orch/status in
module-status-guard had to be updated.

(cherry picked from commit e918150212074a757c95f05ecb9d528ff1fe6e06)

2 years agomgr/dashboard: add rbd status endpoint
Melissa Li [Thu, 26 May 2022 18:07:30 +0000 (14:07 -0400)]
mgr/dashboard: add rbd status endpoint

Resolves: rhbz#1891012

Show "No RBD pools available" error page when accessing block/rbd if there are no rbd pools.
Add a "button_name" and "button_route" property to `ModuleStatusGuardService` config to customize the button on the error page.
Modify `ModuleStatusGuardService` to execute API calls to `/ui-api/<uiApiPath>/status` which uses the `UIRouter`.

Fixes: https://tracker.ceph.com/issues/42109
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit 6ac9b3cfe171a8902454ea907b3ba37d83eda3dc)
(cherry picked from commit f150637b0417d5877c8dc9d125f8e9cc837fec71)

2 years agomgr/dashboard: improve edit site name action in rbd-mirroring
Nizamudeen A [Mon, 13 Jun 2022 08:24:15 +0000 (13:54 +0530)]
mgr/dashboard: improve edit site name action in rbd-mirroring

Resolves: rhbz#1891012

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

2 years agomgr/dashboard: rbd force resync from fornt-end
Sarthak0702 [Thu, 2 Jun 2022 22:58:31 +0000 (04:28 +0530)]
mgr/dashboard: rbd force resync from fornt-end

Resolves: rhbz#1891012

Signed-off-by: Sarthak0702 <sarthak.dev.0702@gmail.com>
(cherry picked from commit 2b005395818700185e2c0f7713fae0c321471b2d)

2 years agomgr/dashboard: fix mirroring e2e and lint errors
Avan Thakkar [Wed, 8 Jun 2022 11:03:18 +0000 (16:33 +0530)]
mgr/dashboard: fix mirroring e2e and lint errors

Resolves: rhbz#1891012

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit e95ba57e49aad7187f4593d448c8112fb2e28812)

2 years agomgr/dashboard: add byte info, move state, add idle state
Pere Diaz Bou [Tue, 7 Jun 2022 17:57:44 +0000 (19:57 +0200)]
mgr/dashboard: add byte info, move state, add idle state

Resolves: rhbz#1891012

Idle substate added from snapshot mode.
Instead of seconds info we display bytes and entries info.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 453446104b8fe86b3f561b99a7b5a5838ee89478)

2 years agomgr/dashboard: move replaying images to Syncing tab
Pere Diaz Bou [Mon, 30 May 2022 14:10:11 +0000 (16:10 +0200)]
mgr/dashboard: move replaying images to Syncing tab

Resolves: rhbz#1891012

Images with 'Replaying' state will be displayed in Syncing tab. syncTmpl
removed as it was unnecessary if sate is provided from the backend.

Replaying images in contrast of Syncing images don't have a progress
percentage, nevertheless, we have an approximation of how much time left
there is until the image is fully synced. Therefore, we can use seconds_until_synced to represent the progress.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit d225328363abc22f1f30f1a740e4d83faa0dfb8c)

2 years agomgr/dashboard: snapshot mirroring from dashboard
Pere Diaz Bou [Fri, 13 May 2022 15:15:33 +0000 (17:15 +0200)]
mgr/dashboard: snapshot mirroring from dashboard

Resolves: rhbz#1891012

Enable snapshot mirroring from the Pools -> Image

Also show the mirror-snapshot in the image where snapshot is enabled

When parsing images if an image has the snapshot mode enabled, it will
try to  run commands that don't work with that mode. The solution was
not running those for now and appending the mode in the get call.

Fixes: https://tracker.ceph.com/issues/55648
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Signed-off-by: Nizamudeen A <nia@redhat.com>
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 489a385a95d6ffa5dbd4c5f9c53c1f80ea179142)
(cherry picked from commit 3ca9ca7e215562912daf00ca3cca40dbc5d560b5)

2 years agomgr/dashboard: expose image mirroring commands as endpoints
Pere Diaz Bou [Thu, 12 May 2022 18:29:01 +0000 (20:29 +0200)]
mgr/dashboard: expose image mirroring commands as endpoints

Resolves: rhbz#1891012

Expose:
  - enable/disable mirroring in image
  - promote/demote (primary and non-primary)
  - resync
  - snapshot mode:
    - mirror image snapshot (manual snapshot)
    - schedule

Fixes: https://tracker.ceph.com/issues/55645
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 8bd89415fe340512f457acd58225934e9ed8e4e1)
(cherry picked from commit a1922767f984d9173e67c828ade54ac84cfe8f51)

2 years agomgr/dashboard:Get "Different Storage Class" metrics in Prometheus dashboard
Aashish Sharma [Tue, 19 Jul 2022 09:04:18 +0000 (14:34 +0530)]
mgr/dashboard:Get "Different Storage Class" metrics in Prometheus dashboard

Get metrics of the different "HDDRule" and "MixedUse" classes of the "Raw Storage" for their ceph VMs. So that Prometheus can scrape the data and display it to them in grafana

Resolves: rhbz#2095632

Fixes: https://tracker.ceph.com/issues/56625
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 20705677acd5935981bd8510702b47e1b0678d27)
(cherry picked from commit 895536fb050e2767aa67373357569c8e4994693e)

2 years agorbd: remove incorrect use of std::includes()
Ilya Dryomov [Fri, 12 Aug 2022 09:10:45 +0000 (11:10 +0200)]
rbd: remove incorrect use of std::includes()

- std::includes() requires sorted ranges but command specs aren't
  sorted
- std::includes() purpose is to check whether the second range is
  a subsequence of the first range but here the size of the second
  range is always equal to the size of the first range, which means
  that, had the ranges been sorted, std::includes() would have checked
  straight equality

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

Resolves: rhbz#2117166

2 years agorbd: find_action() should sort actions first
Ilya Dryomov [Fri, 12 Aug 2022 09:10:45 +0000 (11:10 +0200)]
rbd: find_action() should sort actions first

The order in which objects with static storage duration in
different TUs are initialized is undefined.  If the compiler
chooses to initialize Shell::Action objects in action/Trash.cc
before Shell::Action objects in action/TrashPurgeSchedule.cc,
all "rbd trash purge schedule ..." commands get shadowed by
"rbd trash purge" command:

$ rbd trash purge schedule list
rbd: too many arguments

The confusing error arises because "rbd trash purge" takes a single
positional argument.  "schedule" gets interpreted as <pool-spec> and
"list" generates an error.

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

Resolves: rhbz#2117166

2 years agodoc/cephadm: os tuning profile documentation
Adam King [Thu, 23 Jun 2022 19:46:22 +0000 (15:46 -0400)]
doc/cephadm: os tuning profile documentation

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

Resolves: rhbz#2068335

2 years agomgr/cephadm: unit tests for tuned os profiles
Adam King [Thu, 23 Jun 2022 16:57:14 +0000 (12:57 -0400)]
mgr/cephadm: unit tests for tuned os profiles

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 4f6ee4e20b74bc545b0c44db0208b94a54c648e1)
(cherry picked from commit 35dfeba771feb814f4e83f2624fad3b129d2432c)

Resolves: rhbz#2068335

2 years agomgr/cephadm: support for os tuning profiles
Adam King [Tue, 31 May 2022 20:22:49 +0000 (16:22 -0400)]
mgr/cephadm: support for os tuning profiles

Fixes: https://tracker.ceph.com/issues/55819
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 91e6e80ce38031d5eba148efd7c4aaede09021ac)

Conflicts:
src/python-common/ceph/deployment/service_spec.py
(cherry picked from commit 26d5f9230b57635ea46aa9a3367bbae28ac1c389)

Resolves: rhbz#2068335

2 years agoosd: Handle oncommits and wait for future work items from mClock queue
Sridhar Seshasayee [Thu, 21 Jul 2022 16:01:55 +0000 (21:31 +0530)]
osd: Handle oncommits and wait for future work items from mClock queue

When a worker thread with the smallest thread index waits for future work
items from the mClock queue, oncommit callbacks are called. But after the
callback, the thread has to continue waiting instead of returning back to
the ShardedThreadPool::shardedthreadpool_worker() loop. Returning results
in the threads with the smallest index across all shards to busy loop
causing very high CPU utilization.

The fix involves reacquiring the shard_lock and waiting on sdata_cond
until notified or until time period lapses. After this, the smallest
thread index repopulates the oncommit queue from the context_queue
if there were any additions.

Fixes: https://tracker.ceph.com/issues/56530
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 180a5a7bffd4d96c472cc39447717958dd51bbd9)
(cherry picked from commit 2207f8d7318ba219f071fa1fa2f1cb553b7e06c2)

Resolves: rhbz#2114612

2 years agomgr/dashboard: add required validation for frontend and monitor port
Avan Thakkar [Mon, 25 Jul 2022 10:34:00 +0000 (16:04 +0530)]
mgr/dashboard: add required validation for frontend and monitor port

Resolves: rhbz#2080916

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

2 years agomgr/dashboard: Show error on creating service with duplicate service id
Aashish Sharma [Mon, 25 Jul 2022 08:18:39 +0000 (13:48 +0530)]
mgr/dashboard: Show error on creating service with duplicate service id

Resolves: rhbz#2064850

Fixes: https://tracker.ceph.com/issues/56689
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 07cfd44193f6ebd552d13325858e8b5b5c131bfb)
(cherry picked from commit 3afb825a683bea24b691fc6887ba8923469ff440)

2 years agomgr/dashboard: ingress backend service should list all supported services
Avan Thakkar [Wed, 6 Jul 2022 09:24:26 +0000 (14:54 +0530)]
mgr/dashboard: ingress backend service should list all supported services

Resolves: rhbz#2102776

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

2 years agomgr/dashboard: do not recommend throughput for ssd's only cluster
Nizamudeen A [Mon, 18 Jul 2022 05:38:28 +0000 (11:08 +0530)]
mgr/dashboard: do not recommend throughput for ssd's only cluster

This is just a bug fix where we recommend the throughput option even if
there are only ssd's are present in the cluster.

Resolves: rhbz#2101680

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

2 years agomgr/dashboard: iops optimized option enabled
Pere Diaz Bou [Thu, 5 May 2022 14:34:36 +0000 (16:34 +0200)]
mgr/dashboard: iops optimized option enabled

Resolves: rhbz#2101680

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 6fd7b91d3795c93a0e520ea9adc6ed34d2d91a89)

2 years agomgr/dashboard: test througput deployment option
Pere Diaz Bou [Fri, 6 May 2022 08:48:32 +0000 (10:48 +0200)]
mgr/dashboard: test througput deployment option

Resolves: rhbz#2101680

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit d58b9499208cd611897518009495f9e80515349d)
(cherry picked from commit 842ce6c33c91436bf400512b00f152d2e089a938)

2 years agomgr/dashboard: throughput optimized option enabled
Pere Diaz Bou [Tue, 3 May 2022 12:28:22 +0000 (14:28 +0200)]
mgr/dashboard: throughput optimized option enabled

Resolves: rhbz#2101680

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit f2474bcb767893dc750b8f1231b4583925f9bfb1)
(cherry picked from commit a00fa3df760edef52d46638b1de3bd03a4b851be)

2 years agomgr/dashboard: OSD Creation Workflow initial works
Nizamudeen A [Tue, 22 Feb 2022 10:21:03 +0000 (15:51 +0530)]
mgr/dashboard: OSD Creation Workflow initial works

Introducing the Cost/Capacity Optimized deployment option
Used bootstrap accordion
Adapted the e2e but not written new tests for the deployment option

Resolves: rhbz#2101680

Fixes: https://tracker.ceph.com/issues/54340
Fixes: https://tracker.ceph.com/issues/54563
Signed-off-by: Nizamudeen A <nia@redhat.com>
Signed-off-by: Sarthak0702 <sarthak.0702@gmail.com>
(cherry picked from commit 6c2dcb740efb793a3f6ef593793151a34c19ca01)
(cherry picked from commit b350266d9758c29e559849c2527bbd3d5cbb0a22)

2 years agomgr/dashboard: retrieve disk status
Pere Diaz Bou [Fri, 4 Mar 2022 08:58:36 +0000 (09:58 +0100)]
mgr/dashboard: retrieve disk status

Resolves: rhbz#2101680
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit a1d1c853a5e4ff9a317591b99b75e005ccc862c9)
(cherry picked from commit 1ee11d090d11fdb438abe3ed5073e39daa43c2e8)

2 years agomgr/dashboard: Dashboard should display some helpful (error) message when the iframe...
Ngwa Sedrick Meh [Mon, 14 Feb 2022 05:17:47 +0000 (06:17 +0100)]
mgr/dashboard: Dashboard should display some helpful (error) message when the iframe-embedded Grafana dashboard failed to load

This commit adds checks for successful grafana panel loads before displaying dashboards and informs the user if the request is blocked by the browser

Resolves: rhbz#2056478
Fixes: https://tracker.ceph.com/issues/54206
Signed-off-by: Ngwa Sedrick Meh <nsedrick101@gmail.com>
(cherry picked from commit a4b66efb2a2139bd88a6a088af9bd5e079e46105)
(cherry picked from commit 30fa3dbe654471072352a5027a5b363143e3f8f7)

2 years agomgr/dashboard: branding: Update doc URLS
Nizamudeen A [Tue, 11 Aug 2020 11:19:36 +0000 (16:49 +0530)]
mgr/dashboard: branding: Update doc URLS

Updating all the doc urls to point it to the downstream

Resolves: rhbz#2106618
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/dashboard: branding: apply patternfly to all elements
Nizamudeen A [Sun, 1 Nov 2020 10:51:04 +0000 (16:21 +0530)]
mgr/dashboard: branding: apply patternfly to all elements

Resolves: rhbz#2106618
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit db7fec96c8d8a0ee5aa6939a8971c5eac661265c)

2 years agomgr/dashboard: branding: About modal box
Nizamudeen A [Fri, 6 Nov 2020 10:05:38 +0000 (15:35 +0530)]
mgr/dashboard: branding: About modal box

Resolves: rhbz#2106618
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/dashboard: branding: Navigation and Notification bar
Nizamudeen A [Wed, 21 Oct 2020 18:34:04 +0000 (00:04 +0530)]
mgr/dashboard: branding: Navigation and Notification bar

Resolves: rhbz#2106618

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit cfd7da700db0a78c84293115550800ed8db2775f)

2 years agomgr/dashboard: branding: login page pacific
Nizamudeen A [Mon, 31 Aug 2020 11:09:50 +0000 (16:39 +0530)]
mgr/dashboard: branding: login page pacific

Resolves: rhbz#2106618
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit deffbb9454a79c1b453ef3aa74ec9464b199dcd1)

2 years agorgw/dbstore: Fix build errors on centos9
Soumya Koduri [Wed, 27 Apr 2022 09:24:46 +0000 (14:54 +0530)]
rgw/dbstore: Fix build errors on centos9

Related: rhbz#2109960
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
(cherry picked from commit fc1008a15bc9f7c37330e613f7c81680bc5605fc)

2 years ago17.2.3 47344/head v17.2.3
Ceph Release Team [Thu, 28 Jul 2022 21:52:12 +0000 (21:52 +0000)]
17.2.3

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>
2 years agolibcephsqlite: ceph-mgr crashes when compiled with gcc12
Ganesh Maharaj Mahalingam [Mon, 11 Apr 2022 17:15:43 +0000 (10:15 -0700)]
libcephsqlite: ceph-mgr crashes when compiled with gcc12

regex in libcephsqlite, when compiled with GCC12 treats '-' as a range
operator resulting in the following error.
"Invalid start of '[x-x]' range in regular expression"

Fixes: https://tracker.ceph.com/issues/55304
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
(cherry picked from commit ac043a09c5ffb4b434b8644920004b3d5b7f9d8c)
(cherry picked from commit 5a10875d4570356afa3af024f63ac229caaa765b)

2 years ago17.2.2 v17.2.2
Jenkins Build Slave User [Thu, 21 Jul 2022 17:29:33 +0000 (17:29 +0000)]
17.2.2

2 years agorgw: s3website check for bucket before retargeting
Seena Fallah [Fri, 1 Jul 2022 21:19:40 +0000 (23:19 +0200)]
rgw: s3website check for bucket before retargeting

On requesting s3website API without a bucket name it will crash because s->bucket is null

Fixes: https://tracker.ceph.com/issues/56281
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 933dbabb3a2a43fd016bc61cc0ee5e27f7ad32e7)
(cherry picked from commit e2b923600c28626b921107c13e2c12d691eed3f1)

2 years agoqa: validate subvolume discover on upgrade
Kotresh HR [Fri, 4 Feb 2022 09:58:39 +0000 (15:28 +0530)]
qa: validate subvolume discover on upgrade

Validate subvolume discover on upgrade from
legacy subvolume to v1. The handcrafted
".meta" file on legacy subvolume root should
not be used for any subvolume apis like getpath,
authorize.

Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit fcc118500c545fe6018cd3f2742127b92c657def)
(cherry picked from commit 7e6453d32f78e4a02771396c96dcba472f275135)

2 years agomgr/volumes: V2 Fix for test_subvolume_retain_snapshot_invalid_recreate
Kotresh HR [Thu, 9 Jun 2022 08:00:59 +0000 (13:30 +0530)]
mgr/volumes: V2 Fix for test_subvolume_retain_snapshot_invalid_recreate

Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit ac791879096c8a9e5bda4eef69f1269eee819932)

2 years agomgr/volumes: Fix subvolume discover during upgrade
Kotresh HR [Fri, 4 Feb 2022 09:25:03 +0000 (14:55 +0530)]
mgr/volumes: Fix subvolume discover during upgrade

Fixes the subvolume discover to use the correct
metadata file after an upgrade from legacy subvolume
to v1. The fix makes sure, it doesn't use the
handcrafted metadata file placed in the subvolume
root of legacy subvolume.

Co-authored-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Co-authored-by: Dan van der Ster <daniel.vanderster@cern.ch>
Co-authored-by: Ramana Raja <rraja@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 7eba9cab6cfb9a13a84062177d7a0fa228311e13)
(cherry picked from commit 50f4ac7b75185c89ede210b2c975672e8bdd73aa)

3 years ago17.2.1 46827/head v17.2.1
Ceph Release Team [Thu, 23 Jun 2022 14:41:35 +0000 (14:41 +0000)]
17.2.1

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>
3 years agotools: ceph-objectstore-tool is able to trim pg log dups' entries.
Radosław Zarzyński [Sat, 11 Jun 2022 19:29:29 +0000 (21:29 +0200)]
tools: ceph-objectstore-tool is able to trim pg log dups' entries.

The main assumption is trimming just dups doesn't need any update
to the corresponding pg_info_t.

Testing:

1. cluster without the autoscaler
```
rzarz@ubulap:~/dev/ceph/build$ MON=1 MGR=1 OSD=3 MGR=1 MDS=0 ../src/vstart.sh -l -b -n -o "osd_pg_log_dups_tracked=3000000" -o "osd_pool_default_pg_autoscale_mode=off"
```

2. 8 PGs in the testing pool.
```
rzarz@ubulap:~/dev/ceph/build$ bin/ceph osd pool create test-pool 8 8
```

3. Provisioning dups with rados bench
```
bin/rados bench -p test-pool 300 write -b 4096  --no-cleanup
...
Total time run:         300.034
Total writes made:      103413
Write size:             4096
Object size:            4096
Bandwidth (MB/sec):     1.34637
Stddev Bandwidth:       0.589071
Max bandwidth (MB/sec): 2.4375
Min bandwidth (MB/sec): 0.902344
Average IOPS:           344
Stddev IOPS:            150.802
Max IOPS:               624
Min IOPS:               231
Average Latency(s):     0.0464151
Stddev Latency(s):      0.0183627
Max latency(s):         0.0928424
Min latency(s):         0.0131932
```

4. Killing osd.0
```
rzarz@ubulap:~/dev/ceph/build$ kill 2572129 # pid of osd.0
```

5. Listing PGs on osd.0 and calculating number of pg log's entries and
dups:

```
rzarz@ubulap:~/dev/ceph/build$ bin/ceph-objectstore-tool --data-path dev/osd0 --op list-pgs --pgid 2.c > osd0_pgs.txt
rzarz@ubulap:~/dev/ceph/build$ for pgid in `cat osd0_pgs.txt`; do echo $pgid; bin/ceph-objectstore-tool --data-path dev/osd0 --op log --pgid $pgid | jq '(.pg_log_t.log|length),(.pg_log_t.dups|length)'; done
2.7
10020
3100
2.6
10100
3000
2.3
10012
2800
2.1
10049
2900
2.2
10057
2700
2.0
10027
2900
2.5
10077
2700
2.4
10072
2900
1.0
97
0
```

6. Trimming dups
```
rzarz@ubulap:~/dev/ceph/build$ CEPH_ARGS="--osd_pg_log_dups_tracked 2500 --osd_pg_log_trim_max=100" bin/ceph-objectstore-tool --data-path dev/osd0 --op trim-pg-log-dups --pgid 2.7
max_dup_entries=2500 max_chunk_size=100
Removing keys dup_0000000020.00000000000000000001 - dup_0000000020.00000000000000000100
Removing keys dup_0000000020.00000000000000000101 - dup_0000000020.00000000000000000200
Removing keys dup_0000000020.00000000000000000201 - dup_0000000020.00000000000000000300
Removing keys dup_0000000020.00000000000000000301 - dup_0000000020.00000000000000000400
Removing keys dup_0000000020.00000000000000000401 - dup_0000000020.00000000000000000500
Removing keys dup_0000000020.00000000000000000501 - dup_0000000020.00000000000000000600
Finished trimming, now compacting...
Finished trimming pg log dups
```

7. Checking number of pg log's entries and dups
```
rzarz@ubulap:~/dev/ceph/build$ for pgid in `cat osd0_pgs.txt`; do echo $pgid; bin/ceph-objectstore-tool --data-path dev/osd0 --op log --pgid $pgid | jq '(.pg_log_t.log|length),(.pg_log_t.dups|length)'; done
2.7
10020
2500
2.6
10100
3000
2.3
10012
2800
2.1
10049
2900
2.2
10057
2700
2.0
10027
2900
2.5
10077
2700
2.4
10072
2900
1.0
97
0
```

Fixes: https://tracker.ceph.com/issues/53729
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit a2190f901abf2fed20c65e59f53b38c10545cb5a)
(cherry picked from commit 3d3193fc6d71e178af0a288e010c308d61767562)

3 years agoMerge pull request #46577 from cbodley/wip-quincy-qa-smoke-s3tests
Yuri Weinstein [Mon, 13 Jun 2022 16:01:03 +0000 (09:01 -0700)]
Merge pull request #46577 from cbodley/wip-quincy-qa-smoke-s3tests

qa/smoke: use ceph-quincy branch of s3tests

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
3 years agoMerge pull request #46607 from rzarzynski/wip-55982-quincy
Yuri Weinstein [Fri, 10 Jun 2022 17:20:42 +0000 (10:20 -0700)]
Merge pull request #46607 from rzarzynski/wip-55982-quincy

quincy: osd: log the number of 'dups' entries in a PG Log

Reviewed-by: Laura Flores <lflores@redhat.com>