]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agocrimson/osd: fix Watch::connect() behaviour on reconnect. 43031/head
Radoslaw Zarzynski [Thu, 2 Sep 2021 14:41:38 +0000 (14:41 +0000)]
crimson/osd: fix Watch::connect() behaviour on reconnect.

It's perfectly legal for a client to reconnect to particular `Watch`
using different socket / `Connection` than original one. This shall
include proper handling of the watch timer which is currently broken
as, when reconnecting, we don't cancel the timer. This leaded to the
following crash at Sepia:

```
rzarzynski@teuthology:/home/teuthworker/archive/rzarzynski-2021-09-02_07:44:51-rados-master-distro-basic-smithi/6372357$ less ./remote/smithi183/log/ceph-osd.4.log.gz
...
DEBUG 2021-09-02 08:10:45,462 [shard 0] osd - client_request(id=12, detail=m=[osd_op(client.5087.0:93 7.1e 7:7c7084bd:::repobj:head {watch reconnect cookie 94478891024832 gen 1} snapc 0={} ondisk+write+know
n_if_redirected e40) v8]): got obc lock
...
DEBUG 2021-09-02 08:10:45,462 [shard 0] osd - do_op_watch
INFO  2021-09-02 08:10:45,462 [shard 0] osd - found existing watch by client.5087
DEBUG 2021-09-02 08:10:45,462 [shard 0] osd - do_op_watch_subop_watch
INFO  2021-09-02 08:10:45,462 [shard 0] osd - found existing watch watch(cookie 94478891024832 30s 172.21.15.150:0/3544196211) by client.5087
...
INFO  2021-09-02 08:10:45,462 [shard 0] osd - op_effect: found existing watcher: 94478891024832,client.5087
ceph-osd: /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-7406-g9d30203c/rpm/el8/BUILD/ceph-
17.0.0-7406-g9d30203c/src/seastar/include/seastar/core/timer.hh:95: void seastar::timer<Clock>::arm_state(seastar::timer<Clock>::time_point, std::optional<typename Clock::duration>) [with Clock = seastar::l
owres_clock; seastar::timer<Clock>::time_point = std::chrono::time_point<seastar::lowres_clock, std::chrono::duration<long int, std::ratio<1, 1000> > >; typename Clock::duration = std::chrono::duration<long
 int, std::ratio<1, 1000> >]: Assertion `!_armed' failed.
Aborting on shard 0.
Backtrace:
 0# 0x000055CC052CF0B6 in ceph-osd
 1# FatalSignal::signaled(int, siginfo_t const&) in ceph-osd
 2# FatalSignal::install_oneshot_signal_handler<6>()::{lambda(int, siginfo_t*, void*)#1}::_FUN(int, siginfo_t*, void*) in ceph-osd
 3# 0x00007FA58349FB20 in /lib64/libpthread.so.0
 4# gsignal in /lib64/libc.so.6
 5# abort in /lib64/libc.so.6
 6# 0x00007FA581A98C89 in /lib64/libc.so.6
 7# 0x00007FA581AA6A76 in /lib64/libc.so.6
 8# 0x000055CC0BEEE9DD in ceph-osd
 9# crimson::osd::Watch::connect(seastar::shared_ptr<crimson::net::Connection>, bool) in ceph-osd
10# 0x000055CC00B1D246 in ceph-osd
11# 0x000055CBFFEF01AE in ceph-osd
...
```

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
3 years agoMerge pull request #42942 from zdover23/wip-doc-mgr-progress
zdover23 [Wed, 1 Sep 2021 16:17:22 +0000 (02:17 +1000)]
Merge pull request #42942 from zdover23/wip-doc-mgr-progress

doc/mgr: add progress module documentation

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42948 from llamerada-jp/fix-radosgw-admin-document
Daniel Gryniewicz [Wed, 1 Sep 2021 12:40:04 +0000 (08:40 -0400)]
Merge pull request #42948 from llamerada-jp/fix-radosgw-admin-document

rgw: fix document

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #42995 from rhcs-dashboard/fix-kcli-dashboard-e2e-doc
Ernesto Puerta [Wed, 1 Sep 2021 09:26:46 +0000 (11:26 +0200)]
Merge pull request #42995 from rhcs-dashboard/fix-kcli-dashboard-e2e-doc

doc/dashboard: Fix kcli pool and network requirements documentation

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43004 from gregsfortytwo/wip-nodaemon
Samuel Just [Wed, 1 Sep 2021 03:59:53 +0000 (20:59 -0700)]
Merge pull request #43004 from gregsfortytwo/wip-nodaemon

vstart: make "--crimson" imply "--nodaemon"

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #43003 from gregsfortytwo/wip-error-code-value
Samuel Just [Wed, 1 Sep 2021 02:12:26 +0000 (19:12 -0700)]
Merge pull request #43003 from gregsfortytwo/wip-error-code-value

crimson: osd: do not capture std::error_code by reference

Reviewed-by: Xuehan Xu <xuxuehan@360.cn>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agovstart: make "--crimson" imply "--nodaemon" 43004/head
Greg Farnum [Tue, 31 Aug 2021 23:59:51 +0000 (23:59 +0000)]
vstart: make "--crimson" imply "--nodaemon"

If you want to run multiple crimson-osd instances, you need nodaemon. Default
to nodaemon when using crimson.

Add a new "--crimson-foreground" which preserves the old behavior, in case
it's needed.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
3 years agocrimson: osd: do not capture std::error_code by reference 43003/head
Greg Farnum [Tue, 31 Aug 2021 20:18:49 +0000 (20:18 +0000)]
crimson: osd: do not capture std::error_code by reference

I can't find any reason to assume it has a longer lifetime than
the future we're creating has.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
3 years agoMerge pull request #42831 from ifed01/wip-ifed-fix-52311
Yuri Weinstein [Tue, 31 Aug 2021 23:46:30 +0000 (16:46 -0700)]
Merge pull request #42831 from ifed01/wip-ifed-fix-52311

os/bluestore: fix using incomplete bluefs log when dumping it.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agoMerge pull request #41912 from trociny/wip-crushdiff
Neha Ojha [Tue, 31 Aug 2021 21:18:37 +0000 (14:18 -0700)]
Merge pull request #41912 from trociny/wip-crushdiff

tools/crushdiff: new tool to test crushmap change

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42985 from cyx1231st/wip-seastore-lba-metrics
Samuel Just [Tue, 31 Aug 2021 14:56:27 +0000 (07:56 -0700)]
Merge pull request #42985 from cyx1231st/wip-seastore-lba-metrics

crimson/os/seastore: misc improvements to metrics

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agodoc/dashboard: Fix kcli pool and network requirements documentation 42995/head
Pere Diaz Bou [Tue, 31 Aug 2021 14:25:56 +0000 (16:25 +0200)]
doc/dashboard: Fix kcli pool and network requirements documentation

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #42874 from cbodley/wip-51491
Daniel Gryniewicz [Tue, 31 Aug 2021 13:29:56 +0000 (09:29 -0400)]
Merge pull request #42874 from cbodley/wip-51491

rgw: use existing s->bucket in s3 website retarget()

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agocrimson/os/seastore: drop Transaction::src_t::INIT category from metrics 42985/head
Yingxin Cheng [Tue, 31 Aug 2021 05:26:09 +0000 (13:26 +0800)]
crimson/os/seastore: drop Transaction::src_t::INIT category from metrics

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: measure insert/erase operations
Yingxin Cheng [Tue, 31 Aug 2021 04:54:08 +0000 (12:54 +0800)]
crimson/os/seastore/lba_manager: measure insert/erase operations

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: fix logs
Yingxin Cheng [Tue, 31 Aug 2021 04:39:45 +0000 (12:39 +0800)]
crimson/os/seastore/lba_manager: fix logs

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agoMerge pull request #42973 from liewegas/doc-foundation-osnexus
Josh Durgin [Mon, 30 Aug 2021 21:51:09 +0000 (14:51 -0700)]
Merge pull request #42973 from liewegas/doc-foundation-osnexus

doc/foundation: add osnexus

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #42966 from cyx1231st/wip-seastore-lba-cleanup
Samuel Just [Mon, 30 Aug 2021 20:44:35 +0000 (13:44 -0700)]
Merge pull request #42966 from cyx1231st/wip-seastore-lba-cleanup

crimson/os/seastore/lba_manager: misc cleanup

Reviewed-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #42970 from sebastian-philipp/monitoring-custom-webhook
Sebastian Wagner [Mon, 30 Aug 2021 14:34:45 +0000 (16:34 +0200)]
Merge pull request #42970 from sebastian-philipp/monitoring-custom-webhook

doc/cephadm: monitoring: Add "Adding Alertmanager webhooks"

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
3 years agodoc/foundation: add osnexus 42973/head
Sage Weil [Mon, 30 Aug 2021 13:11:37 +0000 (08:11 -0500)]
doc/foundation: add osnexus

Signed-off-by: Sage Weil <sage@newdream.net>
3 years agodoc/cephadm: monitoring: Further Reading 42970/head
Sebastian Wagner [Mon, 30 Aug 2021 11:14:30 +0000 (13:14 +0200)]
doc/cephadm: monitoring: Further Reading

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years ago.github/labeler: Add monitoring
Sebastian Wagner [Mon, 30 Aug 2021 10:45:56 +0000 (12:45 +0200)]
.github/labeler: Add monitoring

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years agodoc/cephadm: monitoring: Add "Adding Alertmanager webhooks"
Sebastian Wagner [Mon, 30 Aug 2021 10:37:26 +0000 (12:37 +0200)]
doc/cephadm: monitoring: Add "Adding Alertmanager webhooks"

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years agodoc/cephadm: monitoring: Add "Setting up Grafana"
Sebastian Wagner [Mon, 30 Aug 2021 10:26:23 +0000 (12:26 +0200)]
doc/cephadm: monitoring: Add "Setting up Grafana"

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years agodoc/cephadm: monitoring: move "deploying w/o" up
Sebastian Wagner [Mon, 30 Aug 2021 10:23:13 +0000 (12:23 +0200)]
doc/cephadm: monitoring: move "deploying w/o" up

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years agodoc/cephadm: monitoring: default placements
Sebastian Wagner [Mon, 30 Aug 2021 10:20:53 +0000 (12:20 +0200)]
doc/cephadm: monitoring: default placements

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoMerge pull request #42848 from ronen-fr/wip-ronenf-argv2vec-users
Ronen Friedman [Mon, 30 Aug 2021 09:44:40 +0000 (12:44 +0300)]
Merge pull request #42848 from ronen-fr/wip-ronenf-argv2vec-users

common: modify 'main()s' to use new argv_to_vec() signature

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #42959 from idryomov/wip-krbd-escape-match-sysattr
Ilya Dryomov [Mon, 30 Aug 2021 09:25:31 +0000 (11:25 +0200)]
Merge pull request #42959 from idryomov/wip-krbd-escape-match-sysattr

krbd: escape udev_enumerate_add_match_sysattr values

Reviewed-by: Mykola Golub <mgolub@suse.com>
3 years agoMerge pull request #42913 from yaarith/update-sudoers-smartctl
Deepika Upadhyay [Mon, 30 Aug 2021 08:56:03 +0000 (14:26 +0530)]
Merge pull request #42913 from yaarith/update-sudoers-smartctl

rpm, debian: move smartmontools and nvme-cli to ceph-base

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #42770 from ktdreyer/no-lsb-release
Deepika Upadhyay [Mon, 30 Aug 2021 08:43:02 +0000 (14:13 +0530)]
Merge pull request #42770 from ktdreyer/no-lsb-release

Remove dependency on lsb_release

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agocrimson/os/seastore/lba_manager: drop the unecessary lookup in leaf 42966/head
Yingxin Cheng [Mon, 30 Aug 2021 08:03:13 +0000 (16:03 +0800)]
crimson/os/seastore/lba_manager: drop the unecessary lookup in leaf

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: drop the impossible case that the insert key exists...
Yingxin Cheng [Mon, 30 Aug 2021 07:50:06 +0000 (15:50 +0800)]
crimson/os/seastore/lba_manager: drop the impossible case that the insert key exists after handle_split

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: end iterator should be pointing to the leaf-node...
Yingxin Cheng [Mon, 30 Aug 2021 07:44:41 +0000 (15:44 +0800)]
crimson/os/seastore/lba_manager: end iterator should be pointing to the leaf-node size already

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: misc improvements on debugging
Yingxin Cheng [Mon, 30 Aug 2021 07:41:22 +0000 (15:41 +0800)]
crimson/os/seastore/lba_manager: misc improvements on debugging

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: check depth when load lba node
Yingxin Cheng [Mon, 30 Aug 2021 07:37:16 +0000 (15:37 +0800)]
crimson/os/seastore/lba_manager: check depth when load lba node

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: mark iterator(depth_t) private
Yingxin Cheng [Mon, 30 Aug 2021 07:31:11 +0000 (15:31 +0800)]
crimson/os/seastore/lba_manager: mark iterator(depth_t) private

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: cleanup LBABtree::iterate_repeat()
Yingxin Cheng [Mon, 30 Aug 2021 07:24:58 +0000 (15:24 +0800)]
crimson/os/seastore/lba_manager: cleanup LBABtree::iterate_repeat()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agocrimson/os/seastore/lba_manager: drop unused code
Yingxin Cheng [Mon, 30 Aug 2021 07:13:42 +0000 (15:13 +0800)]
crimson/os/seastore/lba_manager: drop unused code

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agoMerge pull request #42961 from tchaikov/wip-docker-test
Kefu Chai [Sun, 29 Aug 2021 23:42:53 +0000 (07:42 +0800)]
Merge pull request #42961 from tchaikov/wip-docker-test

test/docker-test.sh: add support for fedora 34 and debian stretch

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
3 years agotest/docker-test.sh: add support for fedora 34 and debian strech 42961/head
Kefu Chai [Sun, 29 Aug 2021 13:43:23 +0000 (21:43 +0800)]
test/docker-test.sh: add support for fedora 34 and debian strech

and drop fedora-31, fedora32, debian-jessie and ubuntu-16.04 since
they are not maintained anymore. see

- https://fedoraproject.org/wiki/End_of_life
- https://wiki.debian.org/LTS
- https://wiki.ubuntu.com/Releases

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agokrbd: escape udev_enumerate_add_match_sysattr values 42959/head
Ilya Dryomov [Sat, 28 Aug 2021 09:05:28 +0000 (11:05 +0200)]
krbd: escape udev_enumerate_add_match_sysattr values

libudev uses fnmatch(3) for matching attributes, meaning that shell
glob pattern matching is employed instead of literal string matching.
Escape glob metacharacters to suppress pattern matching.

Fixes: https://tracker.ceph.com/issues/52425
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #42957 from athanatos/sjust/wip-lba-rewrite-working
Samuel Just [Sat, 28 Aug 2021 07:14:22 +0000 (00:14 -0700)]
Merge pull request #42957 from athanatos/sjust/wip-lba-rewrite-working

crimson: add object_info, log support to crimson-store-nbd, fix lba btree bugs

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
3 years agocrimson/os/seastore/lba_manager/btree: don't assert deltas are empty 42957/head
Samuel Just [Fri, 27 Aug 2021 21:19:54 +0000 (21:19 +0000)]
crimson/os/seastore/lba_manager/btree: don't assert deltas are empty

We use the contents to update counters when transactions conflict,
deltas may validly be empty there.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore/cache: retire_extent_addr: add addr asserts
Samuel Just [Fri, 27 Aug 2021 20:56:42 +0000 (13:56 -0700)]
crimson/os/seastore/cache: retire_extent_addr: add addr asserts

retire_extent_addr can only be called on absolute or record-relative
addrs.  Record-relative addrs are only valid on extents allocated as
part of the current transaction.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore/lba_manager/btree: fix get_val() paddr value from iterator
Samuel Just [Fri, 27 Aug 2021 05:42:38 +0000 (05:42 +0000)]
crimson/os/seastore/lba_manager/btree: fix get_val() paddr value from iterator

This was causing a stray RETIRED_PLACEHOLDER to be created resulting in
a segment cleaner segfault in release on an invalid segment and a crash
upon adding a duplicate lba btree pin since the returned addr didn't
match the addr of the INITIAL_PENDING extent on the transaction.

Fixes: https://tracker.ceph.com/issues/52434
Fixes: https://tracker.ceph.com/issues/52435
Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/tools/store_nbd: add log emulation to fs_driver
Samuel Just [Fri, 27 Aug 2021 21:41:22 +0000 (14:41 -0700)]
crimson/tools/store_nbd: add log emulation to fs_driver

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agodoc/mgr: add progress module documentation 42942/head
Zac Dover [Thu, 26 Aug 2021 23:52:51 +0000 (09:52 +1000)]
doc/mgr: add progress module documentation

This PR ingests the work added to the documentation
in PR#29335.

The technical information in this PR concerns the
installation and use of the "Progress Module".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Signed-off-by: kamoltat <ksirivad@redhat.com>
3 years agoMerge PR #42899 into master
Patrick Donnelly [Sat, 28 Aug 2021 01:31:04 +0000 (21:31 -0400)]
Merge PR #42899 into master

* refs/pull/42899/head:
src/client: fix dump mds twice

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge PR #42751 into master
Patrick Donnelly [Sat, 28 Aug 2021 01:30:22 +0000 (21:30 -0400)]
Merge PR #42751 into master

* refs/pull/42751/head:
cephfs-mirror: shutdown ClusterWatcher on termination

Reviewed-by: Jos Collin <jcollin@redhat.com>
3 years agoMerge PR #42687 into master
Patrick Donnelly [Sat, 28 Aug 2021 01:29:17 +0000 (21:29 -0400)]
Merge PR #42687 into master

* refs/pull/42687/head:
qa: test the "ms_mode" options in kclient workflows

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge PR #42620 into master
Patrick Donnelly [Sat, 28 Aug 2021 01:28:02 +0000 (21:28 -0400)]
Merge PR #42620 into master

* refs/pull/42620/head:
mds: switch mds_lock to fair mutex
common/Timer: make SafeTimer a template
common/fair_mutex: add is_locked_by_me support
common: do not compile condition_variable_debug in none debug mode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge PR #38481 into master
Patrick Donnelly [Sat, 28 Aug 2021 01:26:41 +0000 (21:26 -0400)]
Merge PR #38481 into master

* refs/pull/38481/head:
qa/vstart_runner: inherit methods instead of duplicating them
qa/ceph_manager: make it possible to reuse few methods
qa/vstart_runner: don't use "shell=False" in run_ceph_w()
qa/ceph_manager: minor refactor

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge pull request #42955 from tchaikov/wip-fio-tag
Kefu Chai [Sat, 28 Aug 2021 00:08:48 +0000 (08:08 +0800)]
Merge pull request #42955 from tchaikov/wip-fio-tag

cmake: use ceph repo with tag

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agocrimson/tools/store_nbd: add object_info emulation to fs_driver
Samuel Just [Thu, 26 Aug 2021 20:48:30 +0000 (20:48 +0000)]
crimson/tools/store_nbd: add object_info emulation to fs_driver

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/common/interruptible_future: move int future refcounting to trace
Samuel Just [Fri, 27 Aug 2021 05:03:30 +0000 (22:03 -0700)]
crimson/common/interruptible_future: move int future refcounting to trace

We probably want to add a dedicated subsys for this, but for now it's just
too much for debug level.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/tools/store_nbd/fs_driver: collid should be the msb
Samuel Just [Fri, 27 Aug 2021 02:10:26 +0000 (19:10 -0700)]
crimson/tools/store_nbd/fs_driver: collid should be the msb

This way, objects in a collection will sort together.  Probably
a typo.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #39377 from ifed01/wip-ifed-fix-huge-omap-rename
Neha Ojha [Fri, 27 Aug 2021 18:30:30 +0000 (11:30 -0700)]
Merge pull request #39377 from ifed01/wip-ifed-fix-huge-omap-rename

os/bluestore: cap omap naming scheme upgrade transaction

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agoMerge pull request #42918 from ifed01/wip-ifed-fix-52398
Neha Ojha [Fri, 27 Aug 2021 18:29:20 +0000 (11:29 -0700)]
Merge pull request #42918 from ifed01/wip-ifed-fix-52398

test/store_test: fix broken test case

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42926 from zdover23/wip-doc-2021-08-26-nomad-cleanup-cherry-picker
Ilya Dryomov [Fri, 27 Aug 2021 17:04:05 +0000 (19:04 +0200)]
Merge pull request #42926 from zdover23/wip-doc-2021-08-26-nomad-cleanup-cherry-picker

doc: clean rbd-nomad.rst

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
3 years agocmake: use ceph repo with tag 42955/head
Kefu Chai [Fri, 27 Aug 2021 16:14:55 +0000 (00:14 +0800)]
cmake: use ceph repo with tag

to address following warning:

fatal: reference is not a tree: 7f02f21f53ccd5e2448086f8e9015489693dd2dc
CMake Error at /home/jenkins-build/build/workspace/ceph-pull-requests/build/fio_ext-prefix/tmp/fio_ext-gitclone.cmake:40 (message):
  Failed to checkout tag: '7f02f21f53ccd5e2448086f8e9015489693dd2dc'

it seems that the shallow option does not work with a sha1 tag option,
let's continue using the ceph repo with a tag.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agomailmap, organizationmap: update Mykola Golub affiliation 41912/head
Mykola Golub [Wed, 4 Aug 2021 08:30:07 +0000 (11:30 +0300)]
mailmap, organizationmap: update Mykola Golub affiliation

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>
3 years agoqa/suites/rados: add crushdiff test
Mykola Golub [Wed, 4 Aug 2021 08:12:21 +0000 (11:12 +0300)]
qa/suites/rados: add crushdiff test

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>
3 years agoMerge pull request #42944 from dengchl01/dengchl01
Kefu Chai [Fri, 27 Aug 2021 13:48:18 +0000 (21:48 +0800)]
Merge pull request #42944 from dengchl01/dengchl01

mgr/restful/api/crush.py: delete unused reference

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #39933 from linuxbox2/wip-bl-opslog
Daniel Gryniewicz [Fri, 27 Aug 2021 13:47:43 +0000 (09:47 -0400)]
Merge pull request #39933 from linuxbox2/wip-bl-opslog

rgw: permit logging of list-bucket (and any other no-bucket op)

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #42934 from tchaikov/wip-fio-cxx
Kefu Chai [Fri, 27 Aug 2021 13:41:50 +0000 (21:41 +0800)]
Merge pull request #42934 from tchaikov/wip-fio-cxx

cmake: use upstream repo for fio

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
3 years agodoc/rbd/rbd-nomad: fix indentation in config snippets 42926/head
Ilya Dryomov [Fri, 27 Aug 2021 12:10:49 +0000 (14:10 +0200)]
doc/rbd/rbd-nomad: fix indentation in config snippets

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agodoc: clean rbd-nomad.rst
Zac Dover [Thu, 26 Aug 2021 04:47:44 +0000 (14:47 +1000)]
doc: clean rbd-nomad.rst

This PR improves the rbd-nomad.rst file.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agorgw: fix document 42948/head
Ushitora Anqou [Fri, 27 Aug 2021 07:44:43 +0000 (07:44 +0000)]
rgw: fix document

add the description of --show-config option in radosgw-admin

Signed-off-by: Ushitora Anqou <ushitora@anqou.net>
3 years agoMerge pull request #42901 from athanatos/sjust/wip-lba-rewrite
Samuel Just [Fri, 27 Aug 2021 05:38:46 +0000 (22:38 -0700)]
Merge pull request #42901 from athanatos/sjust/wip-lba-rewrite

crimson/os/seastore: replace lba btree implementation with simpler, more correct iterator based implementation

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
3 years agomgr/restful/api/crush.py: delete unused reference 42944/head
dengchl01 [Fri, 27 Aug 2021 03:19:27 +0000 (11:19 +0800)]
mgr/restful/api/crush.py: delete unused reference

This commit delete unused reference of the crush page.

Signed-off-by: Charlie Developer <dengchl01@inspur.com>
3 years agoMerge PR #42530 into master
Patrick Donnelly [Fri, 27 Aug 2021 02:36:28 +0000 (22:36 -0400)]
Merge PR #42530 into master

* refs/pull/42530/head:
qa: ignore expected metadata cluster log error

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
3 years agocrimson/os/seastore/lba_manager: replace btree implementation 42901/head
Samuel Just [Tue, 13 Jul 2021 02:02:18 +0000 (02:02 +0000)]
crimson/os/seastore/lba_manager: replace btree implementation

Replace previous implementation with one based around an internal
iterator interface.  Besides simplifying the implementation and
removing duplicate lookups in the allocation pathway, this implementation
should correct a design problem in the prior implementation wherein
LBALeafNode::find_hole couldn't see the first element of the subsequent
node and therefore assumed that there was one at get_meta().end.

This patch removes the btree logic from lba_btree_node_impl.* leaving
the LBAInternalNode and LBALeafNode layout in lba_btree_node.*.
lba_btree.h/cc now have the main btree update/query logic.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agoMerge pull request #42941 from kamoltat/ksirivad-add-release-notes-quincy
Neha Ojha [Thu, 26 Aug 2021 22:39:30 +0000 (15:39 -0700)]
Merge pull request #42941 from kamoltat/ksirivad-add-release-notes-quincy

PendingReleaseNotes: add autoscaler profile

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agocrimson/os/seastore/seastore_types: add lba_root_t::set_depth
Samuel Just [Thu, 19 Aug 2021 05:13:08 +0000 (22:13 -0700)]
crimson/os/seastore/seastore_types: add lba_root_t::set_depth

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore/lba_manager: fix comment
Samuel Just [Thu, 19 Aug 2021 05:12:38 +0000 (22:12 -0700)]
crimson/os/seastore/lba_manager: fix comment

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/common/fixed_kv_node_layout: add iterator operator-- and misc
Samuel Just [Thu, 19 Aug 2021 05:11:30 +0000 (22:11 -0700)]
crimson/common/fixed_kv_node_layout: add iterator operator-- and misc

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore: remove unneeded TransactionManager::find_hole
Samuel Just [Mon, 19 Jul 2021 22:01:57 +0000 (15:01 -0700)]
crimson/os/seastore: remove unneeded TransactionManager::find_hole

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/tools/store_nbd/tm_driver: reset segment_manager in mkfs()
Samuel Just [Fri, 20 Aug 2021 03:41:50 +0000 (20:41 -0700)]
crimson/tools/store_nbd/tm_driver: reset segment_manager in mkfs()

Otherwise, instantiating segment_manager in mount() results in two
instances and a duplicate metric exception.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore/cache: fix formatting in get_extent
Samuel Just [Fri, 20 Aug 2021 03:40:35 +0000 (20:40 -0700)]
crimson/os/seastore/cache: fix formatting in get_extent

In particular, this->invalidate and *ref.get() are superfluous.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agokey_value_store/kv_flat_btree_async: add using namespace std
Samuel Just [Thu, 19 Aug 2021 21:42:21 +0000 (21:42 +0000)]
key_value_store/kv_flat_btree_async: add using namespace std

Not worth annotating the specific elements of std used.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore: get_next_dirty_extents: record in transaction read set
Samuel Just [Fri, 20 Aug 2021 08:03:22 +0000 (01:03 -0700)]
crimson/os/seastore: get_next_dirty_extents: record in transaction read set

Record the extents in the read set after wait_io() as in get_extent.  This
should ensure that the interruptible_future machinery will handle the
event that one of them gets invalidated prior to beging rewritten.

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore/segment_manager/block: add segment_size to make_superblock debugging
Samuel Just [Mon, 23 Aug 2021 17:56:22 +0000 (10:56 -0700)]
crimson/os/seastore/segment_manager/block: add segment_size to make_superblock debugging

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agotest/crimson/seastore/test_btree_lba_manager: add better merge test
Samuel Just [Mon, 23 Aug 2021 20:51:50 +0000 (13:51 -0700)]
test/crimson/seastore/test_btree_lba_manager: add better merge test

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agotest/crimson/seastore/test_transaction_manager: update find_hole_assert_trigger
Samuel Just [Tue, 24 Aug 2021 05:38:36 +0000 (05:38 +0000)]
test/crimson/seastore/test_transaction_manager: update find_hole_assert_trigger

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/seastore:: add find_hole/add_pin assert test case
chunmei-liu [Wed, 14 Jul 2021 00:42:55 +0000 (17:42 -0700)]
crimson/seastore:: add find_hole/add_pin assert test case

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
3 years agocrimson/os/seastore: fix some clang capture warnings
Samuel Just [Tue, 24 Aug 2021 16:29:22 +0000 (09:29 -0700)]
crimson/os/seastore: fix some clang capture warnings

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agocrimson/os/seastore/segment_cleaner: fix update_usage call
Samuel Just [Thu, 26 Aug 2021 01:53:27 +0000 (18:53 -0700)]
crimson/os/seastore/segment_cleaner: fix update_usage call

Signed-off-by: Samuel Just <sjust@redhat.com>
3 years agoPendingReleaseNotes: add autoscaler profile 42941/head
Kamoltat [Thu, 26 Aug 2021 19:50:14 +0000 (19:50 +0000)]
PendingReleaseNotes: add autoscaler profile

Added autoscaler profile release notes for
>=17.0.0

Signed-off-by: Kamoltat <ksirivad@redhat.com>
3 years agoMerge pull request #42843 from majianpeng/pwl-ssd-restart-failed
Ilya Dryomov [Thu, 26 Aug 2021 19:49:29 +0000 (21:49 +0200)]
Merge pull request #42843 from majianpeng/pwl-ssd-restart-failed

librbd/cache/pwl/ssd: fix first_valid_entry calculation in retire_entries()

Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #42741 from sosodev/master
Kamoltat Sirivadhna [Thu, 26 Aug 2021 17:13:02 +0000 (13:13 -0400)]
Merge pull request #42741 from sosodev/master

mgr/pg_autoscaler: add threshold module option

3 years agoMerge pull request #42569 from ljflores/perf-histograms
Yuri Weinstein [Thu, 26 Aug 2021 16:41:48 +0000 (09:41 -0700)]
Merge pull request #42569 from ljflores/perf-histograms

mgr, mgr/telemetry: add access to osd commands in mgr and workload metrics to telemetry

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
3 years agocmake: use upstream repo for fio 42934/head
Kefu Chai [Thu, 26 Aug 2021 15:57:00 +0000 (23:57 +0800)]
cmake: use upstream repo for fio

this change partially reverts 10baab3fc8293b8c30ca90a4acd76f70d011f1b5,
but since the fix for C++ build is not included by any tag or branche so
far. let's just use the sha1 for now.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #42858 from josephsawaya/wip-mgr-rook-osd-removal
Joseph Sawaya [Thu, 26 Aug 2021 15:12:59 +0000 (11:12 -0400)]
Merge pull request #42858 from josephsawaya/wip-mgr-rook-osd-removal

mgr/rook: implementing OSD removal in the rook orchestrator

3 years agorgw: permit logging of list-bucket (and any other no-bucket op) 39933/head
Matt Benjamin [Tue, 9 Mar 2021 02:57:57 +0000 (21:57 -0500)]
rgw: permit logging of list-bucket (and any other no-bucket op)

This limitation is from inception (2011), but just recently reported by
a site using ops-log for system audit.

Fixes: https://tracker.ceph.com/issues/49313
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3 years agoMerge pull request #42869 from cbodley/wip-49955
Casey Bodley [Thu, 26 Aug 2021 14:32:23 +0000 (10:32 -0400)]
Merge pull request #42869 from cbodley/wip-49955

qa/rgw: move mixed-version multisite tests out of upgrade suite

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #42922 from dang/wip-dang-zipper-cleanup
Daniel Gryniewicz [Thu, 26 Aug 2021 13:45:17 +0000 (09:45 -0400)]
Merge pull request #42922 from dang/wip-dang-zipper-cleanup

RGW Zipper Cleanups

Reviewed-by: Soumya Kadouri <skoduri@redhat.com>
3 years agoMerge pull request #42893 from jan--f/snap-sched-fix-multi-retention
Venky Shankar [Thu, 26 Aug 2021 12:32:34 +0000 (18:02 +0530)]
Merge pull request #42893 from jan--f/snap-sched-fix-multi-retention

snap-schedule: count retained snapshots per retention policy

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #42895 from ifed01/wip-ifed-improve-alloc-replay
Igor Fedotov [Thu, 26 Aug 2021 11:08:40 +0000 (14:08 +0300)]
Merge pull request #42895 from ifed01/wip-ifed-improve-alloc-replay

test/allocator_replay_test: implement "try_alloc" command.

This tool has just limited manual  application when troubleshooting allocator's issues hence omitting QA run...

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agotest/store_test: fix broken test case 42918/head
Igor Fedotov [Wed, 25 Aug 2021 12:37:19 +0000 (15:37 +0300)]
test/store_test: fix broken test case

After merging NCB stuff missed shared blob detection doesn't reveal
extent leak any more - which is expected. Hence we need to adjust the
relevant UT.

Fixes:https://tracker.ceph.com/issues/52398

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
3 years agoMerge pull request #42916 from cyx1231st/wip-seastar-tree-metrics2
Samuel Just [Thu, 26 Aug 2021 01:50:41 +0000 (18:50 -0700)]
Merge pull request #42916 from cyx1231st/wip-seastar-tree-metrics2

crimson/seastore: improve metrics about onode and lba trees

Reviewed-by: Samuel Just <sjust@redhat.com>