]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379 39306/head
Alfonso Martínez [Thu, 7 Jan 2021 15:53:26 +0000 (16:53 +0100)]
mgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379

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

 Conflicts:
monitoring/grafana/build/Makefile
          - Remove file as it does not exist on octopus.
src/pybind/mgr/cephadm/module.py
          - Resolve conflicts.

4 years agoMerge pull request #39170 from sebastian-philipp/octopus-backport-38910
Sebastian Wagner [Thu, 4 Feb 2021 12:37:02 +0000 (13:37 +0100)]
Merge pull request #39170 from sebastian-philipp/octopus-backport-38910

octopus: cephadm: fix rgw osd cap tag

4 years agoMerge pull request #39166 from sebastian-philipp/octopus-backport-38804-39003
Sebastian Wagner [Thu, 4 Feb 2021 12:36:35 +0000 (13:36 +0100)]
Merge pull request #39166 from sebastian-philipp/octopus-backport-38804-39003

octopus: cephadm: silence "Failed to evict container" log msg

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39167 from sebastian-philipp/octopus-backport-38850
Sebastian Wagner [Thu, 4 Feb 2021 12:36:22 +0000 (13:36 +0100)]
Merge pull request #39167 from sebastian-philipp/octopus-backport-38850

octopus: mgr/cephadm: tolerate old host inventory without 'hostname' key

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39168 from sebastian-philipp/octopus-backport-38945
Sebastian Wagner [Thu, 4 Feb 2021 12:36:12 +0000 (13:36 +0100)]
Merge pull request #39168 from sebastian-philipp/octopus-backport-38945

octopus: qa/cephadm: Add yaml output to smoke test

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39171 from sebastian-philipp/octopus-backport-39083
Sebastian Wagner [Thu, 4 Feb 2021 12:35:14 +0000 (13:35 +0100)]
Merge pull request #39171 from sebastian-philipp/octopus-backport-39083

octopus: python-common/drivegroups: avoid dropping "rotational: 0" from Device Selection

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #38430 from smithfarm/wip-48281-octopus
Yuri Weinstein [Tue, 2 Feb 2021 16:12:47 +0000 (08:12 -0800)]
Merge pull request #38430 from smithfarm/wip-48281-octopus

octopus: osd: fix bluestore bitmap allocator calculate wrong last_pos with hint

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #38427 from smithfarm/wip-48283-octopus
Yuri Weinstein [Tue, 2 Feb 2021 16:11:47 +0000 (08:11 -0800)]
Merge pull request #38427 from smithfarm/wip-48283-octopus

octopus: rpm,deb: change sudoers file mode to 440

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38333 from b-ranto/wip-prom-fixes-octopus
Yuri Weinstein [Tue, 2 Feb 2021 16:11:27 +0000 (08:11 -0800)]
Merge pull request #38333 from b-ranto/wip-prom-fixes-octopus

octopus: mgr/prometheus: Sync and backport prometheus fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #38425 into octopus
Jan Fajerski [Tue, 2 Feb 2021 14:31:53 +0000 (15:31 +0100)]
Merge PR #38425 into octopus

* refs/pull/38425/head:
lvm/create.py: fix a typo in the help message

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
4 years agoMerge pull request #38971 from smithfarm/wip-48743-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:57:47 +0000 (08:57 -0800)]
Merge pull request #38971 from smithfarm/wip-48743-octopus

octopus: rgw: distribute cache for exclusive put

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38970 from smithfarm/wip-48693-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:57:21 +0000 (08:57 -0800)]
Merge pull request #38970 from smithfarm/wip-48693-octopus

octopus: rgw: adding user related web token claims to ops log

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38826 from smithfarm/wip-48725-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:56:54 +0000 (08:56 -0800)]
Merge pull request #38826 from smithfarm/wip-48725-octopus

octopus: rgw: fix bucket limit check fill_status warnings

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38821 from smithfarm/wip-48804-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:56:29 +0000 (08:56 -0800)]
Merge pull request #38821 from smithfarm/wip-48804-octopus

octopus: rgw: cls/user: set from_index for reset stats calls

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39046 from smithfarm/wip-48968-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:47:39 +0000 (08:47 -0800)]
Merge pull request #39046 from smithfarm/wip-48968-octopus

octopus: ocf: add support for mapping images within an RBD namespace

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38981 from smithfarm/wip-48864-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:46:52 +0000 (08:46 -0800)]
Merge pull request #38981 from smithfarm/wip-48864-octopus

octopus: rgw/multisite: Verify if the synced object is identical to source

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38829 from smithfarm/wip-48544-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:46:00 +0000 (08:46 -0800)]
Merge pull request #38829 from smithfarm/wip-48544-octopus

octopus: rgw_file: return common_prefixes in lexical order

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agoMerge pull request #38824 from smithfarm/wip-48546-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:44:11 +0000 (08:44 -0800)]
Merge pull request #38824 from smithfarm/wip-48546-octopus

octopus: rgw: lc: correctly dimension lc shard index vector

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agoMerge pull request #39059 from votdev/issue_48068_tz_octopus
Sebastian Wagner [Mon, 1 Feb 2021 12:25:24 +0000 (13:25 +0100)]
Merge pull request #39059 from votdev/issue_48068_tz_octopus

octopus: cephadm: Various properties like 'last_refresh' do not contain timezone

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #38336 from votdev/wip-48398-octopus
Ernesto Puerta [Fri, 29 Jan 2021 18:34:16 +0000 (19:34 +0100)]
Merge pull request #38336 from votdev/wip-48398-octopus

octopus: mgr/dashboard: display placement column in service table

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agopython-common/drivegroups: avoid dropping "rotational: 0" from DeviceSelection 39171/head
Lukas Stockner [Mon, 25 Jan 2021 23:58:19 +0000 (00:58 +0100)]
python-common/drivegroups: avoid dropping "rotational: 0" from DeviceSelection

False is a legitimate value for the rotational setting and should be included in the JSON output, only None should be ignored.

Fixes: http://tracker.ceph.com/issues/49014
Fixes: cd6a488ab2ca036dd4fb36751b938f605e97e1c8
Signed-off-by: Lukas Stockner <lstockner@genesiscloud.com>
(cherry picked from commit c32f6f5448e51d3196f7a2644ea97ecd22a04f92)

4 years agocephadm: fix rgw osd cap tag 39170/head
Patrick Donnelly [Thu, 14 Jan 2021 17:52:22 +0000 (09:52 -0800)]
cephadm: fix rgw osd cap tag

The syntax is "allow rwx tag rgw *=*'.

Sorry, I thought this would have gotten caught in testing :(

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

4 years agoqa/cephadm: Add yaml output to smoke test 39168/head
Sebastian Wagner [Mon, 18 Jan 2021 11:27:14 +0000 (12:27 +0100)]
qa/cephadm: Add yaml output to smoke test

this will provide a more detailed output, like

```yaml
...snip...
service_type: node-exporter
service_name: node-exporter
placement:
  host_pattern: '*'
status:
  created: '2021-01-18T11:21:56.024810Z'
  last_refresh: '2021-01-18T11:23:24.477672Z'
  running: 0
  size: 1
events:
- "2021-01-18T11:23:09.602644Z service:node-exporter [ERROR] \"Failed while placing\
  \ node-exporter.ubuntuon ubuntu: cephadm exited with an error code: 1, stderr:Deploy\
  \ daemon node-exporter.ubuntu ...\nVerifying port 9100 ...\nTraceback (most recent\
  \ call last):\n  File \"<stdin>\", line 7274, in <module>\n  File \"<stdin>\", line\
  \ 1563, in _default_image\n  File \"<stdin>\", line 3698, in command_deploy\n  File\
  \ \"<stdin>\", line 2338, in deploy_daemon\n  File \"<stdin>\", line 1961, in create_daemon_dirs\n\
  AssertionError\""
...snip...
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 88c6c34e2ba32e38c7fca93722737c3b4d31fe6c)

4 years agomgr/cephadm: tolerate old host inventory without 'hostname' key 39167/head
Sage Weil [Mon, 11 Jan 2021 18:41:12 +0000 (12:41 -0600)]
mgr/cephadm: tolerate old host inventory without 'hostname' key

Older cephadm clusters lack the 'hostname' key in the host spec.  e.g.,

 "cpach": {"addr": "cpach", "labels": ["mon"]}, "eutow": {"addr": "eutow", "labels": ["mon"]}, "stud": {"addr": "stud", "labels": ["mon"]}}

Populate hostname from the dict key if necessary for compatibility.

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

4 years agocephadm: fix 2> syntax in unit.run 39166/head
Sage Weil [Thu, 21 Jan 2021 15:10:51 +0000 (09:10 -0600)]
cephadm: fix 2> syntax in unit.run

We need a space between the command (which ends with a container name)
and the 2> or else the 2 is considered part of the command.  E.g.,

! /usr/bin/podman rm -f ceph-a9a8c7ee-5b72-11eb-8f93-001a4aab830c-mon.a2> /dev/null

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

Conflicts:
src/cephadm/cephadm

4 years agocephadm: silence "Failed to evict container" log msg
Sebastian Wagner [Thu, 7 Jan 2021 15:14:03 +0000 (16:14 +0100)]
cephadm: silence "Failed to evict container" log msg

Right now, we're printing some evil looking messages in the log:

```
systemd[1]: Starting Ceph mgr.node2.ankmgz for ...
podman[32354]: Error: no container with name or ID ceph-... found: no such container
bash[32363]: Error: Failed to evict container: "": Failed to find container "ceph-..." in state: no container with name or ID ceph-... found: no such container
bash[32363]: Error: no container with ID or name "ceph-..." found: no such container
````

Also, the unit.run command already removes the container. No need
for ExecStartPre to do the same.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1bed46e4b0094863a119df59c6ae5f254c2e211d)

4 years agocephadm: Various properties like 'last_refresh' do not contain timezone 39059/head
Volker Theile [Mon, 25 Jan 2021 11:00:56 +0000 (12:00 +0100)]
cephadm: Various properties like 'last_refresh' do not contain timezone

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

4 years agoMerge pull request #39018 from sebastian-philipp/octopus-backport-38766
Sebastian Wagner [Thu, 28 Jan 2021 22:54:07 +0000 (23:54 +0100)]
Merge pull request #39018 from sebastian-philipp/octopus-backport-38766

octopus: cephadm: make "ceph orch {restart|...}" asynchronous

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39019 from sebastian-philipp/octopus-backport-38815
Sebastian Wagner [Thu, 28 Jan 2021 22:53:54 +0000 (23:53 +0100)]
Merge pull request #39019 from sebastian-philipp/octopus-backport-38815

octopus: mgr/cephadm: lock multithreaded access to OSDRemovalQueue

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39020 from sebastian-philipp/octopus-backport-38904
Sebastian Wagner [Thu, 28 Jan 2021 22:53:35 +0000 (23:53 +0100)]
Merge pull request #39020 from sebastian-philipp/octopus-backport-38904

octopus: cephadm: Don't make sysctl spam the log file

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agorgw: use static_ptr for etag verifiers 38981/head
Casey Bodley [Fri, 18 Sep 2020 14:10:50 +0000 (10:10 -0400)]
rgw: use static_ptr for etag verifiers

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 45a060612ec376110b84c2a2b7783c8a6aee191c)

4 years agorgw: add factory function create_etag_verifier()
Casey Bodley [Fri, 18 Sep 2020 00:58:36 +0000 (20:58 -0400)]
rgw: add factory function create_etag_verifier()

move all of the etag verifier initialization into a helper function.
none of the errors there should be fatal and fail the download, they
should just turn etag verification off

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 8fa8974bbd63fbc8be9cdf929a875910e2147d65)

4 years agorgw: move etag verifiers to namespace rgw::putobj
Casey Bodley [Fri, 18 Sep 2020 00:56:52 +0000 (20:56 -0400)]
rgw: move etag verifiers to namespace rgw::putobj

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6ad2e3eef3f9bbf41de471ef5bad9502023e113c)

4 years agorgw: simplify out SourceObjType
Casey Bodley [Fri, 18 Sep 2020 00:15:11 +0000 (20:15 -0400)]
rgw: simplify out SourceObjType

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 21cc9034410bb6e675b1b04888e1b85e3eb5d71f)

4 years agorgw: rgw_sync_obj_etag_verify accounts for compressed multipart uploads
Casey Bodley [Thu, 17 Sep 2020 20:23:17 +0000 (16:23 -0400)]
rgw: rgw_sync_obj_etag_verify accounts for compressed multipart uploads

the etag verifier for multipart uploads uses the manifest to get the
logical offsets for each part. but when compression is enabled, those
are offsets into the compressed data. use the source object's compression
info to translate those compressed part offsets back to their original
offsets

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

4 years agorgw: ETagVerifier_MPU takes existing offset vector
Casey Bodley [Thu, 17 Sep 2020 23:26:51 +0000 (19:26 -0400)]
rgw: ETagVerifier_MPU takes existing offset vector

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2c1934bd3746697249b95b3f79f4c05425d7b40e)

4 years agorgw: add helper to decode compression info from single attr
Casey Bodley [Thu, 17 Sep 2020 17:26:32 +0000 (13:26 -0400)]
rgw: add helper to decode compression info from single attr

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a5520be135156c867a6502845603e2afdbb0a44a)

4 years agoRGW:Multisite: Check rgw_sync_obj_etag_verify option only once
Prasad Krishnan [Tue, 24 Mar 2020 18:19:59 +0000 (18:19 +0000)]
RGW:Multisite: Check rgw_sync_obj_etag_verify option only once

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit f92cfaf74f1eb8809653867b8c67a3ace37619f2)

4 years agoRGW:Multisite: Convert is_mpu_obj into an enum SourceObjType
Prasad Krishnan [Fri, 20 Mar 2020 20:01:35 +0000 (20:01 +0000)]
RGW:Multisite: Convert is_mpu_obj into an enum SourceObjType

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit fa5422597837032d97f9afceff8b5a22fad0cda7)

4 years agoRGW:Multisite: Rename rgw_sync_obj_integrity to rgw_sync_obj_etag_verify
Prasad Krishnan [Thu, 19 Mar 2020 01:25:13 +0000 (01:25 +0000)]
RGW:Multisite: Rename rgw_sync_obj_integrity to rgw_sync_obj_etag_verify

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 6c4262bfa7d54563ea8bf616154a6b3491d59347)

4 years agoRGW:Multisite: Rename rgw_copy_verify_object to rgw_sync_obj_integrity
Prasad Krishnan [Wed, 18 Mar 2020 18:03:15 +0000 (18:03 +0000)]
RGW:Multisite: Rename rgw_copy_verify_object to rgw_sync_obj_integrity

This patch renames the option rgw_copy_verify_object to
rgw_sync_obj_integrity and incorporates more changes suggested through
code-review comments.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 31e944fced60e47139973361cbb753aeaeb3c863)

4 years agoRGW:Multisite: Create a new filter for ETag Verifier
Prasad Krishnan [Mon, 16 Mar 2020 18:45:36 +0000 (18:45 +0000)]
RGW:Multisite: Create a new filter for ETag Verifier

This patch re-writes the ETag verifier into a filter that peeks into the
incoming stream of data and calculates MD5 checksum.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 2677c4b88806d4af6d525157e7006c1b0ca1b964)

4 years ago[RGW][Multisite] Add multisite verifier support for MPU objects
Prasad Krishnan [Fri, 6 Mar 2020 05:08:05 +0000 (05:08 +0000)]
[RGW][Multisite] Add multisite verifier support for MPU objects

The Etag for MPU objects is calculated using a method different from how
it is done for atomic objects. This patch makes use of the RGWObjManifest
to determine the parts in the source cluster and re-computes the ETag in
a similar fashion at the destination cluster during multisite sync for
verification.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 6f085bb9cb6cffddcf2eed18a7295a3dd59f755f)

4 years agoRGW:Multisite: Verify if the synced object is identical to source
Prasad Krishnan [Sun, 23 Feb 2020 06:09:49 +0000 (11:39 +0530)]
RGW:Multisite: Verify if the synced object is identical to source

Introduce an option 'rgw_copy_verify_object' which allows the object
copied from remote cluster through multisite sync is identical to the
source object. This is done by generating the MD5 checksum of the data
being copied and compared to the ETAG stored as part of the object's
attribute.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 23fb5d7b786f1034a02c991c6a648e455b5b9c30)

4 years agomgr/prometheus: don't store exception as e 38333/head
Ken Dreyer [Thu, 3 Dec 2020 17:48:06 +0000 (10:48 -0700)]
mgr/prometheus: don't store exception as e

Python's logging module's exception() method will log the full exception
and stack trace for us, so we do not need to store the exception in the
"e" variable here.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit a17c603effd3367dc64c87a1d6c53d6d3d794fc7)

4 years agomgr/prometheus: use threading.Event instead of sleep
Boris Ranto [Wed, 25 Nov 2020 19:49:48 +0000 (20:49 +0100)]
mgr/prometheus: use threading.Event instead of sleep

This allows us to avoid waiting for the sleep to finish when waiting for
the thread to finish.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit dd5886c3c006e388283df50cc87addeffb3b2b52)

4 years agomgr/prometheus: Log collection issues
Boris Ranto [Wed, 25 Nov 2020 09:32:35 +0000 (10:32 +0100)]
mgr/prometheus: Log collection issues

Log any issues encountered during the data collection and continue to
collect the data anyway (after a sleep).

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 28a5c13bf993679e3098d73df27ded249f34dc99)

4 years agomgr/prometheus: Use mgr.release_name for always on modules
Boris Ranto [Wed, 25 Nov 2020 09:27:25 +0000 (10:27 +0100)]
mgr/prometheus: Use mgr.release_name for always on modules

The host_version is not populated properly in the early stages of ceph
mgr start up process. We can use mgr.release_name instead. It is more
stable and it provides the data even if mgr_map does not contain the
versions, yet.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit aa0650092da3cbf1a73151999874001352cfb9ef)

4 years agomgr/prometheus: Clean up collection thread
Boris Ranto [Wed, 25 Nov 2020 09:25:49 +0000 (10:25 +0100)]
mgr/prometheus: Clean up collection thread

We need to clean up the metrics collection thread.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 03fcaccafc877d10a894b1c39af5547f172c1ed3)

4 years agopybind/mgr/prometheus: use get_module_option() wrapper
Kefu Chai [Tue, 24 Nov 2020 05:40:48 +0000 (13:40 +0800)]
pybind/mgr/prometheus: use get_module_option() wrapper

for better readability

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

4 years agomgr/prometheus: Add healthcheck metric for SLOW_OPS
Paul Cuzner [Thu, 8 Oct 2020 03:30:56 +0000 (16:30 +1300)]
mgr/prometheus: Add healthcheck metric for SLOW_OPS

SLOW_OPS is triggered by op tracker, and generates a health
alert but healthchecks do not create metrics for prometheus to
use as alert triggers. This change adds SLOW_OPS metric, and
provides a simple means to extend to other relevant health
checks in the future

If the extract of the value from the health check message fails
we log an error and remove the metric from the metric set. In
addition the metric description has changed to better reflect
the scenarios where SLOW_OPS can be triggered.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 2010432b5045c8f1dd0c052def497e590a1bf2fe)

4 years agoMerge pull request #39071 from smithfarm/wip-49003-octopus
Kefu Chai [Thu, 28 Jan 2021 11:58:42 +0000 (19:58 +0800)]
Merge pull request #39071 from smithfarm/wip-49003-octopus

octopus: test/run-cli-tests: use cram from github

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocephadm: Don't make sysctl spam the log file 39020/head
Sebastian Wagner [Thu, 14 Jan 2021 11:04:03 +0000 (12:04 +0100)]
cephadm: Don't make sysctl spam the log file

`sysctl -a` really spams the log file in Teuthology

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 70722a2efb5207f7d6fc7e8ecf4aab71e2a1a39d)

Conflicts:
  src/cephadm/cephadm

4 years agotest/downloads: drop cram-0.5 tar ball 39071/head
Kefu Chai [Sat, 23 Jan 2021 18:13:31 +0000 (02:13 +0800)]
test/downloads: drop cram-0.5 tar ball

since we install cram from github, drop the tarball from repo

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

4 years agotest/run-cli-tests: use cram from github
Kefu Chai [Sat, 23 Jan 2021 18:12:31 +0000 (02:12 +0800)]
test/run-cli-tests: use cram from github

to address the failure of

  WARNING: Built wheel for cram is invalid: Metadata 1.2 mandates PEP 440 version, but '0.5.0ceph.2011-01-14' is not
Failed to build cram

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

4 years agomgr/dashboard: display placement column in service table 38336/head
Volker Theile [Tue, 5 Jan 2021 10:57:15 +0000 (11:57 +0100)]
mgr/dashboard: display placement column in service table

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

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.ts
Both files need to be adapted to replaced $localize with i18n.

4 years agoocf: add support for mapping images within an RBD namespace 39046/head
Jason Dillaman [Fri, 22 Jan 2021 15:29:29 +0000 (10:29 -0500)]
ocf: add support for mapping images within an RBD namespace

Support for RBD namespaces was not added to the OCF resource agent.
This commit fixes this oversight and also fixes a bug in handling
of the "rbd device list" output.

Fixes: https://tracker.ceph.com/issues/48964
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2a23a92aaf122627151874c56848667169fac064)

4 years agoMerge pull request #38761 from p-se/wip-48607-octopus
Nathan Cutler [Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)]
Merge pull request #38761 from p-se/wip-48607-octopus

octopus: mgr/dashboard: enable different URL for users of browser to Grafana

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38337 from k0ste/wip-48399-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:17:41 +0000 (09:17 -0800)]
Merge pull request #38337 from k0ste/wip-48399-octopus

octopus: mgr/balancer: fix available pgs sent to calc_pg_upmaps

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #38943 from smithfarm/wip-48889-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:17:02 +0000 (09:17 -0800)]
Merge pull request #38943 from smithfarm/wip-48889-octopus

octopus: do_cmake.sh: use python-3.9 with fedora version 33

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38888 from votdev/wip-46963-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:16:28 +0000 (09:16 -0800)]
Merge pull request #38888 from votdev/wip-46963-octopus

octopus: mgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #38847 from smithfarm/wip-48828-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:14:47 +0000 (09:14 -0800)]
Merge pull request #38847 from smithfarm/wip-48828-octopus

octopus: cmake: add empty RPATH to ceph-diff-sorted

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #38810 from rhcs-dashboard/wip-48794-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:13:46 +0000 (09:13 -0800)]
Merge pull request #38810 from rhcs-dashboard/wip-48794-octopus

octopus: mgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
4 years agoMerge pull request #38801 from callithea/wip-48714-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:10:21 +0000 (09:10 -0800)]
Merge pull request #38801 from callithea/wip-48714-octopus

octopus: mgr/ActivePyModules.cc: always release GIL before attempting to acquire a lock

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38755 from smithfarm/wip-48737-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:07:14 +0000 (09:07 -0800)]
Merge pull request #38755 from smithfarm/wip-48737-octopus

octopus: rpm: require smartmontools on SUSE

Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38595 from callithea/wip-48557-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:06:19 +0000 (09:06 -0800)]
Merge pull request #38595 from callithea/wip-48557-octopus

octopus: mgr/restful: fix TypeError occurring in _gather_osds()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/cephadm: lock multithreaded access to OSDRemovalQueue 39019/head
Sebastian Wagner [Fri, 8 Jan 2021 12:54:46 +0000 (13:54 +0100)]
mgr/cephadm: lock multithreaded access to OSDRemovalQueue

Since the set can be changed also from the CLI thread

Fixes: https://tracker.ceph.com/issues/47700
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit db7c6a56125a3a36fa50904557280d69829c69d6)

4 years agomgr/cephadm: OSDRemovalQueue: remove some trivial wrappers
Sebastian Wagner [Fri, 8 Jan 2021 11:47:27 +0000 (12:47 +0100)]
mgr/cephadm: OSDRemovalQueue: remove some trivial wrappers

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1f39532e0398c85ccd0c238feb8e3a947758b54c)

4 years agomgr/cephadm: move RemoveUtil into OSDRemovalQueue
Sebastian Wagner [Fri, 8 Jan 2021 11:41:05 +0000 (12:41 +0100)]
mgr/cephadm: move RemoveUtil into OSDRemovalQueue

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit df16b86c7b6e1c11d35de4290a9e164962b4d057)

4 years agomgr/cephadm: move process_removal_queue into OSDRemovalQueue
Sebastian Wagner [Fri, 8 Jan 2021 11:34:40 +0000 (12:34 +0100)]
mgr/cephadm: move process_removal_queue into OSDRemovalQueue

`process_removal_queue` belongs to OSDRemovalQueue
instead of RemoveUtil

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit af52ba47a16703aa1aadbd59d84e8876bdad2f17)

4 years agomgr/cephadm: make OSDRemovalQueue not inherent from set
Sebastian Wagner [Fri, 8 Jan 2021 11:06:10 +0000 (12:06 +0100)]
mgr/cephadm: make OSDRemovalQueue not inherent from set

Instead, let's make it a member.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 086afa9a69cb99258abfab270420b4968d7c3717)

4 years agomgr/cephadm: rename OSDQueue -> OSDRemovalQueue
Sebastian Wagner [Fri, 8 Jan 2021 10:49:00 +0000 (11:49 +0100)]
mgr/cephadm: rename OSDQueue -> OSDRemovalQueue

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e0f9983b50444d53d6750f9bf1f04556510419eb)

4 years agomgr/cephadm: make `ceph orch {restart|...}` asynchronous 39018/head
Sebastian Wagner [Mon, 14 Sep 2020 12:28:16 +0000 (14:28 +0200)]
mgr/cephadm: make `ceph orch {restart|...}` asynchronous

Othwerwiese we'd block the CLI handler thread.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit c6e4b9ab9ca317c840613167df9ec17fe6173592)

4 years agoMerge pull request #38808 from badone/wip-48528-octopus
Ernesto Puerta [Fri, 22 Jan 2021 10:12:36 +0000 (11:12 +0100)]
Merge pull request #38808 from badone/wip-48528-octopus

octopus: install-deps.sh: Make powertools repo case insensitive

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38973 from rhcs-dashboard/wip-48928-octopus
Ernesto Puerta [Thu, 21 Jan 2021 17:14:21 +0000 (18:14 +0100)]
Merge pull request #38973 from rhcs-dashboard/wip-48928-octopus

octopus: mgr/dashboard: add `--ssl` to `ng serve`

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38867 from callithea/wip-48809-octopus
Ernesto Puerta [Thu, 21 Jan 2021 17:10:33 +0000 (18:10 +0100)]
Merge pull request #38867 from callithea/wip-48809-octopus

octopus: mgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38593 from callithea/wip-48578-octopus
Ernesto Puerta [Thu, 21 Jan 2021 16:54:52 +0000 (17:54 +0100)]
Merge pull request #38593 from callithea/wip-48578-octopus

octopus: mgr/prometheus: Fix 'pool filling up' with >50% usage

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: p-se <pseidensal@suse.com>
4 years agoMerge pull request #38496 from bk201/wip-48460-octopus
Ernesto Puerta [Thu, 21 Jan 2021 16:52:52 +0000 (17:52 +0100)]
Merge pull request #38496 from bk201/wip-48460-octopus

octopus: mgr/dashboard: allow selecting all daemons for Orchestrator NFS clusters

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #38347 from smithfarm/wip-48378-octopus
Yuri Weinstein [Thu, 21 Jan 2021 16:52:31 +0000 (08:52 -0800)]
Merge pull request #38347 from smithfarm/wip-48378-octopus

octopus: mon: validate crush-failure-domain

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37930 from rhcs-dashboard/wip-48079-octopus
Ernesto Puerta [Thu, 21 Jan 2021 16:51:19 +0000 (17:51 +0100)]
Merge pull request #37930 from rhcs-dashboard/wip-48079-octopus

octopus: mgr/dashboard: Prevent table items from getting selected while expanding

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #38951 from smithfarm/wip-48888-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:24:27 +0000 (08:24 -0800)]
Merge pull request #38951 from smithfarm/wip-48888-octopus

octopus: cmake: detect and use sigdescr_np() if available

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #38421 from smithfarm/wip-48429-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:23:25 +0000 (08:23 -0800)]
Merge pull request #38421 from smithfarm/wip-48429-octopus

octopus: rgw: avoid expiration early triggering caused by overflow

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agoMerge pull request #38420 from smithfarm/wip-48427-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:22:25 +0000 (08:22 -0800)]
Merge pull request #38420 from smithfarm/wip-48427-octopus

octopus: rgw: S3 Put Bucket Policy should return 204 on success

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38339 from smithfarm/wip-48345-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:21:39 +0000 (08:21 -0800)]
Merge pull request #38339 from smithfarm/wip-48345-octopus

octopus: rgw: fix invalid payload issue when serving s3website error page

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agomgr/dashboard: add `--ssl` to `ng serve` 38973/head
Tatjana Dehler [Tue, 12 Jan 2021 09:28:35 +0000 (10:28 +0100)]
mgr/dashboard: add `--ssl` to `ng serve`

Add the `--ssl` option to the `ng serve` command in order to
reflect the changes to the cookies (https://tracker.ceph.com/issues/44591)
and be able to log into the dashboard by using the development server.

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/package.json
     - Adopted master branch changes.

4 years agorgw: distribute cache for exclusive put 38971/head
Or Friedmann [Wed, 16 Dec 2020 16:09:24 +0000 (18:09 +0200)]
rgw: distribute cache for exclusive put

Distribute cache for exclusive put

Fixes: https://tracker.ceph.com/issues/48632
Thanks to Casey Bodley for finding the solution

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

4 years agorgw: adding user related web token claims to ops log 38970/head
Pritha Srivastava [Mon, 11 May 2020 17:52:02 +0000 (23:22 +0530)]
rgw: adding user related web token claims to ops log
for auditing purposes.

Fixes: https://tracker.ceph.com/issues/45989
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit bb6a68ec14f07c17fdf68243aaec35c17d5e01bf)

4 years agocmake: detect and use sigdescr_np() if available 38951/head
David Disseldorp [Tue, 1 Sep 2020 11:49:21 +0000 (13:49 +0200)]
cmake: detect and use sigdescr_np() if available

sys_siglist is deprecated with glibc 2.32. A new thread-safe and
async-signal safe sigdescr_np() function is provided, so use it if
available.

Fixes: https://tracker.ceph.com/issues/47187
Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit b9b6faf66ae67648626470cb4fc3f0850ac4d842)

4 years agodo_cmake.sh: use python-3.9 with fedora version 33 38943/head
Sunny Kumar [Fri, 23 Oct 2020 14:38:39 +0000 (15:38 +0100)]
do_cmake.sh: use python-3.9 with fedora version 33

Fedora-33 (rawhide) now has python-3.9.
Build breaks on Fedoa-33 with Traceback:
CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:165 (message):
  Could NOT find Python3: Found unsuitable version "3.9.0", but required is
  exact version "3.8" (found /usr/bin/python3, found components: Interpreter
  Development)

Fixes: https://tracker.ceph.com/issues/47971
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
(cherry picked from commit 2cc747cf4a55fb38a524ec12f6b6e5888fadf07a)

4 years agoMerge pull request #38626 from batrick/i48635
Yuri Weinstein [Fri, 15 Jan 2021 18:54:42 +0000 (10:54 -0800)]
Merge pull request #38626 from batrick/i48635

octopus: qa: tox failures

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36803 from ShyamsundarR/wip-46820-octopus
Yuri Weinstein [Fri, 15 Jan 2021 18:53:59 +0000 (10:53 -0800)]
Merge pull request #36803 from ShyamsundarR/wip-46820-octopus

octopus: mgr/volumes: Implement subvolume version v2

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #38688 from batrick/4ca8aaafa32bb7397eec80a8eb366d2dd781a72f-octopus
Yuri Weinstein [Fri, 15 Jan 2021 18:53:32 +0000 (10:53 -0800)]
Merge pull request #38688 from batrick/4ca8aaafa32bb7397eec80a8eb366d2dd781a72f-octopus

octopus: qa: unmount volumes before removal

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec 38888/head
Volker Theile [Mon, 20 Jul 2020 12:45:36 +0000 (14:45 +0200)]
mgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec

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

Conflicts:
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
  * Use i18n instead of $localize
  * Remove CdForm class
  * Adapt code to ngx-bootstrap. Typeahead works a little bit different than in Pacific/ng-bootstrap.
  * Adapt to older TypeScript version
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
  * Adapt code to ngx-bootstrap.
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts
  * Use i18n instead of $localize
  * Replace ModalService by BsModalService
- src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts
  * Use i18n instead of $localize
- src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
  * Relocate changes to src/pybind/mgr/dashboard/frontend/src/styles.scss

4 years agoMerge pull request #38594 from callithea/wip-48587-octopus
Ernesto Puerta [Wed, 13 Jan 2021 18:39:26 +0000 (19:39 +0100)]
Merge pull request #38594 from callithea/wip-48587-octopus

octopus: mgr/dashboard: RGW User Form is validating disabled fields

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agomgr/dashboard: enable different URL for users of browser to Grafana 38761/head
Patrick Seidensal [Tue, 3 Nov 2020 12:47:23 +0000 (13:47 +0100)]
mgr/dashboard: enable different URL for users of browser to Grafana

Fixes: https://tracker.ceph.com/issues/47386
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 676f82923d875cfe9528a401963c09f29a6de7f4)

Conflicts:
        doc/mgr/dashboard.rst
        src/pybind/mgr/dashboard/controllers/grafana.py

Resolved some trivial conflicts and replaced the heading of the newly
added section in the documentation to another level, as the
documentation between master and octopus differs quite much.

4 years agomgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart 38867/head
Kiefer Chang [Sun, 27 Dec 2020 01:04:06 +0000 (09:04 +0800)]
mgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart

Use the percentage of READ ops instead of its value.

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

4 years agomgr/dashboard: Updating the docs regarding the user lockout 38810/head
Nizamudeen A [Thu, 10 Dec 2020 08:05:38 +0000 (13:35 +0530)]
mgr/dashboard: Updating the docs regarding the user lockout

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

4 years agomgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts
Nizamudeen A [Thu, 26 Nov 2020 10:25:00 +0000 (15:55 +0530)]
mgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts

Implemented a user lockout mechanism if the user enters 10 invalid attempts. The attempt count gets resetted to 0 once the user succesfully logins before getting disabled. Once the user gets disabled administrator has to manually enable the user which will also resets the number of attempts.

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

4 years agoMerge pull request #38759 from tchaikov/octopus-38263
Yuri Weinstein [Mon, 11 Jan 2021 20:05:39 +0000 (12:05 -0800)]
Merge pull request #38759 from tchaikov/octopus-38263

octopus: cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #38770 from votdev/wip-48629-octopus
Yuri Weinstein [Mon, 11 Jan 2021 20:00:24 +0000 (12:00 -0800)]
Merge pull request #38770 from votdev/wip-48629-octopus

octopus: mgr/dashboard: The /rgw/status endpoint does not check for running service

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>