]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agoosd, kv: add debugs along the pg_log_t::dups paths. 47688/head
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)

3 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)

3 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)

3 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)

3 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)

3 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)

3 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)

3 years agoMerge pull request #47339 from ifed01/wip-ifed-fix-mempool-cache-other-qui
Igor Fedotov [Thu, 18 Aug 2022 20:23:30 +0000 (23:23 +0300)]
Merge pull request #47339 from ifed01/wip-ifed-fix-mempool-cache-other-qui

quincy: os/bluestore: fix AU accounting in bluestore_cache_other mempool

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agoMerge pull request #47452 from NitzanMordhai/wip-57030-quincy
Yuri Weinstein [Thu, 18 Aug 2022 15:18:06 +0000 (08:18 -0700)]
Merge pull request #47452 from NitzanMordhai/wip-57030-quincy

quincy: librados: rados_ioctx_destroy check for initialized ioctx

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47133 from Matan-B/wip-56578-quincy
Yuri Weinstein [Thu, 18 Aug 2022 15:15:17 +0000 (08:15 -0700)]
Merge pull request #47133 from Matan-B/wip-56578-quincy

quincy: osd/SnapMapper: fix legacy key conversion in snapmapper class

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47629 from rhcs-dashboard/wip-57141-quincy
Avan [Thu, 18 Aug 2022 14:33:33 +0000 (20:03 +0530)]
Merge pull request #47629 from rhcs-dashboard/wip-57141-quincy

quincy: exporter: per node metric exporter

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #46076 from idryomov/wip-mrun-bashism-quincy
Ilya Dryomov [Wed, 17 Aug 2022 06:55:08 +0000 (08:55 +0200)]
Merge pull request #46076 from idryomov/wip-mrun-bashism-quincy

quincy: tooling: Change mrun to use bash

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
3 years agoMerge pull request #47400 from tserong/wip-56976-quincy
Yuri Weinstein [Tue, 16 Aug 2022 14:43:01 +0000 (07:43 -0700)]
Merge pull request #47400 from tserong/wip-56976-quincy

quincy: cephfs-shell: move source to separate subdirectory

Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #47474 from neesingh-rh/wip-57042-quincy
Yuri Weinstein [Tue, 16 Aug 2022 14:41:24 +0000 (07:41 -0700)]
Merge pull request #47474 from neesingh-rh/wip-57042-quincy

quincy: mgr/volumes: add interface to check the presence of subvolumegroups/subvolumes

Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
3 years agoMerge pull request #47281 from batrick/i56713
Yuri Weinstein [Tue, 16 Aug 2022 14:29:47 +0000 (07:29 -0700)]
Merge pull request #47281 from batrick/i56713

quincy: mds: standby-replay daemon always removed in MDSMonitor::prepare_beacon

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoexporter: per node metric exporter 47629/head
Avan Thakkar [Mon, 1 Aug 2022 06:50:53 +0000 (12:20 +0530)]
exporter: per node metric exporter

Fixes: https://tracker.ceph.com/issues/55046
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit d7226fcc454a96b664a7f567b4bf04338ac7ccf2)

3 years agoMerge pull request #47616 from tchaikov/quincy-fix-warnings
Kefu Chai [Tue, 16 Aug 2022 11:11:52 +0000 (19:11 +0800)]
Merge pull request #47616 from tchaikov/quincy-fix-warnings

quincy: mgr: Define PY_SSIZE_T_CLEAN ahead of every Python.h

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
3 years agoMerge pull request #47602 from tchaikov/quincy-pr-47500
Kefu Chai [Tue, 16 Aug 2022 11:08:47 +0000 (19:08 +0800)]
Merge pull request #47602 from tchaikov/quincy-pr-47500

quincy: pybind/mgr/dashboard: do not use distutils.version.StrictVersion

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #47625 from tchaikov/quincy-pr-47617
Kefu Chai [Tue, 16 Aug 2022 09:43:31 +0000 (17:43 +0800)]
Merge pull request #47625 from tchaikov/quincy-pr-47617

quincy: cmake: set $PATH for tests using jsonnet tools

Reviewed-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
3 years agocmake: set $PATH for tests using jsonnet tools 47625/head
Kefu Chai [Tue, 16 Aug 2022 02:52:53 +0000 (10:52 +0800)]
cmake: set $PATH for tests using jsonnet tools

otherwise they would not able to find executables installed into
${CMAKE_CURRENT_BINARY_DIR}.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 4a3afcf27769a512fba7e0194d2e3b6a55e06bca)

3 years agoMerge pull request #47104 from rhcs-dashboard/wip-56563-quincy
Nizamudeen A [Tue, 16 Aug 2022 08:36:53 +0000 (14:06 +0530)]
Merge pull request #47104 from rhcs-dashboard/wip-56563-quincy

quincy: mgr/dashboard: rbd image pagination

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agomgr: Define PY_SSIZE_T_CLEAN ahead of every Python.h 47616/head
Pete Zaitcev [Wed, 15 Dec 2021 05:04:34 +0000 (23:04 -0600)]
mgr: Define PY_SSIZE_T_CLEAN ahead of every Python.h

Building on Fedora 35 with Python 3.10 makes vstart to loop
forever, throwing the following message:

 Error EINVAL: SystemError: PY_SSIZE_T_CLEAN macro must be
 defined for '#' formats

I followed the hint in the following document:
 https://docs.python.org/3/c-api/intro.html

It says "recommended" to always define PY_SSIZE_T_CLEAN,
but as you can see it is actually required in our case.

Fixes: https://tracker.ceph.com/issues/53441
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
(cherry picked from commit 389054888f2aa782f73564125ec7a1ef0212d536)

3 years agopybind/mgr/dashboard: do not use distutils.version.StrictVersion
Kefu Chai [Mon, 8 Aug 2022 14:41:17 +0000 (22:41 +0800)]
pybind/mgr/dashboard: do not use distutils.version.StrictVersion

replace `distutils.version.StrictVersion` with
`pkg_resources.parse_version()`

as the former is deprecated, see https://peps.python.org/pep-0632/.
let's use `pkg_resources` instead. this change also addresses
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010894.
we have this issue when testing with an ubuntu jammy test node.
see https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1967139

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 075b31c1c763286065f13be87c6ba987529b1206)

Conflicts:
debian/ceph-mgr-dashboard.requires: add the runtime requirement
to debian/control instead.

3 years agoMerge pull request #47585 from idryomov/wip-openssl3-deprecation-warnings-quincy
Kefu Chai [Tue, 16 Aug 2022 08:16:33 +0000 (16:16 +0800)]
Merge pull request #47585 from idryomov/wip-openssl3-deprecation-warnings-quincy

quincy: build: Silence deprecation warnings from OpenSSL 3

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #47453 from rhcs-dashboard/wip-57037-quincy
Nizamudeen A [Tue, 16 Aug 2022 06:17:44 +0000 (11:47 +0530)]
Merge pull request #47453 from rhcs-dashboard/wip-57037-quincy

quincy: mgr/dashboard: host list tables doesn't show all services deployed

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agopybind/mgr/dashboard: do not use distutils.version.StrictVersion 47602/head
Kefu Chai [Mon, 8 Aug 2022 14:41:17 +0000 (22:41 +0800)]
pybind/mgr/dashboard: do not use distutils.version.StrictVersion

replace `distutils.version.StrictVersion` with
`pkg_resources.parse_version()`

as the former is deprecated, see https://peps.python.org/pep-0632/.
let's use `pkg_resources` instead. this change also addresses
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010894.
we have this issue when testing with an ubuntu jammy test node.
see https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1967139

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 075b31c1c763286065f13be87c6ba987529b1206)

Conflicts:
debian/ceph-mgr-dashboard.requires: add the runtime requirement
to debian/control instead.

3 years agoMerge pull request #47603 from tchaikov/quincy-pr-45085
Kefu Chai [Tue, 16 Aug 2022 01:47:30 +0000 (09:47 +0800)]
Merge pull request #47603 from tchaikov/quincy-pr-45085

quincy: crimson: fixes for compiling with fmtlib v8

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agomgr/dashboard: bump up more-itertools 47585/head
Kefu Chai [Fri, 12 Aug 2022 05:06:25 +0000 (13:06 +0800)]
mgr/dashboard: bump up more-itertools

before this change, more-itertools tries to import Sequence from
collections, this leads us to failures like:

```
Traceback (most recent call last):
  File "/usr/lib/python3.10/runpy.py", line 187, in _run_module_as_main
    mod_name, mod_spec, code = _get_module_details(mod_name, _Error)
  File "/usr/lib/python3.10/runpy.py", line 110, in _get_module_details
    __import__(pkg_name)
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/__init__.py",
line 9, in <module>
    import cherrypy
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/cherrypy/__init__.py",
line 76, in <module>
    from . import _cprequest, _cpserver, _cptree, _cplogging, _cpconfig
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/cherrypy/_cprequest.py",
line 11, in <module>
    from cherrypy import _cpreqbody
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/cherrypy/_cpreqbody.py",
line 135, in <module>
    import cheroot.server
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/cheroot/server.py",
line 96, in <module>
    from .workers import threadpool
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/cheroot/workers/threadpool.py",
line 20, in <module>
    from jaraco.functools import pass_none
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/jaraco/functools.py",
line 8, in <module>
    import more_itertools
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/more_itertools/__init__.py",
line 1, in <module>
    from more_itertools.more import *  # noqa
  File
"/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/lib/python3.10/site-packages/more_itertools/more.py",
line 3, in <module>
    from collections import Counter, defaultdict, deque, Sequence
ImportError: cannot import name 'Sequence' from 'collections'
(/usr/lib/python3.10/collections/__init__.py)
ERROR: InvocationError for command
/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/bin/python3
-m dashboard.controllers.docs
/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/dashboard/.tox/openapi-check/tmp/openapi.yaml
(exited with code 1)
```
after this change, more-itertools is pin'ed at the latest stable
at the time of writing, which includes the fixes including
https://github.com/more-itertools/more-itertools/commit/30a861bc5a4f53a9ba73923c9048a3632a0f9d18
.

please note, more-itertools dropped python3.3 support. but neither
do us support this python version, so we should be safe.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 26f5678d4f58bfa18c389cd05ecdc454deb3024f)

3 years agomon: Replace deprecated use of format_to
Adam C. Emerson [Mon, 7 Mar 2022 23:54:30 +0000 (18:54 -0500)]
mon: Replace deprecated use of format_to

The non-deprecated version takes an explicit OutputIterator.

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

3 years agomon: Replace deprecated use of format_to 47603/head
Adam C. Emerson [Mon, 7 Mar 2022 23:54:30 +0000 (18:54 -0500)]
mon: Replace deprecated use of format_to

The non-deprecated version takes an explicit OutputIterator.

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

3 years agocrimson/admin/osd_admin: avoid using _format()
Kefu Chai [Tue, 1 Mar 2022 16:01:37 +0000 (00:01 +0800)]
crimson/admin/osd_admin: avoid using _format()

see also 3fd91d7e6d9315244aeff02070721ef4a021b0b3

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 36fc37eb618bb04d6543097df07c2ac09c0d79db)

3 years agocrimson: specialize fmt::formatter<>() for crimson types
Kefu Chai [Fri, 18 Feb 2022 15:23:54 +0000 (23:23 +0800)]
crimson: specialize fmt::formatter<>() for crimson types

otherwise we'd have FTBFS like

/usr/include/fmt/core.h:1727:3: error: static_assert failed due to requirement 'formattable' "Cannot format an argument. To make type T formattable provide a formatter<T> specialization: https://fmt.dev/latest/api$
  static_assert(
  ^
/usr/include/fmt/core.h:1853:23: note: in instantiation of function template specialization 'fmt::detail::make_arg<true, fmt::basic_format_context<fmt::appender, char>, fmt::detail::type::custom_type, crimson::os:$
        data_{detail::make_arg<

please note, delta_op_t is lifted out of the templated outer class
to avoid the headache of specialization of template of template in
another namespace.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit bb9d099ede8b9df36dba735a95bc1600fdd11408)

3 years agocrimson/os/seastore: drop compile-time fmt validation
Kefu Chai [Fri, 18 Feb 2022 14:44:51 +0000 (22:44 +0800)]
crimson/os/seastore: drop compile-time fmt validation

_format() was deprecated in fmtlib v8, see also
https://github.com/fmtlib/fmt/pull/2646

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 3fd91d7e6d9315244aeff02070721ef4a021b0b3)

3 years agocrimson/admin/osd_admin: avoid using _format()
Kefu Chai [Tue, 1 Mar 2022 16:01:37 +0000 (00:01 +0800)]
crimson/admin/osd_admin: avoid using _format()

see also 3fd91d7e6d9315244aeff02070721ef4a021b0b3

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 36fc37eb618bb04d6543097df07c2ac09c0d79db)

3 years agocrimson: specialize fmt::formatter<>() for crimson types
Kefu Chai [Fri, 18 Feb 2022 15:23:54 +0000 (23:23 +0800)]
crimson: specialize fmt::formatter<>() for crimson types

otherwise we'd have FTBFS like

/usr/include/fmt/core.h:1727:3: error: static_assert failed due to requirement 'formattable' "Cannot format an argument. To make type T formattable provide a formatter<T> specialization: https://fmt.dev/latest/api$
  static_assert(
  ^
/usr/include/fmt/core.h:1853:23: note: in instantiation of function template specialization 'fmt::detail::make_arg<true, fmt::basic_format_context<fmt::appender, char>, fmt::detail::type::custom_type, crimson::os:$
        data_{detail::make_arg<

please note, delta_op_t is lifted out of the templated outer class
to avoid the headache of specialization of template of template in
another namespace.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit bb9d099ede8b9df36dba735a95bc1600fdd11408)

3 years agocrimson/os/seastore: drop compile-time fmt validation
Kefu Chai [Fri, 18 Feb 2022 14:44:51 +0000 (22:44 +0800)]
crimson/os/seastore: drop compile-time fmt validation

_format() was deprecated in fmtlib v8, see also
https://github.com/fmtlib/fmt/pull/2646

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 3fd91d7e6d9315244aeff02070721ef4a021b0b3)

3 years agoMerge pull request #47498 from tchaikov/quincy-pr-47486
Kefu Chai [Mon, 15 Aug 2022 15:53:53 +0000 (23:53 +0800)]
Merge pull request #47498 from tchaikov/quincy-pr-47486

quincy: mgr/dashboard: bump up teuthology

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #47586 from zdover23/wip-doc-2022-08-15-backport-47580-to-quincy
zdover23 [Mon, 15 Aug 2022 15:19:26 +0000 (01:19 +1000)]
Merge pull request #47586 from zdover23/wip-doc-2022-08-15-backport-47580-to-quincy

quincy: doc/rados/operations: add prompts to operating.rst

Reviewed-by: Neha Ojha: <nojha@redhat.com>
3 years agodoc/rados/operations: add prompts to operating.rst 47586/head
Zac Dover [Sat, 13 Aug 2022 23:14:56 +0000 (09:14 +1000)]
doc/rados/operations: add prompts to operating.rst

This commit adds ".. prompt:: bash $"-style prompts to operating.rst.
This brings this file up to the standard established in 2020 when
Kefu added support for the ".. prompt::" directive.

This commit is a part of an initiative to modernize the presentation
of all BASH commands in the RADOS documentation.

The progress of this project can be tracked here:
https://tracker.ceph.com/issues/57108

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

3 years agobuild: Silence deprecation warnings from OpenSSL 3
Adam C. Emerson [Wed, 18 May 2022 22:06:01 +0000 (18:06 -0400)]
build: Silence deprecation warnings from OpenSSL 3

The OpenSSL developers suggest that anyone wishing to continue using
low-level functions may either live with the warnings, silence them,
or switch to high level functions.

As high level functions do their own memory allocation, switching to
them may lead to performance regressions.

We do not wish to have deprecation warnings filling up our compiler
outputs when searching for other messages.

So silencing the warnings, at least for now, seems the least bad option.

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

3 years agoMerge pull request #47579 from idryomov/wip-alloc-size-doc-fixup-quincy
Ilya Dryomov [Sun, 14 Aug 2022 06:53:13 +0000 (08:53 +0200)]
Merge pull request #47579 from idryomov/wip-alloc-size-doc-fixup-quincy

quincy: doc/man/rbd: Mention changed `bluestore_min_alloc_size`

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agodoc/man/rbd: Mention changed `bluestore_min_alloc_size` 47579/head
Niklas Hambüchen [Sun, 2 Jan 2022 22:27:55 +0000 (23:27 +0100)]
doc/man/rbd: Mention changed `bluestore_min_alloc_size`

This change was done in: https://github.com/ceph/ceph/pull/34588

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
(cherry picked from commit 254025343b1c49e1d0aa72fdea0cbe0483704245)

3 years agoMerge pull request #47549 from ceph/quincy-spec2
Kefu Chai [Wed, 10 Aug 2022 23:52:18 +0000 (07:52 +0800)]
Merge pull request #47549 from ceph/quincy-spec2

quincy: ceph.spec.in backports

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoceph.spec.in: disable system_pmdk on aarch64 47549/head
David Galloway [Wed, 10 Aug 2022 18:36:43 +0000 (14:36 -0400)]
ceph.spec.in: disable system_pmdk on aarch64

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit fcf48cda0a8933c998d1ce51adecca4cd2b0efe2)

3 years agoceph.spec.in: always use stock compiler on el9
Kefu Chai [Wed, 10 Aug 2022 14:52:12 +0000 (22:52 +0800)]
ceph.spec.in: always use stock compiler on el9

as RHEL/CentOS 9, we have the access to GCC-11, which is good enough for
compiling main HEAD even with WITH_SEASTAR=ON.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 215c07ba8b21481e1951dfbfb2d52fbc0e58eecc)

3 years agoceph.spec.in: define %gts_prefix
Kefu Chai [Wed, 10 Aug 2022 14:44:59 +0000 (22:44 +0800)]
ceph.spec.in: define %gts_prefix

less repeatings this way, also  allow maintainer to use other version of GTS.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 53302f5f7f793aea73f521e8403eedda42357a92)

3 years agoceph.spec.in: %enable_devtoolset11 only if the macro is defined
Kefu Chai [Wed, 10 Aug 2022 14:35:14 +0000 (22:35 +0800)]
ceph.spec.in: %enable_devtoolset11 only if the macro is defined

there is chance that we are using `yum-builddep` to prepare the
build dependencies. in that case, gcc-toolset-11-build is not
installed. it's like a chicken-egg dilemma, but the point is
`yum-builddep` is able to pull in the gcc-toolset-11-build. once
gcc-toolset-11-build is installed, we will have the %enable_devtoolset11
rpm macro.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 75dd92353381c6ec5ac7251585a276059b8a2253)

3 years agoceph.spec.in: add libatomic to BuildRequires on fedora
Kefu Chai [Mon, 8 Aug 2022 12:40:52 +0000 (20:40 +0800)]
ceph.spec.in: add libatomic to BuildRequires on fedora

otherwise we'd have failures like

/opt/compiler-explorer/gcc-trunk-20220808/bin/../lib/gcc/x86_64-linux-gnu/13.0.0/../../../../x86_64-linux-gnu/bin/ld:
/tmp/ccVlMbVh.o: in function `std::atomic<tagged_ptr>::store(tagged_ptr,
std::memory_order)':
/opt/compiler-explorer/gcc-trunk-20220808/include/c++/13.0.0/atomic:273:
undefined reference to `__atomic_store_16'

when generating the building system using CMake on fedora 36.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 7e122341d901c7bf02d388d69058c167626d55b0)

3 years agoceph.spec.in: BuildRequires gcc-toolset-11-libatomic-devel for aarch64
Kefu Chai [Thu, 4 Aug 2022 03:57:05 +0000 (11:57 +0800)]
ceph.spec.in: BuildRequires gcc-toolset-11-libatomic-devel for aarch64

to address following failure when generating the building system
using CMake:

```
-- Performing Test HAVE_LIBATOMIC
-- Performing Test HAVE_LIBATOMIC - Failed
CMake Error at cmake/modules/CheckCxxAtomic.cmake:66 (message):
  Host compiler /opt/rh/gcc-toolset-11/root/usr/bin/c++ requires libatomic,
but it is not found
```

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 3811e8835d5dadd006f67f53ea50386a6f98f407)

3 years agoceph.spec.in: call %enable_devtoolset11 on centos8
Kefu Chai [Thu, 4 Aug 2022 01:00:29 +0000 (09:00 +0800)]
ceph.spec.in: call %enable_devtoolset11 on centos8

before this change %enable_devtoolset11 is called only when building
with crimson on centos8.

after this change %enable_devtoolset11 is called when building on
centos8. because we've started using gcc-toolset-11 for building
rpm packages on centos8 after the C++20 migration. so, to build
with gcc-11, we need to enable it.

also, because gcc-toolset-11 is used, we have to disable
annotated_build.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 336fe86af86c6e7becd8c3f9e8c88db4f22fbe02)

3 years agoceph.spec.in: set BuildRequires: gcc-c++ >= 11 for SUSE distros
Tim Serong [Wed, 3 Aug 2022 05:20:23 +0000 (15:20 +1000)]
ceph.spec.in: set BuildRequires: gcc-c++ >= 11 for SUSE distros

This is much simpler than explicitly requiring gcc 11, and
anyway, openSUSE Tumbleweed is up to gcc 12 now.

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 80949babab4aac86647ce9973f6b44adb92fae95)

3 years agoceph.spec.in: add gcc-toolset-11-annobin-plugin-gcc
Casey Bodley [Wed, 6 Apr 2022 21:02:45 +0000 (17:02 -0400)]
ceph.spec.in: add gcc-toolset-11-annobin-plugin-gcc

gcc-toolset-11-annobin is already installed, but ceph.spec.in adds
"-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" which needs the gcc
plugin too

resolves this failure during the cmake configure step:

-- Check for working CXX compiler: /opt/rh/gcc-toolset-11/root/usr/bin/c++
-- Check for working CXX compiler: /opt/rh/gcc-toolset-11/root/usr/bin/c++ - broken
CMake Error at /usr/share/cmake/Modules/CMakeTestCXXCompiler.cmake:59 (message):
  The C++ compiler

    "/opt/rh/gcc-toolset-11/root/usr/bin/c++"

  is not able to compile a simple test program.

  It fails with the following output:

    Change Dir: /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11497-gfae772b8/rpm/el8/BUILD/ceph-17.0.0-11497-gfae772b8/x86_64-redhat-linux-gnu/CMakeFiles/CMakeTmp

    Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_09421/fast && /usr/bin/gmake  -f CMakeFiles/cmTC_09421.dir/build.make CMakeFiles/cmTC_09421.dir/build
    gmake[1]: Entering directory '/home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11497-gfae772b8/rpm/el8/BUILD/ceph-17.0.0-11497-gfae772b8/x86_64-redhat-linux-gnu/CMakeFiles/CMakeTmp'
    Building CXX object CMakeFiles/cmTC_09421.dir/testCXXCompiler.cxx.o
    /opt/rh/gcc-toolset-11/root/usr/bin/c++   -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection  -o CMakeFiles/cmTC_09421.dir/testCXXCompiler.cxx.o -c /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11497-gfae772b8/rpm/el8/BUILD/ceph-17.0.0-11497-gfae772b8/x86_64-redhat-linux-gnu/CMakeFiles/CMakeTmp/testCXXCompiler.cxx
    cc1plus: fatal error: inaccessible plugin file plugin/annobin.so expanded from short plugin name annobin: No such file or directory
    compilation terminated.

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

3 years agorpm: BuildRequires gcc-toolset-10-gcc-c++ >= 10.2
Casey Bodley [Thu, 24 Feb 2022 19:26:08 +0000 (14:26 -0500)]
rpm: BuildRequires gcc-toolset-10-gcc-c++ >= 10.2

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

3 years agoceph.spec.in: disable WITH_JAEGER if "with seastar"
Kefu Chai [Mon, 11 Jul 2022 00:21:19 +0000 (20:21 -0400)]
ceph.spec.in: disable WITH_JAEGER if "with seastar"

this is an intermediate solution for building crimson rpm packages.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 40039e7b0050ecbb1679866ccca644a455e6ad2a)

3 years agoceph.spec.in: enable WITH_SEASTAR if "with seastar"
Kefu Chai [Mon, 11 Jul 2022 00:19:51 +0000 (20:19 -0400)]
ceph.spec.in: enable WITH_SEASTAR if "with seastar"

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit be0b9534db80c96412f3c65f7bd91464c727b82c)

3 years agoceph.spec.in: use %enable_devtoolset11 to enable GTS-11
Kefu Chai [Mon, 27 Jun 2022 13:18:57 +0000 (21:18 +0800)]
ceph.spec.in: use %enable_devtoolset11 to enable GTS-11

%enable_devtoolset11 redefines %___build_pre by appending
`source scl_source enable gcc-toolset-11` to it. `___build_pre` should
be able to populate this setting to both %build and %install. and hence
address the FTBFS where we need to use the tool chain from GTS-11.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 49459d92fec553246b35719e9defc0ad7582f701)
(cherry picked from commit 89a6a2d80236db0cb2ef54325ebc483c5491da25)

3 years agoceph.spec.in: move and undef _annotated_build only for rhels.
Radoslaw Zarzynski [Tue, 28 Jun 2022 01:15:15 +0000 (01:15 +0000)]
ceph.spec.in: move and undef _annotated_build only for rhels.

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

3 years agoceph.spec.in: enable toolset 11 also in install
Radoslaw Zarzynski [Mon, 27 Jun 2022 19:38:03 +0000 (19:38 +0000)]
ceph.spec.in: enable toolset 11 also in install

This can be surprising but we actually compile things during
the `install` stage of `rpm-build`. The example is the pybind's
`setup.py` which builds `rados_dummy.c`.

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

3 years agoceph.spec.in: use gcc-toolset-11 for building crimson
Radosław Zarzyński [Tue, 31 May 2022 10:21:41 +0000 (12:21 +0200)]
ceph.spec.in: use gcc-toolset-11 for building crimson

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit 13f3653f59f61c1f7e90c05e37e43e0ef912d1ea)

3 years agoceph.spec.in: use gcc-toolset-10 for building crimson
Radosław Zarzyński [Mon, 28 Mar 2022 14:38:44 +0000 (16:38 +0200)]
ceph.spec.in: use gcc-toolset-10 for building crimson

This commit bumps up the toolset version but only to build crimson.
That is, the classical OSD stays unaffected.

The reason behind the upgrade is the following FTBFS:

```
[ 32%] Building CXX object src/seastar/CMakeFiles/seastar.dir/src/core/reactor.cc.o
/home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc: In constructor ‘seastar::reactor::reactor(std::shared_ptr<seastar::smp>, seastar::alien::instance&, unsigned int, seastar::reactor_backend_selector, seastar::reactor_config)’:
/home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc:926:90: error: use of deleted function ‘seastar::condition_variable::condition_variable()’
  926 |     , _thread_pool(std::make_unique<thread_pool>(this, seastar::format("syscall-{}", id))) {
      |                                                                                          ^
In file included from /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/include/seastar/core/reactor.hh:74,
                 from /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc:32:
/home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/include/seastar/core/condition-variable.hh:157:5: note: ‘seastar::condition_variable::condition_variable() noexcept’ is implicitly deleted because its exception-specification does not match the implicit exception-specification ‘’
  157 |     condition_variable() noexcept = default;
```

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit 30f75143171d5ed1ca94a1a56ce0556db17735b6)

3 years agoMerge pull request #46580 from cbodley/wip-55968
Yuri Weinstein [Wed, 10 Aug 2022 20:31:37 +0000 (13:31 -0700)]
Merge pull request #46580 from cbodley/wip-55968

quincy: rgw: check object storage_class when check_disk_state

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #47368 from kotreshhr/wip-56979-quincy
Yuri Weinstein [Wed, 10 Aug 2022 15:18:01 +0000 (08:18 -0700)]
Merge pull request #47368 from kotreshhr/wip-56979-quincy

quincy: mgr/volumes: Fix subvolume creation in FIPS enabled system.

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #47251 from idryomov/wip-56491-quincy
Yuri Weinstein [Tue, 9 Aug 2022 16:43:34 +0000 (09:43 -0700)]
Merge pull request #47251 from idryomov/wip-56491-quincy

quincy: ceph.spec.in: disable system_pmdk on s390x

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #47210 from kamoltat/wip-ksirivad-backport-quincy-fix-56151
Yuri Weinstein [Tue, 9 Aug 2022 16:42:57 +0000 (09:42 -0700)]
Merge pull request #47210 from kamoltat/wip-ksirivad-backport-quincy-fix-56151

quincy: src/mgr/DaemonServer.cc: fix typo in output gap >= max_pg_num_change

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47086 from kamoltat/wip-ksirivad-quincy-backport-46029
Yuri Weinstein [Tue, 9 Aug 2022 16:41:15 +0000 (09:41 -0700)]
Merge pull request #47086 from kamoltat/wip-ksirivad-quincy-backport-46029

quincy: mon/Elector: notify_rank_removed erase rank from both live_pinging and dead_pinging sets for highest ranked MON

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47020 from sseshasa/wip-56498-quincy
Yuri Weinstein [Tue, 9 Aug 2022 16:40:12 +0000 (09:40 -0700)]
Merge pull request #47020 from sseshasa/wip-56498-quincy

quincy: osd: Set initial mClock QoS params at CONF_DEFAULT level

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #46623 from idryomov/wip-pmdk-wno-error-quincy
Yuri Weinstein [Tue, 9 Aug 2022 16:38:01 +0000 (09:38 -0700)]
Merge pull request #46623 from idryomov/wip-pmdk-wno-error-quincy

quincy: cmake: pass -Wno-error when building PMDK

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #46155 from tserong/wip-55552-quincy
Kefu Chai [Tue, 9 Aug 2022 15:51:59 +0000 (23:51 +0800)]
Merge pull request #46155 from tserong/wip-55552-quincy

quincy: ceph.spec.in: openSUSE: require gcc11-c++, disable parquet

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #47445 from kamoltat/wip-ksirivad-backport-quincy-47138
Neha Ojha [Tue, 9 Aug 2022 11:14:05 +0000 (04:14 -0700)]
Merge pull request #47445 from kamoltat/wip-ksirivad-backport-quincy-47138

quincy: qa/tasks/ceph_manager.py: increase test_pool_min_size timeout

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47490 from sseshasa/wip-57052-quincy
Neha Ojha [Tue, 9 Aug 2022 11:12:30 +0000 (04:12 -0700)]
Merge pull request #47490 from sseshasa/wip-57052-quincy

quincy: osd: Handle oncommits and wait for future work items from mClock queue

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47483 from tchaikov/quincy-pr-47478
Kefu Chai [Mon, 8 Aug 2022 13:22:40 +0000 (21:22 +0800)]
Merge pull request #47483 from tchaikov/quincy-pr-47478

quincy: cmake: remove spaces in macro used for compiling cython code

Reviewed-by: Tim Serong <tserong@suse.com>
3 years agomgr/dashboard: bump up teuthology 47498/head
Kefu Chai [Sat, 6 Aug 2022 00:24:12 +0000 (08:24 +0800)]
mgr/dashboard: bump up teuthology

to include the fix of e7c5d67e10fe29da22180f9e09b8973ae166c8fc,
see https://github.com/ceph/teuthology/pull/1746.
to address the test failure on ubuntu jammy. where we have python3.10

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 0aa1fa68d354badd3363a4ea6cacbce373c3316e)

3 years agoosd: Handle oncommits and wait for future work items from mClock queue 47490/head
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)

3 years agocmake: remove spaces in macro used for compiling cython code 47483/head
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)

3 years agoMerge pull request #47342 from cbodley/wip-56955
Yuri Weinstein [Fri, 5 Aug 2022 15:01:15 +0000 (08:01 -0700)]
Merge pull request #47342 from cbodley/wip-56955

quincy: rgw: better tenant id from the uri on anonymous access

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #47289 from yaarith/wip-56486-quincy
Yuri Weinstein [Fri, 5 Aug 2022 14:54:20 +0000 (07:54 -0700)]
Merge pull request #47289 from yaarith/wip-56486-quincy

quincy: mgr/telemetry: reset health warning after re-opting-in

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoqa: add test cases for subvolumegroup/subvolume exist command 47474/head
Neeraj Pratap Singh [Tue, 19 Jul 2022 07:03:58 +0000 (12:33 +0530)]
qa: add test cases for subvolumegroup/subvolume exist command

Fixes: https://tracker.ceph.com/issues/55821
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit f182ab4676ae2a22ef8e4e08429f9fbea67de14c)

3 years agodoc: Add command to check the presence of any subvolumegroup/subvolume
Neeraj Pratap Singh [Tue, 28 Jun 2022 13:29:03 +0000 (18:59 +0530)]
doc: Add command to check the presence of any subvolumegroup/subvolume

Fixes: https://tracker.ceph.com/issues/55821
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 1c5fe5188aac8ac5394b591c73db40e8faf9a5b6)

3 years agomgr/volumes: add interface to check the presence of subvolumegroups/subvolumes
Neeraj Pratap Singh [Fri, 24 Jun 2022 06:22:38 +0000 (11:52 +0530)]
mgr/volumes: add interface to check the presence of subvolumegroups/subvolumes

Fixes: https://tracker.ceph.com/issues/55821
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 4eff1bb534561a92fd5b1184526526c5f15f9cac)

3 years agoMerge pull request #47201 from aaSharma14/wip-56647-quincy
Nizamudeen A [Thu, 4 Aug 2022 19:42:32 +0000 (01:12 +0530)]
Merge pull request #47201 from aaSharma14/wip-56647-quincy

quincy: mgr/dashboard:Get different storage class metrics in Prometheus dashboard

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #47435 from guits/quincy-bp-pr47434
Guillaume Abrioux [Thu, 4 Aug 2022 09:13:46 +0000 (11:13 +0200)]
Merge pull request #47435 from guits/quincy-bp-pr47434

quincy: backport: ceph-volume/tests: fix test_exception_returns_default

3 years agoMerge pull request #47329 from rhcs-dashboard/wip-56947-quincy
Nizamudeen A [Thu, 4 Aug 2022 08:41:43 +0000 (14:11 +0530)]
Merge pull request #47329 from rhcs-dashboard/wip-56947-quincy

quincy: mgr/dashboard: added pattern validaton for form input

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agomgr/dashboard: add cephadm e2e tests for checking count for services instances 47453/head
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

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

3 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

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)

3 years agoMerge pull request #47430 from rhcs-dashboard/wip-57009-quincy
Pere Diaz Bou [Thu, 4 Aug 2022 06:46:35 +0000 (08:46 +0200)]
Merge pull request #47430 from rhcs-dashboard/wip-57009-quincy

quincy: mgr/dashboard: remove token logging

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agolibrados: rados_ioctx_destroy check for initialized ioctx 47452/head
NitzanMordhai [Tue, 19 Jul 2022 08:35:32 +0000 (08:35 +0000)]
librados: rados_ioctx_destroy check for initialized ioctx

If rados_ioctx_destroy called with un-initilized ioctx we will hit segmented fault
checking ioctx before calling put will prevent that.

Fixes: https://tracker.ceph.com/issues/55001
Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>
(cherry picked from commit e465cfc62ae0f982edb60291c67f4d76a71efd15)

3 years agoMerge pull request #47442 from ceph/quincy-rtd
David Galloway [Wed, 3 Aug 2022 23:07:47 +0000 (19:07 -0400)]
Merge pull request #47442 from ceph/quincy-rtd

quincy: .readthedocs.yml: Always build latest doc/releases pages

3 years agoMerge pull request #47268 from adk3798/quincy-osd-config
Adam King [Wed, 3 Aug 2022 19:58:40 +0000 (15:58 -0400)]
Merge pull request #47268 from adk3798/quincy-osd-config

quincy: mgr/cephadm: add parsing for config on osd specs

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoqa/tasks/ceph_manager.py: Increase timeout 47445/head
Kamoltat [Tue, 12 Jul 2022 19:36:26 +0000 (19:36 +0000)]
qa/tasks/ceph_manager.py: Increase timeout

In test_pool_min_size():

1. Provided buffer time before we check
for recovery in ceph_manager.wait_for_recovery()

2. Increased timeout in ceph_manager.wait_for_clean()

3. Increased sleep time for
ceph_manager.all_active_or_peered()

Fixes:
https://tracker.ceph.com/issues/49777
https://tracker.ceph.com/issues/54511
https://tracker.ceph.com/issues/51904

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit ed73288102f4aa67da3485c70b2409b9eca1873b)

3 years agoqa/tasks/ceph_manager.py: improve loggings
Kamoltat [Fri, 1 Jul 2022 14:42:40 +0000 (14:42 +0000)]
qa/tasks/ceph_manager.py: improve loggings

1. When `test_pool_min_size` hit the case where
`not all PGs are active or peered` we dump
each PG state that doesn't have active or
peered state

2. Improve logs message in `inject_pause()`.

3. Add logs for the `test_map_discontinuity()`.

4. In the function, `choose_action()`,
added more logs regarding `chance_down`.

5. Added more loggings to
`primary_affinity()`,
`thrash_pg_upmap_items()`,
`thrash_pg_upmap()`.

6. Make self.is_clean() dump the pgs that
are not active+clean.

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 9ed53c82cf5d56bd4555084d3bf1c3c9948c4fe3)

3 years ago.readthedocs.yml: Always build latest doc/releases pages 47442/head
David Galloway [Thu, 30 Jun 2022 19:37:58 +0000 (15:37 -0400)]
.readthedocs.yml: Always build latest doc/releases pages

We don't backport PRs merged into doc/releases.  Therefore, when one browses to an older Ceph release version on docs.ceph.com (e.g., https://docs.ceph.com/en/pacific/), the information is out of date at best.

The doc/releases page is only accurate if browsing https://docs.ceph.com/en/latest/, for example.

So this post_checkout command will make sure we've checked out doc/releases from main before building and publishing.

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit 055fe1f825b0629b7685d6d3d4d629ffc37a2d7c)

3 years agomgr/cephadm: add parsing for config on osd specs 47268/head
Luis Domingues [Tue, 19 Jul 2022 09:04:34 +0000 (11:04 +0200)]
mgr/cephadm: add parsing for config on osd specs

Cephadm, while parsing spec files, can parse ceph configuration
for almost all the services, except for OSDs, where it fails
with a nasty "unexpected keyword argument config".

This commit fixes this issue.

Signed-off-by: Luis Domingues <domingues.luis@protonmail.ch>
(cherry picked from commit 74273e7e6e79c474e33fc41480399dc27ad2ae64)

3 years agoMerge pull request #47311 from adk3798/wip-56744-quincy
Adam King [Wed, 3 Aug 2022 12:10:09 +0000 (08:10 -0400)]
Merge pull request #47311 from adk3798/wip-56744-quincy

quincy: mgr/cephadm: Add disk rescan feature to the orchestrator

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #47312 from adk3798/wip-56742-quincy
Adam King [Wed, 3 Aug 2022 12:09:22 +0000 (08:09 -0400)]
Merge pull request #47312 from adk3798/wip-56742-quincy

quincy: mgr/cephadm: support for miscellaneous config files for daemons

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #47316 from adk3798/wip-56611-quincy
Adam King [Wed, 3 Aug 2022 12:08:35 +0000 (08:08 -0400)]
Merge pull request #47316 from adk3798/wip-56611-quincy

quincy: mgr/cephadm: support for os tuning profiles

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #47313 from adk3798/wip-56741-quincy
Adam King [Wed, 3 Aug 2022 12:05:43 +0000 (08:05 -0400)]
Merge pull request #47313 from adk3798/wip-56741-quincy

quincy: cephadm: reduce spam to cephadm.log

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #47314 from adk3798/wip-56740-quincy
Adam King [Wed, 3 Aug 2022 12:05:22 +0000 (08:05 -0400)]
Merge pull request #47314 from adk3798/wip-56740-quincy

quincy: cephadm: add "su root root" to cephadm.log logrotate config

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #47315 from adk3798/wip-56738-quincy
Adam King [Wed, 3 Aug 2022 12:05:02 +0000 (08:05 -0400)]
Merge pull request #47315 from adk3798/wip-56738-quincy

quincy: qa/workunits/cephadm: update test_repos master -> main

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #47317 from adk3798/wip-56584-quincy
Adam King [Wed, 3 Aug 2022 12:04:34 +0000 (08:04 -0400)]
Merge pull request #47317 from adk3798/wip-56584-quincy

quincy: mgr/cephadm: check for events key before accessing it

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #47373 from adk3798/wip-56986-quincy
Adam King [Wed, 3 Aug 2022 12:04:13 +0000 (08:04 -0400)]
Merge pull request #47373 from adk3798/wip-56986-quincy

quincy: mgr/cephadm: clear error message when resuming upgrade

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>