]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agolibrbd/cache/pwl: add basic metrics to ImageCacheState
Yin Congmin [Tue, 29 Mar 2022 08:59:05 +0000 (16:59 +0800)]
librbd/cache/pwl: add basic metrics to ImageCacheState

Add basic metrics to ImageCacheState and persist them, including
allocated_bytes, cached_bytes, dirty_bytes, free_bytes and hit/miss
info.

Leverage periodic_stats() timer to call update_image_cache_state.
In order to avoid outputting too much debug information, the original
statistics output log level is changed to 5.

Switch to json_spirit for encoding because encode_json encodes bool as
"true"/"false" string.

Remove rbd_persistent_cache_log_periodic_stats option because we need
to always update cache state.

[ idryomov: add cached_bytes and hits_partial; report misses and
  miss_bytes instead of respective totals; naming ]

Fixes: https://tracker.ceph.com/issues/50614
Signed-off-by: Yin Congmin <congmin.yin@intel.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #45660 from CongMinYin/fix-pwl-status
Ilya Dryomov [Thu, 31 Mar 2022 10:30:03 +0000 (12:30 +0200)]
Merge pull request #45660 from CongMinYin/fix-pwl-status

librbd/cache/pwl: correct cache state

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #45361 from adk3798/mds-upgrade-test
Adam King [Wed, 30 Mar 2022 22:56:45 +0000 (18:56 -0400)]
Merge pull request #45361 from adk3798/mds-upgrade-test

qa/suites/fs: stop looping in mds upgrade test if upgrade failed

Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #45248 from adk3798/offline-thread
Adam King [Wed, 30 Mar 2022 17:50:07 +0000 (13:50 -0400)]
Merge pull request #45248 from adk3798/offline-thread

mgr/cephadm: offline host watcher

Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #45344 from adk3798/raw-prepare-cmd
Adam King [Wed, 30 Mar 2022 17:48:43 +0000 (13:48 -0400)]
Merge pull request #45344 from adk3798/raw-prepare-cmd

mgr/cephadm: generate one c-v raw prepare cmd per data device in raw mode

Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #45567 from cbodley/wip-55000
Casey Bodley [Wed, 30 Mar 2022 16:24:56 +0000 (12:24 -0400)]
Merge pull request #45567 from cbodley/wip-55000

rgw multisite: data sync uses yield_spawn_window()

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
3 years agoMerge pull request #45515 from tchaikov/wip-cxx20-fixes-rgw
Casey Bodley [Wed, 30 Mar 2022 16:03:15 +0000 (12:03 -0400)]
Merge pull request #45515 from tchaikov/wip-cxx20-fixes-rgw

rgw: C++20 related fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45536 from tchaikov/wip-std-optional
Kefu Chai [Wed, 30 Mar 2022 15:16:15 +0000 (23:16 +0800)]
Merge pull request #45536 from tchaikov/wip-std-optional

compressor/QatAccel: s/boost::optional/std::optional/

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45648 from tchaikov/wip-kill-distutils
Kefu Chai [Wed, 30 Mar 2022 14:56:32 +0000 (22:56 +0800)]
Merge pull request #45648 from tchaikov/wip-kill-distutils

cmake: avoid using distutils

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #45694 from amathuria/amathuri-53923-fix
Yuri Weinstein [Wed, 30 Mar 2022 14:16:44 +0000 (07:16 -0700)]
Merge pull request #45694 from amathuria/amathuri-53923-fix

osd/osd_types: Increasing decode version of scrub_duration in pg stats

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45142 from SoftIron/ceph-mgr-cephadm-python3-cherrypyTHREE
Kefu Chai [Wed, 30 Mar 2022 13:57:19 +0000 (21:57 +0800)]
Merge pull request #45142 from SoftIron/ceph-mgr-cephadm-python3-cherrypyTHREE

debian/control: fix python3-cherrypy*3* dependency

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agolibrbd/cache/pwl: correct cache state 45660/head
Yin Congmin [Tue, 28 Dec 2021 06:10:35 +0000 (14:10 +0800)]
librbd/cache/pwl: correct cache state

update cache state after dirty_entries or log_enties list updated.

Fixes: https://tracker.ceph.com/issues/50614
Signed-off-by: Yin Congmin <congmin.yin@intel.com>
3 years agoMerge pull request #45217 from rkachach/fix_issue_47872
Adam King [Wed, 30 Mar 2022 13:01:40 +0000 (09:01 -0400)]
Merge pull request #45217 from rkachach/fix_issue_47872

mgr/cephadm: check spec host when adding osd

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #45275 from rkachach/fix_issue_54342
Adam King [Wed, 30 Mar 2022 12:59:15 +0000 (08:59 -0400)]
Merge pull request #45275 from rkachach/fix_issue_54342

mgr/cephadm: adding HostSpec validation

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #45534 from rkachach/fix_issue_50804
Adam King [Wed, 30 Mar 2022 12:58:04 +0000 (08:58 -0400)]
Merge pull request #45534 from rkachach/fix_issue_50804

mgr/cephadm: Show warning when user provides --fsid option

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agoMerge pull request #45692 from rkachach/fix_issue_55113
Adam King [Wed, 30 Mar 2022 12:48:33 +0000 (08:48 -0400)]
Merge pull request #45692 from rkachach/fix_issue_55113

mgr/cephadm: fallback to normal sorted if cannot import natsorted

Reviewed-by: Adam King <adking@redhat,com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
3 years agodebian/control: fix python3-cherrypy*3* dependency 45142/head
Koen Kooi [Wed, 23 Feb 2022 16:40:48 +0000 (08:40 -0800)]
debian/control: fix python3-cherrypy*3* dependency

The trailing '3' was missed in one instance, ceph-mgr-cephadm, leading to:

Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:

The following packages have unmet dependencies:
 ceph-mgr-cephadm : Depends: python3-cherrypy but it is not installable

Which makes the installation fail.

Fixes: 78983ad0d0cce422da32dc4876ac186f6d32c3f5
Signed-off-by: Koen Kooi <koen@softiron.com>
3 years agoMerge pull request #45335 from rhcs-dashboard/fix-54513-master
Ernesto Puerta [Wed, 30 Mar 2022 12:05:38 +0000 (14:05 +0200)]
Merge pull request #45335 from rhcs-dashboard/fix-54513-master

mgr/dashboard: Pool overall performance shows multiple entries of same pool in pool overview

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
3 years agoMerge pull request #45559 from rhcs-dashboard/existing-host-test-fix
Ernesto Puerta [Wed, 30 Mar 2022 11:00:36 +0000 (13:00 +0200)]
Merge pull request #45559 from rhcs-dashboard/existing-host-test-fix

mgr/dashboard: fix 01-hosts.e2e test error

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 #45701 from inspur-wyq/wip-doc-typos
Anthony D'Atri [Wed, 30 Mar 2022 06:54:42 +0000 (23:54 -0700)]
Merge pull request #45701 from inspur-wyq/wip-doc-typos

doc/radosgw/sync-modules.rst: fix typos

3 years agoMerge pull request #45702 from inspur-wyq/wip-doc-my-typos
Anthony D'Atri [Wed, 30 Mar 2022 06:43:46 +0000 (23:43 -0700)]
Merge pull request #45702 from inspur-wyq/wip-doc-my-typos

doc/cephadm/operations.rst: fix typos

3 years agoMerge pull request #45630 from liu-chunmei/crimson-omap-cmp
Samuel Just [Wed, 30 Mar 2022 04:40:49 +0000 (21:40 -0700)]
Merge pull request #45630 from liu-chunmei/crimson-omap-cmp

crimson: add omap cmp

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agodoc/cephadm/operations.rst: fix typos 45702/head
wangyunqing [Wed, 30 Mar 2022 03:53:57 +0000 (11:53 +0800)]
doc/cephadm/operations.rst: fix typos

Signed-off-by: wangyunqing <wangyunqing@inspur.com>
3 years agodoc/radosgw/sync-modules.rst: fix typos 45701/head
wangyunqing [Wed, 30 Mar 2022 03:53:57 +0000 (11:53 +0800)]
doc/radosgw/sync-modules.rst: fix typos

Signed-off-by: wangyunqing <wangyunqing@inspur.com>
3 years agoMerge pull request #45526 from xxhdx1985126/wip-coordinate-segment-seq
Samuel Just [Wed, 30 Mar 2022 03:53:30 +0000 (20:53 -0700)]
Merge pull request #45526 from xxhdx1985126/wip-coordinate-segment-seq

crimson/os/seastore: coordinate segment seq of journal and ool segments

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agocrimson: return 0 in osd_op.rval when enodata 45630/head
Chunmei Liu [Thu, 24 Mar 2022 06:37:59 +0000 (23:37 -0700)]
crimson: return 0 in osd_op.rval when enodata

Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
3 years agocrimson: add OP_OMAP_CLEAR support
Chunmei Liu [Thu, 24 Mar 2022 06:59:39 +0000 (23:59 -0700)]
crimson: add OP_OMAP_CLEAR support

Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
3 years agocrimson:add OMAP_CMP support
Chunmei Liu [Sat, 19 Mar 2022 09:27:50 +0000 (02:27 -0700)]
crimson:add OMAP_CMP support

Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
3 years agoosd/osd_types: Increasing decode version of scrub_duration in pg stats 45694/head
Aishwarya Mathuria [Tue, 29 Mar 2022 18:05:45 +0000 (23:35 +0530)]
osd/osd_types: Increasing decode version of scrub_duration in pg stats

All new fields added to pg stats after quincy RC need to have the decode field bumped up to avoid decoding errors during an upgrade from quincy RC to the quincy stable version

Fixes: https://tracker.ceph.com/issues/53923
Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>
3 years agomgr/cephadm: fallback to normal sorted if cannot import natsorted 45692/head
Redouane Kachach [Tue, 29 Mar 2022 16:37:10 +0000 (18:37 +0200)]
mgr/cephadm: fallback to normal sorted if cannot import natsorted
Fixes: https://tracker.ceph.com/issues/55113
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #45563 from rhcs-dashboard/fix-54991-master
Ernesto Puerta [Tue, 29 Mar 2022 17:03:49 +0000 (19:03 +0200)]
Merge pull request #45563 from rhcs-dashboard/fix-54991-master

mgr/dashboard:  don't log 3xx as errors

Reviewed-by: Sarthak0702 <NOT@FOUND>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #45295 from lbausch/tweak_mgr_alerts_mail
Boris Ranto [Tue, 29 Mar 2022 11:55:14 +0000 (13:55 +0200)]
Merge pull request #45295 from lbausch/tweak_mgr_alerts_mail

mgr/alerts: Add Message-Id and Date header to sent emails

Reviewed-by: Boris Ranto <branto@redhat.com>
3 years agomgr/dashboard: don't log 3xx as errors 45563/head
Ernesto Puerta [Tue, 22 Mar 2022 13:40:30 +0000 (14:40 +0100)]
mgr/dashboard:  don't log 3xx as errors

Let's avoid printing these ugly/misleading/redundant messages:

```
0 [dashboard DEBUG controllers.home] frontend language from headers: ['en-us']
0 [dashboard DEBUG controllers.home] found directory for language 'en-us'
0 [dashboard DEBUG controllers.home] serving static content: /home/jenkins-build/build/workspace/ceph-dashboard-pull-requests/build/src/pybind/mgr/dashboard/frontend/dist/en-US/styles.css
0 [dashboard ERROR exception] Internal Server Error
Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-dashboard-pull-requests/src/pybind/mgr/dashboard/services/exception.py", line 47, in dashboard_exception_handler
    return handler(*args, **kwargs)
  File "/usr/lib/python3/dist-packages/cherrypy/_cpdispatch.py", line 60, in __call__
    return self.callable(*self.args, **self.kwargs)
  File "/home/jenkins-build/build/workspace/ceph-dashboard-pull-requests/src/pybind/mgr/dashboard/controllers/home.py", line 134, in __call__
    return serve_file(full_path)
  File "/usr/lib/python3/dist-packages/cherrypy/lib/static.py", line 70, in serve_file
    cptools.validate_since()
  File "/usr/lib/python3/dist-packages/cherrypy/lib/cptools.py", line 117, in validate_since
    raise cherrypy.HTTPRedirect([], 304)
cherrypy._cperror.HTTPRedirect: ([], 304)
```

Fixes: https://tracker.ceph.com/issues/54991
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #45676 from rzarzynski/wip-crimson-toolset-10
Kefu Chai [Tue, 29 Mar 2022 09:03:14 +0000 (17:03 +0800)]
Merge pull request #45676 from rzarzynski/wip-crimson-toolset-10

ceph.spec.in: use gcc-toolset-10 for building crimson

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #44014 from rhcs-dashboard/host-detail-service-column
Ernesto Puerta [Tue, 29 Mar 2022 08:49:31 +0000 (10:49 +0200)]
Merge pull request #44014 from rhcs-dashboard/host-detail-service-column

mgr/dashboard: extend daemon actions to host details

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
3 years agoMerge pull request #45537 from yuvalif/wip-yuval-multisite-test-devices
Yuval Lifshitz [Tue, 29 Mar 2022 07:35:57 +0000 (10:35 +0300)]
Merge pull request #45537 from yuvalif/wip-yuval-multisite-test-devices

multisite/test: running the multisite test script with custom devices

3 years agoMerge pull request #45666 from SUSE/wip-fix-55087
Tim Serong [Tue, 29 Mar 2022 07:01:46 +0000 (18:01 +1100)]
Merge pull request #45666 from SUSE/wip-fix-55087

ceph.spec.in: Use libthrift-devel on SUSE distros

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #45664 from SUSE/wip-fix-55079
Tim Serong [Tue, 29 Mar 2022 06:08:09 +0000 (17:08 +1100)]
Merge pull request #45664 from SUSE/wip-fix-55079

ceph.spec.in: remove build directory at end of %install

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoceph.spec.in: use gcc-toolset-10 for building crimson 45676/head
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>
3 years agoMerge pull request #45647 from rhcs-dashboard/fix-55060-master 45682/head
Ernesto Puerta [Mon, 28 Mar 2022 15:29:11 +0000 (17:29 +0200)]
Merge pull request #45647 from rhcs-dashboard/fix-55060-master

mgr/dashboard: fix api test issue with pip

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: zmc <NOT@FOUND>
3 years agomgr/dashboard: Pool overall performance shows multiple entries of same pool in pool... 45335/head
Aashish Sharma [Thu, 10 Mar 2022 12:20:43 +0000 (17:50 +0530)]
mgr/dashboard: Pool overall performance shows multiple entries of same pool in pool overview

This PR intends to fix this issue

Fixes:https://tracker.ceph.com/issues/54513
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
3 years agocrimson/os/seastore: coordinate segment seq of journal and ool segments 45526/head
Xuehan Xu [Sun, 20 Mar 2022 12:36:05 +0000 (20:36 +0800)]
crimson/os/seastore: coordinate segment seq of journal and ool segments

the segment seq in ool segments' headers also need to be set to the
current journal segment seq, because we rely on this to judge whether a
delta needs to be replayed

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
3 years agoceph.spec.in: Use libthrift-devel on SUSE distros 45666/head
Tim Serong [Mon, 28 Mar 2022 09:45:01 +0000 (20:45 +1100)]
ceph.spec.in: Use libthrift-devel on SUSE distros

Fixes: 80e82686ebafe36fca6dfd21cb32e63ced94d5cd
Fixes: https://tracker.ceph.com/issues/55087
Signed-off-by: Tim Serong <tserong@suse.com>
3 years agomgr/dashboard: fix api test issue with pip 45647/head
Ernesto Puerta [Fri, 25 Mar 2022 15:26:48 +0000 (16:26 +0100)]
mgr/dashboard: fix api test issue with pip

Fix
```
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.
apache-libcloud 3.5.0 requires requests>=2.26.0, but you have requests 2.25.1 which is incompatible.
Successfully installed CherryPy-13.1.0 PyJWT-2.0.1 Routes-2.4.1 bcrypt-3.1.4 ceph-1.0.0 chardet-4.0.0 cheroot-8.6.0 idna-2.10 jaraco.functools-3.5.0 more-itertools-4.1.0 natsort-8.1.0 portend-3.1.0 pyopenssl-22.0.0 pytz-2022.1 repoze.lru-0.7 requests-2.25.1 tempora-5.0.1
```

Fixes: https://tracker.ceph.com/issues/55060
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
3 years agomgr/cephadm: check spec host when adding osd 45217/head
Redouane Kachach [Wed, 2 Mar 2022 11:38:42 +0000 (12:38 +0100)]
mgr/cephadm: check spec host when adding osd
Fixes: https://tracker.ceph.com/issues/47872
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
3 years agoceph.spec.in: remove build directory at end of %install 45664/head
Tim Serong [Mon, 28 Mar 2022 04:12:10 +0000 (15:12 +1100)]
ceph.spec.in: remove build directory at end of %install

By the time we get to the end of the %install section, all the
built binaries have been installed in the build root, so we can
delete the build directory from the source tree.  This frees up
about 17GB of disk space on build hosts, which is helpful in
case other processes later in the RPM build need more disk space.

Fixes: https://tracker.ceph.com/issues/55079
Signed-off-by: Tim Serong <tserong@suse.com>
3 years agoMerge pull request #45661 from tchaikov/doc-dpdk
Kefu Chai [Sun, 27 Mar 2022 01:58:43 +0000 (09:58 +0800)]
Merge pull request #45661 from tchaikov/doc-dpdk

doc/dpdk: reformat and reword

Reviewed-by: Chunsong Feng <fengchunsong@huawei.com>
3 years agodoc/dpdk: reword the root access part 45661/head
Kefu Chai [Sat, 26 Mar 2022 17:00:19 +0000 (01:00 +0800)]
doc/dpdk: reword the root access part

the root access to system is not a must have for running a DPDK
application. so reword the "Configuring OSD DPDKStack" section.

also, manually editing /etc/passwd is not encouraged, so use
"usermod" instead. to add a directory after user's command
interpreter in /etc/passwd does not make sense. see PASSWD(5).
so drop the paragraph on editing /etc/passwd.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #45640 from ronen-fr/wip-rf-snaptrim
Ronen Friedman [Sat, 26 Mar 2022 17:00:20 +0000 (20:00 +0300)]
Merge pull request #45640 from ronen-fr/wip-rf-snaptrim

osd/scrub: restart snap trimming only after scrubbing is done

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agodoc/dpdk: improve the formatting
Kefu Chai [Sat, 26 Mar 2022 16:45:29 +0000 (00:45 +0800)]
doc/dpdk: improve the formatting

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #44292 from fengchunsong/dpdk-doc
Kefu Chai [Sat, 26 Mar 2022 15:48:00 +0000 (23:48 +0800)]
Merge pull request #44292 from fengchunsong/dpdk-doc

doc/dev: add dpdkstack doc

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agomgr/cephadm: generate one c-v raw prepare cmd per data device in raw mode 45344/head
Adam King [Thu, 10 Mar 2022 17:43:28 +0000 (12:43 -0500)]
mgr/cephadm: generate one c-v raw prepare cmd per data device in raw mode

Fixes: https://tracker.ceph.com/issues/54522
Signed-off-by: Adam King <adking@redhat.com>
3 years agomgr/cephadm: offline host watcher 45248/head
Adam King [Fri, 4 Mar 2022 02:47:47 +0000 (21:47 -0500)]
mgr/cephadm: offline host watcher

To be able to detect if certain offline hosts go
offline quicker. Could be useful for the NFS
HA feature as this requires moving nfs daemons from
offline hosts within 90 seconds.

Signed-off-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #44343 from adk3798/nfs-offline
Adam King [Fri, 25 Mar 2022 23:45:39 +0000 (19:45 -0400)]
Merge pull request #44343 from adk3798/nfs-offline

mgr/cephadm: Reschedule nfs daemons from offline hosts

Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #45649 from tchaikov/wip-crimson-cleanup
David Galloway [Fri, 25 Mar 2022 19:07:39 +0000 (15:07 -0400)]
Merge pull request #45649 from tchaikov/wip-crimson-cleanup

crimson/os: use fmt::format() instead of sstream

3 years agoMerge pull request #45539 from rhcs-dashboard/css-fix-highlight-search
David Galloway [Fri, 25 Mar 2022 18:44:46 +0000 (14:44 -0400)]
Merge pull request #45539 from rhcs-dashboard/css-fix-highlight-search

mgr/dashboard: Remove padding in search highlighted text

3 years agoMerge pull request #45651 from sseshasa/wip-qa-fix-activate-osd-test
Neha Ojha [Fri, 25 Mar 2022 18:24:52 +0000 (11:24 -0700)]
Merge pull request #45651 from sseshasa/wip-qa-fix-activate-osd-test

qa/standalone: Fix test_activate_osd() test in ceph-helpers.sh

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #45553 from wxypro/doc-update
Neha Ojha [Fri, 25 Mar 2022 18:06:14 +0000 (11:06 -0700)]
Merge pull request #45553 from wxypro/doc-update

doc/mgr/prometheus.rst: fix spelling error

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #45575 from wxypro/options-fix
Neha Ojha [Fri, 25 Mar 2022 18:00:19 +0000 (11:00 -0700)]
Merge pull request #45575 from wxypro/options-fix

common/options: fix typos: smarctl -> smartctl

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #44699 from ivancich/wip-bucket-index-timeout-config
J. Eric Ivancich [Fri, 25 Mar 2022 17:16:39 +0000 (13:16 -0400)]
Merge pull request #44699 from ivancich/wip-bucket-index-timeout-config

core,rgw: allow configuration of bi tx timeout; add instrumentation

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #45522 from sseshasa/wip-improve-mclock-docs
Neha Ojha [Fri, 25 Mar 2022 16:46:41 +0000 (09:46 -0700)]
Merge pull request #45522 from sseshasa/wip-improve-mclock-docs

Doc: Improve mclock config reference documentation & update PendingReleaseNotes.

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoqa/standalone: Fix test_activate_osd() test in ceph-helpers.sh 45651/head
Sridhar Seshasayee [Fri, 25 Mar 2022 16:40:31 +0000 (22:10 +0530)]
qa/standalone: Fix test_activate_osd() test in ceph-helpers.sh

Modify test_activate_osd() to get the type of scheduler in use and then
verify the value of osd_max_backfills. This is because mclock scheduler
overrides this option to 1000 upon OSD initialization.

The test earlier used to pass because the OSD daemon was killed but not
marked down and upon being brought up, the wait for OSD up check was
passing quickly. But the OSD still didn't have the latest config values.

But now upon killing the OSD, the osd_fast_shutdown sequence notifies the
mon (see PR: https://github.com/ceph/ceph/pull/44807) and is marked down
and dead. Upon bringing it up, the wait for OSD up check takes a longer
time and this is sufficient for the config values to be updated. This
results in the correct values being read from the config 'Values' map.

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
3 years agoMerge pull request #44807 from NitzanMordhai/wip-nitzan-fast-shutdown-notify-mon
Yuri Weinstein [Fri, 25 Mar 2022 15:59:05 +0000 (08:59 -0700)]
Merge pull request #44807 from NitzanMordhai/wip-nitzan-fast-shutdown-notify-mon

osd/OSD: osd_fast_shutdown_notify_mon not quite right

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agocrimson/os: use fmt::format() instead of sstream 45649/head
Kefu Chai [Fri, 25 Mar 2022 15:02:59 +0000 (23:02 +0800)]
crimson/os: use fmt::format() instead of sstream

for better readability.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agocmake/modules: avoid using distutils 45648/head
Kefu Chai [Fri, 25 Mar 2022 15:06:46 +0000 (23:06 +0800)]
cmake/modules: avoid using distutils

to address following warning from python 3.9:

<string>:1: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
<string>:1: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agocmake/modules: drop a cmake variable
Kefu Chai [Fri, 25 Mar 2022 15:02:06 +0000 (23:02 +0800)]
cmake/modules: drop a cmake variable

less redirections

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #45309 from caisan/modify_without_source_segfault
J. Eric Ivancich [Fri, 25 Mar 2022 15:46:09 +0000 (11:46 -0400)]
Merge pull request #45309 from caisan/modify_without_source_segfault

radosgw-admin: fix segfault on pipe modify without source/dest zone specified

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45573 from wxypro/cephfs-shell-typos
Venky Shankar [Fri, 25 Mar 2022 12:44:33 +0000 (18:14 +0530)]
Merge pull request #45573 from wxypro/cephfs-shell-typos

tools/cephfs-shell: fix typos in comments

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #44895 from rkachach/fix_issue_54026
Adam King [Fri, 25 Mar 2022 12:35:47 +0000 (08:35 -0400)]
Merge pull request #44895 from rkachach/fix_issue_54026

mgr/cephadm: Adding support for natural sorting

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #45241 from rkachach/fix_issue_51072
Adam King [Fri, 25 Mar 2022 12:33:54 +0000 (08:33 -0400)]
Merge pull request #45241 from rkachach/fix_issue_51072

mgr/cephadm: fixing prometheus port handling

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #45314 from rkachach/fix_issue_54503
Adam King [Fri, 25 Mar 2022 12:32:01 +0000 (08:32 -0400)]
Merge pull request #45314 from rkachach/fix_issue_54503

mgr/cephadm: checking service name before removal

Reviewed-by: Adam King <adking@redhat.com>
3 years agoosd/scrub: restart snap trimming only after scrubbing is done 45640/head
Ronen Friedman [Fri, 25 Mar 2022 10:45:47 +0000 (10:45 +0000)]
osd/scrub: restart snap trimming only after scrubbing is done

Snap trimming that was postponed as the target PG was scrubbing
must be restarted at scrub completion.
PR #38111 moved trimming restart to just before the scrub fully
terminated. The current PR fixes that.

Trimming is also restarted in those cases where scrub was
queued but aborted immediately.

Fixes: https://tracker.ceph.com/issues/52026
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
3 years agoMerge pull request #45601 from idryomov/wip-diff-iterate-striping-fix
Ilya Dryomov [Fri, 25 Mar 2022 08:45:26 +0000 (09:45 +0100)]
Merge pull request #45601 from idryomov/wip-diff-iterate-striping-fix

librbd: make diff-iterate in fast-diff mode sort and merge reported extents

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
3 years agorgw: stop using c++20 keyword 'requires' 45515/head
Casey Bodley [Fri, 11 Feb 2022 22:18:32 +0000 (17:18 -0500)]
rgw: stop using c++20 keyword 'requires'

Signed-off-by: Casey Bodley <cbodley@redhat.com>
3 years agorgw: Fix uninitialized warning
Adam C. Emerson [Tue, 8 Mar 2022 01:48:40 +0000 (20:48 -0500)]
rgw: Fix uninitialized warning

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
3 years agoMerge pull request #45513 from tchaikov/wip-cxx20-fixes-mon
Kefu Chai [Fri, 25 Mar 2022 04:24:24 +0000 (12:24 +0800)]
Merge pull request #45513 from tchaikov/wip-cxx20-fixes-mon

mgr,mon,test: C++20 fixes

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Radosław Zarzyński <rzarzyns@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45386 from cyx1231st/wip-crimson-epm-split-hot-cold
Samuel Just [Fri, 25 Mar 2022 03:46:02 +0000 (20:46 -0700)]
Merge pull request #45386 from cyx1231st/wip-crimson-epm-split-hot-cold

crimson/os/seastore: reuse RecordSubmitter for SegmentedJournal and EPM::Writer

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agorgw: bucket index transaction instrumentation clean-ups 44699/head
J. Eric Ivancich [Thu, 17 Mar 2022 21:05:10 +0000 (17:05 -0400)]
rgw: bucket index transaction instrumentation clean-ups

Add a series of clean-ups to the instrumentation code. Keep this as a
separate commit so it will be easier to reconcile other code streams.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agorgw: additional configurable CLS instrumentation on bucket index TXs
J. Eric Ivancich [Wed, 9 Feb 2022 19:37:56 +0000 (14:37 -0500)]
rgw: additional configurable CLS instrumentation on bucket index TXs

This supplements an earlier commit to add additional instrumentation
on bucket index transactions on the CLS side.

The instrumentation is triggered by setting the configuration option
rgw_bucket_index_transaction_instrumentation in the [global] section.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agoMerge pull request #45115 from mchangir/mgr-snap_schedule-restart-old-schedules-on...
Venky Shankar [Fri, 25 Mar 2022 01:54:05 +0000 (07:24 +0530)]
Merge pull request #45115 from mchangir/mgr-snap_schedule-restart-old-schedules-on-startup

mgr/snap_schedule: restart old schedules

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #45399 from adk3798/no-firewall
Adam King [Thu, 24 Mar 2022 19:21:32 +0000 (15:21 -0400)]
Merge pull request #45399 from adk3798/no-firewall

cephadm: respect --skip-firewalld flag

Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #45401 from adk3798/legacy-config
Adam King [Thu, 24 Mar 2022 19:20:32 +0000 (15:20 -0400)]
Merge pull request #45401 from adk3798/legacy-config

cephadm: verify config file exists when inferring it

Reviewed-by: Michael Fritch <mfritch@suse.com>
3 years agoMerge pull request #45527 from adk3798/eca-osd-allowed
Adam King [Thu, 24 Mar 2022 19:19:14 +0000 (15:19 -0400)]
Merge pull request #45527 from adk3798/eca-osd-allowed

python-common/drive_group: add extra_container_args to supported features

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agomgr/cephadm: adding HostSpec validation 45275/head
Redouane Kachach [Mon, 7 Mar 2022 13:03:07 +0000 (14:03 +0100)]
mgr/cephadm: adding HostSpec validation
Fixes: https://tracker.ceph.com/issues/54342
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #45250 from ifed01/wip-ifed-get-bluest-extents-cleanup
Yuri Weinstein [Thu, 24 Mar 2022 16:49:46 +0000 (09:49 -0700)]
Merge pull request #45250 from ifed01/wip-ifed-get-bluest-extents-cleanup

os/bluestore: refactor bluefs get_block_extents interface

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agorgw: configurable instrumentation on bucket index transactions
J. Eric Ivancich [Fri, 21 Jan 2022 20:30:45 +0000 (15:30 -0500)]
rgw: configurable instrumentation on bucket index transactions

In order to better understand corner cases with bucket index
operations, extra instrumentation is now added and controlled by a
boolean configuration variable
("rgw_bucket_index_transaction_instrumentation").

When set to true, there is extra logging during all CLS operations
involving bucket index transactions. Additionally, all these log
entries are tagged with "BITX" to make them easier to find in the
logs. This is preferable to setting all OSD logging at a high level
due to the log size issues.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agorgw: make bucket index pending op expiration configureable
J. Eric Ivancich [Thu, 20 Jan 2022 15:57:32 +0000 (10:57 -0500)]
rgw: make bucket index pending op expiration configureable

Bucket index operations are transactional with data object
manipulation. The operation is prepared by adding a pending operation
record. And when the data object side is complete, the bucket index
operation is committed.

If it fails to be committed, later bucket listings will compare the
pending ops with the current data object state and see whether it
completed or not and then either commit or expire the op. The time
span for expiration is currently hard-coded as 120 seconds (unless
overridden in the bucket header, which can happen during "bucket
check").

This commit allows that expiration time to be configured.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agoosd: add new CLS call to retrieve global configuration
J. Eric Ivancich [Thu, 20 Jan 2022 15:56:49 +0000 (10:56 -0500)]
osd: add new CLS call to retrieve global configuration

Currently there is no easy way to gain access to global configuration
from CLS (objclass) code. This adds a new call to the CLS interface
that returns a "const ConfigProxy&" from which configuration can be
accessed.

NOTE: Working code to do provide this functionality in crimson is not
provided.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agoMerge pull request #45393 from rzarzynski/wip-crimson-fix-throw-in-plugins
Kefu Chai [Thu, 24 Mar 2022 13:47:24 +0000 (21:47 +0800)]
Merge pull request #45393 from rzarzynski/wip-crimson-fix-throw-in-plugins

build, crimson/osd: do not let Seastar to interfere with ELF's program headers

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoqa: test snap_schedule with mgr restart 45115/head
Milind Changire [Thu, 24 Feb 2022 06:20:18 +0000 (11:50 +0530)]
qa: test snap_schedule with mgr restart

Scheduled snaps should follow the created schedule even across mgr
restart.

Signed-off-by: Milind Changire <mchangir@redhat.com>
3 years agomgr/snap_schedule: restart old schedules
Milind Changire [Mon, 28 Feb 2022 06:26:09 +0000 (11:56 +0530)]
mgr/snap_schedule: restart old schedules

Old schedules were not picked up from database when mgr was restarted.
Restart old schedules on mgr restart.

Fixes: https://tracker.ceph.com/issues/54052
Signed-off-by: Milind Changire <mchangir@redhat.com>
3 years agomgr/util: add function to list all fs names
Milind Changire [Mon, 28 Feb 2022 06:22:26 +0000 (11:52 +0530)]
mgr/util: add function to list all fs names

Signed-off-by: Milind Changire <mchangir@redhat.com>
3 years agoPendingReleaseNotes: Add mclock config reference link to an existing note 45522/head
Sridhar Seshasayee [Fri, 18 Mar 2022 14:55:25 +0000 (20:25 +0530)]
PendingReleaseNotes: Add mclock config reference link to an existing note

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
3 years agodoc: Improvements to mClock configuration reference documentation
Sridhar Seshasayee [Fri, 18 Mar 2022 07:43:52 +0000 (13:13 +0530)]
doc: Improvements to mClock configuration reference documentation

Improve the documentation around.
 - mclock client types.
 - Describe in greater detail about mclock config profiles.
 - Add notes about manually benchmarking OSDs and tuning bluestore throttle
   parameters.
 - Include a couple of missing mclock configuration options.

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
3 years agomgr/cephadm: fixing natsort dependencies on debian 44895/head
Redouane Kachach [Thu, 17 Mar 2022 08:49:26 +0000 (09:49 +0100)]
mgr/cephadm: fixing natsort dependencies on debian

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
3 years agomgr/cephadm: Adding support for natural sorting
Redouane Kachach [Fri, 4 Feb 2022 11:22:50 +0000 (12:22 +0100)]
mgr/cephadm: Adding support for natural sorting
Fixes: https://tracker.ceph.com/issues/54026
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #45472 from vshankar/revert-45307
Venky Shankar [Thu, 24 Mar 2022 06:39:50 +0000 (12:09 +0530)]
Merge pull request #45472 from vshankar/revert-45307

Revert "mds: kill session when mds do ms_handle_remote_reset"

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoRevert "mds: kill session when mds do ms_handle_remote_reset" 45472/head
Venky Shankar [Thu, 17 Mar 2022 04:36:38 +0000 (10:06 +0530)]
Revert "mds: kill session when mds do ms_handle_remote_reset"

This reverts commit 3651deb4e0b0c102adcaddce79ee4e053f033418.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #45340 from benhanokh/disable_ncb_rotational
Neha Ojha [Wed, 23 Mar 2022 21:49:23 +0000 (14:49 -0700)]
Merge pull request #45340 from benhanokh/disable_ncb_rotational

os/bluestore: Disable NCB functionality on rotational drives

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agobuild, crimson/osd: do not let Seastar to interfere with ELF's program headers. 45393/head
Radosław Zarzyński [Tue, 15 Mar 2022 14:33:41 +0000 (15:33 +0100)]
build, crimson/osd: do not let Seastar to interfere with ELF's program headers.

For the sake of avoiding locking on the `__cxa_throw` paths, Seastar
hijacks `dl_iterate_phdr` of the dynamic linker. Unfortunately, this
has a nasty side effect: it makes impossible to catch an exception in
in a plugin (a DSO loaded via the `dlopen()` machinery).

For mote details please consult:
  * https://gist.github.com/rzarzynski/3abe9ed6b50cfa1893d34988e1628bfc,
  * `seastar/src/core/exception_hacks.cc`.

This patch deals with the problem by simply disabling the problematic
workaround which could be iatrogenic too. If that would be the case,
we can consider:

  * preloading all our Ceph Classes before reaching `smp::configure()`,
  * statically linking them.

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>