]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agotest/rgw: test_datalog_autotrim filters out new entries 40673/head
Casey Bodley [Mon, 15 Jun 2020 15:45:11 +0000 (11:45 -0400)]
test/rgw: test_datalog_autotrim filters out new entries

if other sync activity is racing with test_datalog_autotrim, it can
create new datalog entries after the 'datalog autotrim' command runs

instead of asserting that the datalog is empty after trim, assert that
any entries have a marker larger than the max-marker reported by
'datalog status' before the trim

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

4 years agoMerge pull request #40392 from neha-ojha/wip-49964-octopus
Yuri Weinstein [Wed, 7 Apr 2021 17:02:18 +0000 (10:02 -0700)]
Merge pull request #40392 from neha-ojha/wip-49964-octopus

octopus: common/options: bluefs_buffered_io=true by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40476 from tchaikov/octopus-pr-38665
Yuri Weinstein [Wed, 7 Apr 2021 15:35:46 +0000 (08:35 -0700)]
Merge pull request #40476 from tchaikov/octopus-pr-38665

octopus: pybind/ceph_argparse.py: use a safe value for timeout

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40441 from neha-ojha/wip-49990-octopus
Yuri Weinstein [Wed, 7 Apr 2021 15:35:14 +0000 (08:35 -0700)]
Merge pull request #40441 from neha-ojha/wip-49990-octopus

octopus: os/bluestore: Make Onode::put/get resiliant to split_cache

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #40424 from k0ste/wip-49995-octopus
Yuri Weinstein [Wed, 7 Apr 2021 15:34:11 +0000 (08:34 -0700)]
Merge pull request #40424 from k0ste/wip-49995-octopus

octopus: common/ipaddr: skip loopback interfaces named 'lo' and test it

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39219 from k0ste/wip-49004-octopus
Yuri Weinstein [Tue, 6 Apr 2021 17:02:09 +0000 (10:02 -0700)]
Merge pull request #39219 from k0ste/wip-49004-octopus

octopus: mgr: update mon metadata when monmap is updated

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40127 from neha-ojha/wip-49761-octopus
Yuri Weinstein [Thu, 1 Apr 2021 16:03:19 +0000 (09:03 -0700)]
Merge pull request #40127 from neha-ojha/wip-49761-octopus

octopus: pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40278 from singuliere/wip-48596-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:50:27 +0000 (08:50 -0700)]
Merge pull request #40278 from singuliere/wip-48596-octopus

octopus: test: cancelling both noscrub *and* nodeep-scrub

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40277 from singuliere/wip-49009-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:49:45 +0000 (08:49 -0700)]
Merge pull request #40277 from singuliere/wip-49009-octopus

octopus: osd: fix potential null pointer dereference when sending ping

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40276 from singuliere/wip-49527-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:49:13 +0000 (08:49 -0700)]
Merge pull request #40276 from singuliere/wip-49527-octopus

octopus: mon/OSDMonitor: fix safety/idempotency of {set,rm}-device-class

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40275 from singuliere/wip-49730-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:48:17 +0000 (08:48 -0700)]
Merge pull request #40275 from singuliere/wip-49730-octopus

octopus: debian/ceph-common.postinst: do not chown cephadm log dirs

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40274 from singuliere/wip-49795-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:46:56 +0000 (08:46 -0700)]
Merge pull request #40274 from singuliere/wip-49795-octopus

octopus: osd: propagate base pool application_metadata to tiers

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40013 from mfoliveira/wip-49681-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:46:07 +0000 (08:46 -0700)]
Merge pull request #40013 from mfoliveira/wip-49681-octopus

octopus: osd: add osd_fast_shutdown_notify_mon option (default false)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39970 from singuliere/wip-48985-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:45:37 +0000 (08:45 -0700)]
Merge pull request #39970 from singuliere/wip-48985-octopus

octopus: osd/OSDMap: An empty bucket or OSD is not an error

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #39716 from sebastian-philipp/octopus-backport-39373
Yuri Weinstein [Thu, 1 Apr 2021 15:45:12 +0000 (08:45 -0700)]
Merge pull request #39716 from sebastian-philipp/octopus-backport-39373

octopus: mgr/rook: Add timezone info

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #39487 from ChristinaMeno/wip-49297-octopus
Yuri Weinstein [Thu, 1 Apr 2021 15:44:39 +0000 (08:44 -0700)]
Merge pull request #39487 from ChristinaMeno/wip-49297-octopus

octopus: ceph.spec.in: Enable tcmalloc on IBM Power and Z

Reviewed-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #40298 from tchaikov/octopus-48381
Yuri Weinstein [Thu, 1 Apr 2021 15:43:58 +0000 (08:43 -0700)]
Merge pull request #40298 from tchaikov/octopus-48381

octopus: mon/ConfigMap: fix stray option leak

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40534 from tchaikov/octopus-pr-40505
Kefu Chai [Thu, 1 Apr 2021 06:44:52 +0000 (14:44 +0800)]
Merge pull request #40534 from tchaikov/octopus-pr-40505

octopus: mgr/PyModule: put mgr_module_path before Py_GetPath()

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agomgr/PyModule: put mgr_module_path before Py_GetPath() 40534/head
Kefu Chai [Tue, 30 Mar 2021 18:32:38 +0000 (02:32 +0800)]
mgr/PyModule: put mgr_module_path before Py_GetPath()

pip comes with _vendor/progress. so there is chance to import the vendored
version of "progress" module instead of the "progress" mgr module, and
fail to import the latter.

in this change, the order of paths are rearranged so the configured
`mgr_module_path` is put before the return value of `Py_GetPath()`.

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

Conflicts:
src/mgr/PyModule.cc: trivial resolution

4 years agoMerge pull request #40492 from tchaikov/octopus-flake8
Kefu Chai [Tue, 30 Mar 2021 14:24:24 +0000 (22:24 +0800)]
Merge pull request #40492 from tchaikov/octopus-flake8

octopus: pybind/mgr/dashboard: bump flake8 to 3.9.0

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
4 years agopybind/mgr/dashboard: bump up requests to 2.25.1 40492/head
Kefu Chai [Thu, 25 Feb 2021 09:56:02 +0000 (17:56 +0800)]
pybind/mgr/dashboard: bump up requests to 2.25.1

request 2.20 is not compatible with urllib3 v1.25.2 and up. this causes
trouble of incompatibility with other python modules. for instance, we
now have following error:

ERROR: pip's dependency resolver does not currently take into account
all the packages that are installed. This behaviour is the source of the
following dependency conflicts.
botocore 1.20.14 requires urllib3<1.27,>=1.25.4, but you have urllib3
1.24.3 which is incompatible.

see also https://github.com/psf/requests/pull/5092

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

4 years agomgr/dashboard: update pylint to 2.6.0
Volker Theile [Fri, 25 Sep 2020 11:17:19 +0000 (13:17 +0200)]
mgr/dashboard: update pylint to 2.6.0

* Update pylint to 2.6.0.
* Fix pylint issues.

Fixes: https://tracker.ceph.com/issues/47647
Signed-off-by: Volker Theile <vtheile@suse.com>
s

(cherry picked from commit 298c91958a41674a928d53f010b20f174f16d68f)

Conflicts:
src/pybind/mgr/dashboard/requirements-lint.txt
src/pybind/mgr/dashboard/services/ceph_service.py
src/pybind/mgr/dashboard/services/ganesha.py
src/pybind/mgr/dashboard/services/rgw_client.py
src/pybind/mgr/dashboard/tests/test_access_control.py
src/pybind/mgr/dashboard/tests/test_ganesha.py
src/pybind/mgr/dashboard/tests/test_iscsi.py
src/pybind/mgr/dashboard/tests/test_rgw.py
src/pybind/mgr/dashboard/tests/test_settings.py

4 years agoadmin/build-doc: stop passing --use-feature=2020-resolver to pip
Kefu Chai [Sat, 12 Dec 2020 07:19:40 +0000 (15:19 +0800)]
admin/build-doc: stop passing --use-feature=2020-resolver to pip

to silence the warning of

WARNING: --use-feature=2020-resolver no longer has any effect, since it is now the default dependency resolver in pip. This will become an error in pip 21.0.

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

Conflicts:
admin/build-doc: trivial resolution

4 years agopybind/mgr/dashboard: bump flake8 to 3.9.0
Kefu Chai [Fri, 19 Mar 2021 04:05:45 +0000 (12:05 +0800)]
pybind/mgr/dashboard: bump flake8 to 3.9.0

to address the failure of

ERROR: Cannot install -r requirements-lint.txt (line 2) and -r requirements-lint.txt (line 8) because these package versions have conflicting dependencies.

The conflict is caused by:
    flake8 3.8.4 depends on pycodestyle<2.7.0 and >=2.6.0a1
    autopep8 1.5.6 depends on pycodestyle>=2.7.0

To fix this you could try to:
1. loosen the range of package versions you've specified
2. remove package versions to allow pip attempt to solve the dependency conflict

also, loosen the version of pytest:

The conflict is caused by:
    The user requested pytest<4
    The user requested pytest<4
    pytest-cov 2.11.1 depends on pytest>=4.6

To fix this you could try to:
1. loosen the range of package versions you've specified
2. remove package versions to allow pip attempt to solve the dependency
   conflict

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

4 years agopybind/ceph_argparse.py: use a safe value for timeout 40476/head
Kefu Chai [Sun, 20 Dec 2020 05:10:16 +0000 (13:10 +0800)]
pybind/ceph_argparse.py: use a safe value for timeout

we have reports that on arm32 machines, it timed out immediately, so
to prevent it from int overflow, use a safer value instead of
(1 << (32 - 1)) - 1.

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

4 years agoMerge pull request #39914 from mgfritch/octopus-backport-37764-39739
Yuri Weinstein [Fri, 26 Mar 2021 18:03:23 +0000 (11:03 -0700)]
Merge pull request #39914 from mgfritch/octopus-backport-37764-39739

octopus: cephadm: run containers using `--init`

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #40138 from neha-ojha/wip-49402-octopus
Yuri Weinstein [Fri, 26 Mar 2021 17:53:46 +0000 (10:53 -0700)]
Merge pull request #40138 from neha-ojha/wip-49402-octopus

octopus: qa/suites/rados/singletone: whitelist MON_DOWN when injecting msgr errors

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #40009 from mgfritch/octopus-backport-39825
Yuri Weinstein [Fri, 26 Mar 2021 17:53:18 +0000 (10:53 -0700)]
Merge pull request #40009 from mgfritch/octopus-backport-39825

octopus: mgr/cephadm: alias rgw-nfs -> nfs

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39940 from smithfarm/wip-49663-octopus
Yuri Weinstein [Fri, 26 Mar 2021 17:52:48 +0000 (10:52 -0700)]
Merge pull request #39940 from smithfarm/wip-49663-octopus

octopus: src/global/signal_handler.h: fix preprocessor logic for alpine

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39922 from smithfarm/wip-49636-octopus
Yuri Weinstein [Fri, 26 Mar 2021 17:51:54 +0000 (10:51 -0700)]
Merge pull request #39922 from smithfarm/wip-49636-octopus

octopus: mgr/telemetry: check if 'ident' channel is active

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
4 years agoMerge pull request #39919 from smithfarm/wip-49530-octopus
Yuri Weinstein [Fri, 26 Mar 2021 17:51:14 +0000 (10:51 -0700)]
Merge pull request #39919 from smithfarm/wip-49530-octopus

octopus: crush/CrushWrapper: update shadow trees on update_item()

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39884 from singuliere/wip-49386-octopus
Yuri Weinstein [Fri, 26 Mar 2021 17:50:20 +0000 (10:50 -0700)]
Merge pull request #39884 from singuliere/wip-49386-octopus

octopus: os/bluestore/BlueFS: use iterator_impl::copy instead of bufferlist::c_str() to avoid bufferlist rebuild

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #37972 from callithea/wip-48131-octopus
Yuri Weinstein [Fri, 26 Mar 2021 17:49:37 +0000 (10:49 -0700)]
Merge pull request #37972 from callithea/wip-48131-octopus

octopus: mgr/dashboard: additional logging to SMART data retrieval

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
4 years agoos/bluestore: acquire proper lock in split_cache() 40441/head
Igor Fedotov [Fri, 19 Mar 2021 09:53:20 +0000 (12:53 +0300)]
os/bluestore: acquire proper lock in split_cache()

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

4 years agoos/bluestore: Make Onode::put/get resiliant to split_cache
Adam Kupczyk [Mon, 22 Mar 2021 10:20:11 +0000 (11:20 +0100)]
os/bluestore: Make Onode::put/get resiliant to split_cache

In
  OnodeCacheShard* ocs = c->get_onode_cache();
  std::lock_guard l(ocs->lock);
while waiting for lock, split_cache might have changed OnodeCacheShard.
This will result in adding Onode to improper OnodeCacheShard.
Such action is obviously bad, as we will operate in future (at least once) on
different OnodeCacheShard then we got lock for. Particulary sensitive to this
are _trim and split_cache functions, as they iterate over elements.

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

4 years agomgr: add mon metada using type of "mon" 39219/head
Kefu Chai [Tue, 9 Mar 2021 04:51:55 +0000 (12:51 +0800)]
mgr: add mon metada using type of "mon"

this change addresses a regression introduced by
c037f4cb5d7436879d58c34748ef516b5269781f

also remove the "P" before the json command.

see also: https://tracker.ceph.com/issues/48905

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

4 years agomgr: update mon metadata when monmap is updated
Kefu Chai [Sat, 16 Jan 2021 06:33:17 +0000 (14:33 +0800)]
mgr: update mon metadata when monmap is updated

there is chance that some monitor(s) is updated / upgraded in a single
monmap update without being removed from cluster state's metata first,
so, without this change, we will not update the metadata associated with
that monitor, hence the mgr modules which consumes the metadata is not
updated accordingly and keep reporting the stale information.

in this change, we always update the metadata associated with all monitor
included by the latest monmap. multiple "mon metadata" commands are sent
to monitor for retrieving their updated metadata, instead of sending a
single one, so that we can reuse "MetadataUpdate" to update the metadata
of a given daemon. as the number of monitors in a typical cluster is
relatively small, and the frequency of monmap update is low, so this
overhead should be fine.

unlike other places where we ask mon for metadata in Mgr class, the code
sending the mon command for updated monitor metata is located outside of
`cluster_state.with_monmap()` block, the reason is that `with_monmap()`
is guraded by the monc_lock under the hood, while `start_mon_command()`
also need to acquire the monc_lock, which is not a recursive lock. so we
have to do this out of the `with_monmap()` block.

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

backport:
  - path: src/mgr/Mgr.cc
    comment: octopus don't declared `fmt`

4 years agocommon/ipaddr: also skip just `lo` 40424/head
Dan van der Ster [Tue, 23 Mar 2021 08:00:11 +0000 (09:00 +0100)]
common/ipaddr: also skip just `lo`

Skip iface's with name like 'lo' or of the form 'lo:0', 'lo:1'. This
brings back the original behavior from b6d0fc9e0e515e50894c08217d688a8c94db7570

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

4 years agotest_ipaddr: check that we correctly skip loopback
Dan van der Ster [Tue, 23 Mar 2021 10:28:37 +0000 (11:28 +0100)]
test_ipaddr: check that we correctly skip loopback

We should skip devices named 'lo' or of the form 'lo:0' regardless
of their IP address.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Related-to: https://tracker.ceph.com/issues/49938
(cherry picked from commit 780125d1ed93cd7b17172752b3e76186a524103b)

4 years agoMerge pull request #40406 from tchaikov/octopus-pr-40400
Kefu Chai [Fri, 26 Mar 2021 01:27:04 +0000 (09:27 +0800)]
Merge pull request #40406 from tchaikov/octopus-pr-40400

octopus: run-make-check.sh: let ctest generate XML output

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agorun-make-check.sh: let ctest generate XML output 40406/head
Kefu Chai [Thu, 25 Mar 2021 09:08:48 +0000 (17:08 +0800)]
run-make-check.sh: let ctest generate XML output

to enable XUnit plugin of jenkins to consume the ctest output and
publish it in the dashboard, we need to

* let ctest generate XML output instead of plain text output
* do not fail the test if any test case fails. this allows the publisher
  to do its job by checking the XML output.
* prevent ctest from compressing the output. see
  https://issues.jenkins.io/browse/JENKINS-21737

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

4 years agocommon/options: bluefs_buffered_io=true by default 40392/head
Dan van der Ster [Thu, 12 Nov 2020 16:14:37 +0000 (17:14 +0100)]
common/options: bluefs_buffered_io=true by default

Enable bluefs_buffered_io again because it makes a huge user-visible
improvement in metadata intensive scenarios, such as but not limited to
PG deletion.

In our environment, deleting PGs from 4 hybrid OSDs (sharing one SATA SSD block.db) saturates
the block.db at 350MB/s reads and causes slow reqs and flapping on the OSDs.
Those OSDs have 3GB osd_target_memory.
Enabling bluefs_buffered_io drops the SSD IO down to <1MBps and the OSDs
are performant again. (The underlying PG deletion inefficiency is being
solved separately, but the page cache is so much more effective than
the bluestore cache in this scenario).

Lastly, remove the comment about swap. We should separately advise
operators to disable swap on OSD machines, as it is much better in
our experience to OOM and restart than to chug along swapping.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Related-to: https://tracker.ceph.com/issues/45765
Related-to: https://tracker.ceph.com/issues/47044
(cherry picked from commit 5ec8e8e63d409860c35e24a192090ac2b70af8f6)

4 years agoMerge pull request #39360 from kamoltat/wip-octupus-del-period-arg
Josh Durgin [Wed, 24 Mar 2021 00:08:14 +0000 (17:08 -0700)]
Merge pull request #39360 from kamoltat/wip-octupus-del-period-arg

octopus:qa/tasks/mgr/test_progress: fix wait_until_equal

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40225 from kamoltat/wip-fix-39289-incomplete-backport
Josh Durgin [Wed, 24 Mar 2021 00:07:34 +0000 (17:07 -0700)]
Merge pull request #40225 from kamoltat/wip-fix-39289-incomplete-backport

octopus: qa/tasks/mgr/test_progress.py:  remove calling of _osd_in_out_completed_events_count()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40001 from rhcs-dashboard/wip-49703-octopus
Ernesto Puerta [Tue, 23 Mar 2021 17:24:30 +0000 (18:24 +0100)]
Merge pull request #40001 from rhcs-dashboard/wip-49703-octopus

octopus: mgr/dashboard: fix dashboard instance ssl certificate functionality

Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoqa/tasks/mgr/test_progress: fix wait_until_equal 39360/head
Kamoltat [Mon, 8 Feb 2021 15:45:06 +0000 (15:45 +0000)]
qa/tasks/mgr/test_progress: fix wait_until_equal

Octopus ceph_test_case doesn't have period arg
so remove that in wait_until_equal. Also increase
time to wait for complete events by using RECOVERY_PERIOD
instead of EVENT_CREATION_PERIOD

Not needed in masters because only octopus and nautilus
doesn't have a period argument in qa/tasks/mgr/test_progress.py
wait_until_equals() function

Fixes: https://tracker.ceph.com/issues/48824
Signed-off-by: Kamoltat <ksirivad@redhat.com>
4 years agoPendingReleaseNotes: document option osd_fast_shutdown_notify_mon 40013/head
Mauricio Faria de Oliveira [Tue, 26 Jan 2021 16:14:38 +0000 (13:14 -0300)]
PendingReleaseNotes: document option osd_fast_shutdown_notify_mon

Let's add the ``osd_fast_shutdown_notify_mon`` option to PendingReleaseNotes
so it is documented.

Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
(cherry picked from commit 7f5aaef5d4585d74535192192c56549bd023bc1f)

 Conflicts:
PendingReleaseNotes
 - Move snippet into new 15.2.11 section.

4 years agoosd: add osd_fast_shutdown_notify_mon option (default false)
Mauricio Faria de Oliveira [Thu, 7 Jan 2021 22:44:44 +0000 (19:44 -0300)]
osd: add osd_fast_shutdown_notify_mon option (default false)

The osd_fast_shutdown option may cause the cluster log to receive
too many entries of 'osd.X reported immediately failed by osd.Y',
depending on cluster scale.

This might be an issue for LMA stacks/tools that check ceph logs
for failed lines, and then require additional logic to filter on
an intended OSD (fast) shutdown; might not be an option/possible,
and require an admin to analyze.

So, add osd_fast_shutdown_notify_mon option for OSD to also tell
the monitor it is shutting down (done in slow/non-fast shutdown)
under osd_fast_shutdown.

This introduces minimal delay (the ack from the mon is required
to prevent the messages), and addresses the cluster log issue.
Note: the osd_mon_shutdown_timeout option can be used to control
the maximum amount of time waiting for the monitor ack to arrive.

Fixes: http://tracker.ceph.com/issues/46978
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
(cherry picked from commit c75734729764868c5c501722fc8de08dac9ebd4a)

4 years agomon/ConfigMap: fix stray option leak 40298/head
Sage Weil [Tue, 16 Feb 2021 21:50:18 +0000 (16:50 -0500)]
mon/ConfigMap: fix stray option leak

The const Option* needs to remain alive only until the next clear().  Keep
the reference in ConfigMap and clean it up then.

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

Fixes: https://tracker.ceph.com/issues/48381
Conflicts:
src/mon/ConfigMap.h: trivial resolution

4 years agoMerge pull request #40286 from tchaikov/octopus-pr-40272
Kefu Chai [Sun, 21 Mar 2021 17:19:11 +0000 (01:19 +0800)]
Merge pull request #40286 from tchaikov/octopus-pr-40272

octopus: install-deps.sh: remove existing ceph-libboost of different version

Reviewed-by: David Galloway <dgallowa@redhat.com>
4 years agoinstall-deps.sh: remove existing ceph-libboost of different version 40286/head
Kefu Chai [Sat, 20 Mar 2021 05:00:01 +0000 (13:00 +0800)]
install-deps.sh: remove existing ceph-libboost of different version

we install different versions of precompiled ceph-libboost packages
for different branches when building and testing them on ubuntu test
nodes. for instance,

- nautilus, octopus: v1.72
- pacific: v1.73

they share the same set of test nodes. and these ceph-libboost packages
conflict with each other, because they install files to the same places.

in order to avoid the confliction, we should uninstall existing packages
before installing a different version of ceph-libboost packages.

ceph-libboost${version}-dev is a package providing the shared headers of
boost library, so, in this change we check if it is installed before
returning or removing the existing packages.

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

Conflicts:
install-deps.sh: use 1.72

4 years agorpm: re-disable SUSE lttng build on z390x 39487/head
Nathan Cutler [Thu, 25 Feb 2021 18:01:18 +0000 (19:01 +0100)]
rpm: re-disable SUSE lttng build on z390x

This partially reverts 2b1e646f7aade3135a98c505111ac7ebef5e93a6 which
mistakenly changed a line inside an "%if 0%{?suse_version}" conditional.

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

4 years agotest: cancelling both noscrub *and* nodeep-scrub 40278/head
Ronen Friedman [Mon, 7 Dec 2020 12:41:45 +0000 (14:41 +0200)]
test: cancelling both noscrub *and* nodeep-scrub

as part of osd-scrub-test.sh.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 43b1129030823817e0b7a21c85de5d3da841510a)

4 years agoosd: fix potential null pointer dereference when sending ping 40277/head
Mykola Golub [Sat, 16 Jan 2021 05:00:09 +0000 (05:00 +0000)]
osd: fix potential null pointer dereference when sending ping

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

4 years agomon/OSDMonitor: fix safety/idempotency of {set,rm}-device-class 40276/head
Sage Weil [Wed, 24 Feb 2021 20:59:57 +0000 (14:59 -0600)]
mon/OSDMonitor: fix safety/idempotency of {set,rm}-device-class

If the command is resent (e.g., due to network reconnect), the second
instance may find that the pending crush map already has the changes
and not wait for it to commit.

Note that the stderr message will be misleading in this case; that is a
problem with most of our mon commands.  :(

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

 Conflicts:
src/mon/OSDMonitor.cc
only because mon. in master is mon-> in octopus

4 years agodebian/ceph-common.postinst: do not chown cephadm log dirs 40275/head
Sage Weil [Tue, 9 Mar 2021 17:56:42 +0000 (11:56 -0600)]
debian/ceph-common.postinst: do not chown cephadm log dirs

The container uid/gid is different than the debian uid/gid (because the
container is centos-based and we got a different uid/gid allocation there).

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

4 years agoosd: propagate base pool application_metadata to tiers 40274/head
Sage Weil [Sat, 13 Mar 2021 16:34:43 +0000 (11:34 -0500)]
osd: propagate base pool application_metadata to tiers

If there is application metadata on the base pool, it should be mirrored
to any other tiers in the set.  This aligns with the fact that the
'ceph osd pool application ...' commands refuse to operate on a non-base
pool.

This fixes problems with accessing tiers (e.g., cache tiers) when the
cephx cap is written in terms of application metadata.

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

4 years agoMerge pull request #40211 from idryomov/wip-krbd-blkroset-5.12-octopus
Ilya Dryomov [Fri, 19 Mar 2021 16:22:29 +0000 (17:22 +0100)]
Merge pull request #40211 from idryomov/wip-krbd-blkroset-5.12-octopus

octopus: qa: krbd_blkroset.t: update for separate hw and user read-only flags

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoqa/tasks/mgr/test_progress.py: remove _osd_in_out_completed_events_count() 40225/head
Kamoltat [Thu, 18 Mar 2021 19:51:34 +0000 (19:51 +0000)]
qa/tasks/mgr/test_progress.py: remove _osd_in_out_completed_events_count()

delete the part where  _osd_in_out_completed_events_count()
was called in test_osd_cannot_recover() and revert to initial
state of the function since we don't need to use this function
in octopus. Also delete a duplicate of _osd_in_out_events_count().
This must be added by mistake in #39289 as well.

No need to fix for the backport in Nautilus: #38173
since the bugs are occured by adding additional code to
the cherry-pick specifically for Octopus.

fixes: https://tracker.ceph.com/issues/49891

Signed-off-by: Kamoltat <ksirivad@redhat.com>
4 years agoMerge pull request #40065 from idryomov/wip-krbd-xfstests-fixes-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:49:51 +0000 (09:49 -0700)]
Merge pull request #40065 from idryomov/wip-krbd-xfstests-fixes-octopus

octopus: qa/suites/krbd: address recent issues caused by newer kernels

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #40029 from yuvalif/wip-yuval-fix-48461
Yuri Weinstein [Thu, 18 Mar 2021 16:49:16 +0000 (09:49 -0700)]
Merge pull request #40029 from yuvalif/wip-yuval-fix-48461

octopus: rgw/notification: trigger notifications on changes from any user

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39968 from dillaman/wip-49438-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:48:43 +0000 (09:48 -0700)]
Merge pull request #39968 from dillaman/wip-49438-octopus

octopus: krbd: make sure the device node is accessible after the mapping

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 years agoMerge pull request #39967 from dillaman/wip-49417-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:47:56 +0000 (09:47 -0700)]
Merge pull request #39967 from dillaman/wip-49417-octopus

octopus: rbd-mirror: delay update snapshot mirror image state

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39966 from dillaman/wip-49257-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:47:28 +0000 (09:47 -0700)]
Merge pull request #39966 from dillaman/wip-49257-octopus

octopus: librbd: refuse to release exclusive lock when removing

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39965 from dillaman/wip-49181-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:47:06 +0000 (09:47 -0700)]
Merge pull request #39965 from dillaman/wip-49181-octopus

octopus: test/rbd-mirror: fix broken ceph_test_rbd_mirror_random_write

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39964 from dillaman/wip-48677-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:46:44 +0000 (09:46 -0700)]
Merge pull request #39964 from dillaman/wip-48677-octopus

octopus: librbd/api: avoid retrieving more than max mirror image info records

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39962 from dillaman/wip-48674-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:46:21 +0000 (09:46 -0700)]
Merge pull request #39962 from dillaman/wip-48674-octopus

octopus: librbd: explicitly disable readahead for writearound cache

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39961 from dillaman/wip-48561-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:45:46 +0000 (09:45 -0700)]
Merge pull request #39961 from dillaman/wip-48561-octopus

octopus: rbd-mirror: bad state and crashes in snapshot-based mirroring

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39958 from smithfarm/wip-49199-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:45:07 +0000 (09:45 -0700)]
Merge pull request #39958 from smithfarm/wip-49199-octopus

octopus: librbd/io: conditionally disable move optimization

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #39954 from smithfarm/wip-49361-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:44:23 +0000 (09:44 -0700)]
Merge pull request #39954 from smithfarm/wip-49361-octopus

octopus: rgw: fix sts get_session_token duration check failed

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
4 years agoMerge pull request #39766 from ivancich/wip-49193-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:43:32 +0000 (09:43 -0700)]
Merge pull request #39766 from ivancich/wip-49193-octopus

octopus: rgw: allow rgw-orphan-list to handle intermediate files w/ binary data

Reviewed-by: Ali Maredia <amaredia@redhat.com>
4 years agoMerge pull request #39785 from ivancich/wip-49186-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:37:37 +0000 (09:37 -0700)]
Merge pull request #39785 from ivancich/wip-49186-octopus

octopus: rgw: tooling to locate rgw objects with missing rados components

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39758 from href/wip-49070-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:32:53 +0000 (09:32 -0700)]
Merge pull request #39758 from href/wip-49070-octopus

octopus: rgw: add MD5 in forward_request

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39746 from pponnuvel/wip-49538-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:32:25 +0000 (09:32 -0700)]
Merge pull request #39746 from pponnuvel/wip-49538-octopus

octopus: rgw: catch non int exception

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #39611 from smithfarm/wip-49380-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:31:27 +0000 (09:31 -0700)]
Merge pull request #39611 from smithfarm/wip-49380-octopus

octopus: rgw: multisite: fix single-part-MPU object etag misidentify problem

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39935 from gerald-yang/octopus-49641
Yuri Weinstein [Thu, 18 Mar 2021 16:29:53 +0000 (09:29 -0700)]
Merge pull request #39935 from gerald-yang/octopus-49641

octopus: common: Fix assertion when disabling and re-enabling clog_to_monitors

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39899 from singuliere/wip-49039-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:29:11 +0000 (09:29 -0700)]
Merge pull request #39899 from singuliere/wip-49039-octopus

octopus: blk/kernel: fix io_uring got (4) Interrupted system call

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39717 from sebastian-philipp/octopus-backport-39385
Yuri Weinstein [Thu, 18 Mar 2021 16:28:48 +0000 (09:28 -0700)]
Merge pull request #39717 from sebastian-philipp/octopus-backport-39385

octopus: cephadm: allow redeploy of daemons in error state if container running

Reviewed-by: Adam King adking@redhat.com
4 years agoMerge pull request #39887 from tchaikov/octopus-49533
Yuri Weinstein [Thu, 18 Mar 2021 16:26:56 +0000 (09:26 -0700)]
Merge pull request #39887 from tchaikov/octopus-49533

octopus: mgr: relax osd ok-to-stop condition on degraded pgs

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
4 years agoMerge pull request #39804 from sebastian-philipp/octopus-backport-39770
Yuri Weinstein [Thu, 18 Mar 2021 16:26:09 +0000 (09:26 -0700)]
Merge pull request #39804 from sebastian-philipp/octopus-backport-39770

octopus: cephadm: add docker.service dependency in systemd units

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #39578 from neha-ojha/wip-49320-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:23:59 +0000 (09:23 -0700)]
Merge pull request #39578 from neha-ojha/wip-49320-octopus

octopus: qa/*/thrash_cache_writeback_proxy_none.yaml: disable writeback overlay tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39343 from smithfarm/wip-48904-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:18:19 +0000 (09:18 -0700)]
Merge pull request #39343 from smithfarm/wip-48904-octopus

octopus: common/ipaddr: Allow binding on lo

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39341 from smithfarm/wip-48898-octopus
Yuri Weinstein [Thu, 18 Mar 2021 16:16:07 +0000 (09:16 -0700)]
Merge pull request #39341 from smithfarm/wip-48898-octopus

octopus: mgr: fix deadlock in ActivePyModules::get_osdmap()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoqa: krbd_blkroset.t: update for separate hw and user read-only flags 40211/head
Ilya Dryomov [Wed, 17 Mar 2021 10:00:33 +0000 (11:00 +0100)]
qa: krbd_blkroset.t: update for separate hw and user read-only flags

Since kernel 5.12, hardware read-only state and user read-only
policy (BLKROGET/SET ioctls) are tracked separately in the block
layer.  As the purpose of our ->set_read_only() method was exactly
that, it was removed.

As a side effect, BLKROSET no longer returns EROFS on an attempt
to make a read-only mapping read-write with "blockdev --setrw".
The policy gets updated, but the device remains read-only as before
because the hardware (== mapping) state is controlled by the driver.

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

4 years agokrbd: check device node accessibility only if we actually mapped 39968/head
Ilya Dryomov [Mon, 15 Mar 2021 19:30:07 +0000 (20:30 +0100)]
krbd: check device node accessibility only if we actually mapped

Fix a braino that came with commit f6854ac65d2a ("krbd: make sure the
device node is accessible after the mapping").

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

4 years ago15.2.10 v15.2.10
Jenkins Build Slave User [Wed, 17 Mar 2021 17:02:39 +0000 (17:02 +0000)]
15.2.10

4 years agoMerge pull request #40155 from rhcs-dashboard/wip-49272-octopus
Yuri Weinstein [Tue, 16 Mar 2021 17:26:40 +0000 (10:26 -0700)]
Merge pull request #40155 from rhcs-dashboard/wip-49272-octopus

octopus: mgr/dashboard: delete EOF when reading passwords from file

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agomgr/dashboard: delete EOF when reading passwords from file 40155/head
Alfonso Martínez [Tue, 9 Feb 2021 10:17:52 +0000 (11:17 +0100)]
mgr/dashboard: delete EOF when reading passwords from file

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit caeadf1397db00c6b7ba218b1910508099802e39)

4 years agoqa/suites/rados/singletone: whitelist MON_DOWN when injecting msgr errors 40138/head
Sage Weil [Fri, 19 Feb 2021 22:46:28 +0000 (16:46 -0600)]
qa/suites/rados/singletone: whitelist MON_DOWN when injecting msgr errors

add a 'none.yaml' facet which doesn't whitelist so we hopefully capture
other causes of MON_DOWN.

This fixes at least one source of https://tracker.ceph.com/issues/45441

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

4 years agopybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing 40127/head
Neha Ojha [Tue, 9 Mar 2021 00:48:58 +0000 (00:48 +0000)]
pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing

Add an additional check to make sure that the choose_args section has the same
number of buckets as the crushmap. If not, ensure that
get_compat_weight_set_weights assigns weight-sets to all buckets.

Without this change, if we end up with an orig_ws, which has fewer buckets
than the crushmap, the mgr will crash due a KeyError in do_crush_compat().

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

 Conflicts:
src/pybind/mgr/balancer/module.py - trivial resolution

4 years agoMerge pull request #39701 from ifed01/wip-ifed-fix-huge-bluefs-oct
Yuri Weinstein [Mon, 15 Mar 2021 16:36:57 +0000 (09:36 -0700)]
Merge pull request #39701 from ifed01/wip-ifed-fix-huge-bluefs-oct

octopus: os/bluestore: fix huge reads/writes at BlueFS

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agorgw/notification: trigger notifications on changes from any user 40029/head
Yuval Lifshitz [Tue, 17 Nov 2020 11:31:59 +0000 (13:31 +0200)]
rgw/notification: trigger notifications on changes from any user

any user authorized to make changes to a bucket may trigger
notifications defined on that bucket.
manual test procedure of the fix is described here:
https://gist.github.com/yuvalif/39c183aa0f74d286ecef7844268817df

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

Conflics:
src/test/rgw/rgw_multi/tests_ps.py
manual changes were made to the tests so they can pass. this does not affect teuthology runs

4 years agoMerge pull request #40074 from ideepika/wip-fix-ignorelist
Yuri Weinstein [Fri, 12 Mar 2021 23:24:32 +0000 (15:24 -0800)]
Merge pull request #40074 from ideepika/wip-fix-ignorelist

octopus: qa/suites/upgrade: s/whitelist/ignorelist for octopus specific tests

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #39754 from ifed01/wip-ifed-bluefs-zero-read-retry-octa
Yuri Weinstein [Fri, 12 Mar 2021 23:12:55 +0000 (15:12 -0800)]
Merge pull request #39754 from ifed01/wip-ifed-bluefs-zero-read-retry-octa

octopus: os/bluestore: Add option to check BlueFS reads

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agomgr/cephadm: add CEPHADM_STRAY_DAEMON unittest 40009/head
Michael Fritch [Fri, 12 Mar 2021 17:23:12 +0000 (10:23 -0700)]
mgr/cephadm: add CEPHADM_STRAY_DAEMON unittest

Fixes: https://tracker.ceph.com/issues/49573
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 88dc55266958d77ffa1da34a3d20c039cb249ac5)

4 years agomgr/cephadm: alias rgw-nfs -> nfs
Michael Fritch [Fri, 12 Mar 2021 17:23:01 +0000 (10:23 -0700)]
mgr/cephadm: alias rgw-nfs -> nfs

RGW will register a daemon_type `rgw-nfs` which needs to map to
the corresponding cephadm nfs daemon to avoid stray daemon warnings

Fixes: https://tracker.ceph.com/issues/49573
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0f237223accbea49cf9792400a657cbf696a5d67)

4 years agoMerge pull request #39872 from rhcs-dashboard/wip-48190-octopus
Yuri Weinstein [Fri, 12 Mar 2021 17:09:55 +0000 (09:09 -0800)]
Merge pull request #39872 from rhcs-dashboard/wip-48190-octopus

octopus: mgr/dashboard: add ssl verify option for prometheus and alert manager

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39868 from rhcs-dashboard/wip-49083-octopus
Yuri Weinstein [Fri, 12 Mar 2021 17:09:14 +0000 (09:09 -0800)]
Merge pull request #39868 from rhcs-dashboard/wip-49083-octopus

octopus: mgr/dashboard: Fix missing root path of each session for CephFS

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #39854 from rhcs-dashboard/wip-49324-octopus
Yuri Weinstein [Fri, 12 Mar 2021 17:07:27 +0000 (09:07 -0800)]
Merge pull request #39854 from rhcs-dashboard/wip-49324-octopus

octopus: mgr/dashboard: fix MTU Mismatch alert

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
4 years agoMerge pull request #39852 from rhcs-dashboard/wip-49599-octopus
Yuri Weinstein [Fri, 12 Mar 2021 17:05:59 +0000 (09:05 -0800)]
Merge pull request #39852 from rhcs-dashboard/wip-49599-octopus

octopus: mgr/dashboard: report mgr fsid

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>