]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocmake: let libglobal_obj depend on legacy-option-headers 41142/head
Kefu Chai [Tue, 4 May 2021 13:07:01 +0000 (21:07 +0800)]
cmake: let libglobal_obj depend on legacy-option-headers

to address following build failure:

FAILED: src/global/CMakeFiles/libglobal_objs.dir/global_init.cc.o ...
src/global/CMakeFiles/libglobal_objs.dir/global_init.cc.o -MF src/global/CMakeFiles/libglobal_objs.dir/global_init.cc.o.d -o src/global/CMakeFiles/libglobal_objs.dir/global_init.cc.o -c
../src/global/global_init.cc
In file included from ../src/global/global_init.cc:26:
In file included from ../src/common/config.h:26:
In file included from ../src/common/config_values.h:59:
../src/common/options/legacy_config_opts.h:1:10: fatal error: 'global_legacy_options.h' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41066 into master
Patrick Donnelly [Tue, 4 May 2021 00:51:37 +0000 (17:51 -0700)]
Merge PR #41066 into master

* refs/pull/41066/head:
mds: session dumps num_completed_flushes
mds: completed_requests -> num_completed_requests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40963 into master
Patrick Donnelly [Tue, 4 May 2021 00:46:16 +0000 (17:46 -0700)]
Merge PR #40963 into master

* refs/pull/40963/head:
mds: do not trim the inodes from the lru list in standby_replay

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40962 into master
Patrick Donnelly [Tue, 4 May 2021 00:43:47 +0000 (17:43 -0700)]
Merge PR #40962 into master

* refs/pull/40962/head:
test: add test to validate snap synchronization with parent directory snapshots
cephfs-mirror: ignore parent directory snapshots when building snap map

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40927 into master
Patrick Donnelly [Tue, 4 May 2021 00:39:41 +0000 (17:39 -0700)]
Merge PR #40927 into master

* refs/pull/40927/head:
mds: reset the return value for heap command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40903 into master
Patrick Donnelly [Tue, 4 May 2021 00:37:34 +0000 (17:37 -0700)]
Merge PR #40903 into master

* refs/pull/40903/head:
test: add test case for MDS privated inos accessing
mds: make the lost+found dir accessible from clients
mds: move the inos 1,2 and 3 macros to ceph_fs.h

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40882 into master
Patrick Donnelly [Tue, 4 May 2021 00:35:24 +0000 (17:35 -0700)]
Merge PR #40882 into master

* refs/pull/40882/head:
client: Fix executeable access check for the root user

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge PR #41120 into master
Patrick Donnelly [Mon, 3 May 2021 21:51:55 +0000 (14:51 -0700)]
Merge PR #41120 into master

* refs/pull/41120/head:
doc/_ext: ignore desc if it is unavailable
doc/_ext: check "default" for None
doc/_ext: print 0B if option value is 0
doc/cephfs: render options using confval directive

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41102 from soumyakoduri/set_acl_fix
Casey Bodley [Mon, 3 May 2021 18:27:58 +0000 (14:27 -0400)]
Merge pull request #41102 from soumyakoduri/set_acl_fix

rgw/acl: set_acl shouldn't overwrite bucket attrs

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41093 from idryomov/wip-rbd-pwl-ssd-boundary
Ilya Dryomov [Mon, 3 May 2021 13:27:18 +0000 (15:27 +0200)]
Merge pull request #41093 from idryomov/wip-rbd-pwl-ssd-boundary

librbd/cache/pwl/ssd/WriteLog: don't crash on split log entries

Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
4 years agoMerge PR #41105 into master
Sage Weil [Mon, 3 May 2021 12:28:15 +0000 (08:28 -0400)]
Merge PR #41105 into master

* refs/pull/41105/head:
qa/workunits/cephadm/test_cephadm: test zap-osds
cephadm: add --zap-osds argument to rm_cluster
cephadm: implement zap-osds --fsid ... command

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agolibrbd/cache/pwl/ssd/WriteLog: don't crash on split log entries 41093/head
Ilya Dryomov [Thu, 29 Apr 2021 13:03:46 +0000 (15:03 +0200)]
librbd/cache/pwl/ssd/WriteLog: don't crash on split log entries

write_log_entries() will split a log entry at the end of the log, the
remainder is written to the beginning at DATA_RING_BUFFER_OFFSET.  On
the read side aio_read_data_block() doesn't handle this case and just
crashes.  Unless the workload in use is <= 4K, the image is rendered
unusable sooner or later.

Fixes: https://tracker.ceph.com/issues/50589
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge pull request #41068 from idryomov/wip-rbd-pwl-ssd-capacity
Ilya Dryomov [Mon, 3 May 2021 12:00:48 +0000 (14:00 +0200)]
Merge pull request #41068 from idryomov/wip-rbd-pwl-ssd-capacity

librbd/cache/pwl/ssd/WriteLog: decrement m_bytes_allocated when retiring

Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
4 years agoMerge pull request #41042 from tchaikov/wip-rbd-cls-sparse-size
Ilya Dryomov [Sun, 2 May 2021 21:31:06 +0000 (23:31 +0200)]
Merge pull request #41042 from tchaikov/wip-rbd-cls-sparse-size

librbd: 32-bit and libc++ portability fixups

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agorgw/acl: set_acl shouldn't overwrite bucket attrs 41102/head
Soumya Koduri [Thu, 29 Apr 2021 20:40:06 +0000 (02:10 +0530)]
rgw/acl: set_acl shouldn't overwrite bucket attrs

Signed-off-by: Soumya Koduri <skoduri@redhat.com>
4 years agodoc/_ext: ignore desc if it is unavailable 41120/head
Kefu Chai [Sun, 2 May 2021 11:57:27 +0000 (19:57 +0800)]
doc/_ext: ignore desc if it is unavailable

there is chance that we don't have desc, desc_long or fmt_desc, in that
case, we should just skip desc before checking its length. so, just use
'if desc' which is able to check for None or empty string.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/_ext: check "default" for None
Kefu Chai [Sun, 2 May 2021 10:17:00 +0000 (18:17 +0800)]
doc/_ext: check "default" for None

default could be None and we don't reference the default value using
`opt.default`, so this variable is always defined. to avoid printing
a None default value, check for a None value. see
https://jinja.palletsprojects.com/en/2.11.x/templates/#none

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/_ext: print 0B if option value is 0
Kefu Chai [Sun, 2 May 2021 09:50:36 +0000 (17:50 +0800)]
doc/_ext: print 0B if option value is 0

before this change, the rendered Default is "0Ei" if the default size is 0,
would be more readable if it is "0B" or "0".

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/cephfs: render options using confval directive
Kefu Chai [Sun, 2 May 2021 09:13:33 +0000 (17:13 +0800)]
doc/cephfs: render options using confval directive

less repeating, better maintainability this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41085 from idryomov/wip-rbd-nuke-source-spec-file
Mykola Golub [Sun, 2 May 2021 09:11:10 +0000 (12:11 +0300)]
Merge pull request #41085 from idryomov/wip-rbd-nuke-source-spec-file

rbd: --source-spec-file should be --source-spec-path

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #41116 from tchaikov/wip-in_addr_t
Kefu Chai [Sun, 2 May 2021 00:09:03 +0000 (08:09 +0800)]
Merge pull request #41116 from tchaikov/wip-in_addr_t

common/pick_address: define in_addr_t if it is not defined

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #41117 from tchaikov/wip-doc-cephfs-conf
Kefu Chai [Sat, 1 May 2021 15:34:11 +0000 (23:34 +0800)]
Merge pull request #41117 from tchaikov/wip-doc-cephfs-conf

doc/cephfs/mds-config-ref: remove duplicated confval

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agocommon/pick_address: define in_addr_t if it is not defined 41116/head
Kefu Chai [Sat, 1 May 2021 15:30:18 +0000 (23:30 +0800)]
common/pick_address: define in_addr_t if it is not defined

neither mingw not not have in_addr_t defined, see
https://docs.microsoft.com/en-us/windows/win32/api/winsock2/ns-winsock2-in_addr,
so define it if it is not defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/cephfs/mds-config-ref: remove duplicated confval 41117/head
Kefu Chai [Sat, 1 May 2021 15:05:36 +0000 (23:05 +0800)]
doc/cephfs/mds-config-ref: remove duplicated confval

this change addresses the warning of:

/home/jenkins-build/build/workspace/ceph-pr-docs/doc/cephfs/mds-config-ref.rst:2: WARNING: duplicate confval_option description of mds_cache_memory_limit, other instance in cephfs/cache-configuration
/home/jenkins-build/build/workspace/ceph-pr-docs/doc/cephfs/mds-config-ref.rst:2: WARNING: duplicate confval_option description of mds_cache_reservation, other instance in cephfs/cache-configuration

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41043 from ifed01/wip-ifed-fix-use-ratio
Kefu Chai [Sat, 1 May 2021 04:59:41 +0000 (12:59 +0800)]
Merge pull request #41043 from ifed01/wip-ifed-fix-use-ratio

osd: compute OSD's space usage ratio via raw space utilization

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41012 into master
Patrick Donnelly [Sat, 1 May 2021 04:03:17 +0000 (21:03 -0700)]
Merge PR #41012 into master

* refs/pull/41012/head:
doc/cephfs/cache-config: use config item macros

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40961 from tchaikov/wip-50456
Kefu Chai [Sat, 1 May 2021 01:11:30 +0000 (09:11 +0800)]
Merge pull request #40961 from tchaikov/wip-50456

common/pick_address: filter out loopback addresses

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #41071 from tchaikov/wip-cmake-disable-vta
Kefu Chai [Sat, 1 May 2021 01:09:05 +0000 (09:09 +0800)]
Merge pull request #41071 from tchaikov/wip-cmake-disable-vta

cmake: disable "variable tracking" when building rados python binding

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #41091 into master
Patrick Donnelly [Sat, 1 May 2021 00:15:55 +0000 (17:15 -0700)]
Merge PR #41091 into master

* refs/pull/41091/head:
doc/cephfs/nfs: add section about ganesha logs
doc/cephfs/nfs: Replace volume/nfs with nfs
doc/cephfs/nfs: add note about export management with volume/nfs interface only

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41004 from sseshasa/wip-mclock-max-backfill-misc-fix
Sridhar Seshasayee [Fri, 30 Apr 2021 17:28:21 +0000 (22:58 +0530)]
Merge pull request #41004 from sseshasa/wip-mclock-max-backfill-misc-fix

osd: Override recovery, backfill and sleep related config options during OSD and mclock scheduler initialization.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
4 years agoqa/workunits/cephadm/test_cephadm: test zap-osds 41105/head
Sage Weil [Fri, 30 Apr 2021 14:16:16 +0000 (10:16 -0400)]
qa/workunits/cephadm/test_cephadm: test zap-osds

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: add --zap-osds argument to rm_cluster
Sage Weil [Fri, 30 Apr 2021 14:13:23 +0000 (10:13 -0400)]
cephadm: add --zap-osds argument to rm_cluster

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: implement zap-osds --fsid ... command
Sage Weil [Fri, 30 Apr 2021 13:54:40 +0000 (09:54 -0400)]
cephadm: implement zap-osds --fsid ... command

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #40967 from dang/wip-dang-zipper-user
Daniel Gryniewicz [Fri, 30 Apr 2021 14:03:58 +0000 (10:03 -0400)]
Merge pull request #40967 from dang/wip-dang-zipper-user

RGW Zipper consistent load/store APIs for User

4 years agoMerge pull request #40946 from ifed01/wip-ifed-dump-pool-statfs
Kefu Chai [Fri, 30 Apr 2021 11:43:18 +0000 (19:43 +0800)]
Merge pull request #40946 from ifed01/wip-ifed-dump-pool-statfs

osd: admin cmd to dump pools statfs for a specific OSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41014 from smithfarm/wip-mempool-cacheline-49781
Kefu Chai [Fri, 30 Apr 2021 11:36:17 +0000 (19:36 +0800)]
Merge pull request #41014 from smithfarm/wip-mempool-cacheline-49781

qa: verify the benefits of mempool cacheline optimization

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40998 from cyx1231st/wip-seastore-onode-tree-delete
Samuel Just [Fri, 30 Apr 2021 06:22:42 +0000 (23:22 -0700)]
Merge pull request #40998 from cyx1231st/wip-seastore-onode-tree-delete

crimson/onode-staged-tree: implement/validate features to erase values from tree

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agodoc/cephfs/nfs: add section about ganesha logs 41091/head
Varsha Rao [Thu, 29 Apr 2021 17:42:20 +0000 (23:12 +0530)]
doc/cephfs/nfs: add section about ganesha logs

Fixes: https://tracker.ceph.com/issues/50008
Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agodoc/cephfs/nfs: Replace volume/nfs with nfs
Varsha Rao [Thu, 29 Apr 2021 12:33:53 +0000 (18:03 +0530)]
doc/cephfs/nfs: Replace volume/nfs with nfs

Recently, nfs related code was moved out of volumes plugin[1]. So using the
name volume/nfs for the interface is not appropriate.

[1] https://github.com/ceph/ceph/pull/40526

Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agodoc/cephfs/nfs: add note about export management with volume/nfs interface only
Varsha Rao [Thu, 29 Apr 2021 12:25:45 +0000 (17:55 +0530)]
doc/cephfs/nfs: add note about export management with volume/nfs interface only

Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agoqa: verify the benefits of mempool cacheline optimization 41014/head
Loïc Dachary [Fri, 19 Mar 2021 07:29:08 +0000 (08:29 +0100)]
qa: verify the benefits of mempool cacheline optimization

There already is a test to verify the mempool sharding works, in the sense that
it uses at least half of the variables available to count the number of
allocated objects and their total size. This new test verifies that, with
sharding, object counting is at least twice faster than without sharding. It
also collects cacheline contention data with the perf c2c tool. The manual
analysis of this data shows the optimization gain is indeed related to cacheline
contention.

Fixes: https://tracker.ceph.com/issues/49896
Signed-off-by: Loïc Dachary <loic@dachary.org>
4 years agolibrbd/cache/pwl: include head and tail pointers in STATS 41068/head
Ilya Dryomov [Wed, 28 Apr 2021 12:27:12 +0000 (14:27 +0200)]
librbd/cache/pwl: include head and tail pointers in STATS

While at it, reduce the number of calls to operator<< and drop
the trailing comma.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agolibrbd/cache/pwl: bump "Waiting for allocation" and "Retiring" dout level
Ilya Dryomov [Wed, 28 Apr 2021 12:27:12 +0000 (14:27 +0200)]
librbd/cache/pwl: bump "Waiting for allocation" and "Retiring" dout level

Bump "Waiting for allocation" to 5.

"Retiring" is at 20 for rwl and 1 for ssd.  Bump the latter to 20 as
well.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agolibrbd/cache/pwl: use m_bytes_allocated_cap for both rwl and ssd
Ilya Dryomov [Wed, 28 Apr 2021 12:27:12 +0000 (14:27 +0200)]
librbd/cache/pwl: use m_bytes_allocated_cap for both rwl and ssd

Follow rwl mode and use AbstractWriteLog::m_bytes_allocated_cap
instead of m_log_pool_ring_buffer_size specific to ssd.  This fixes
"bytes available" calculation in STATS output.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agolibrbd/cache/pwl/ssd/WriteLog: decrement m_bytes_allocated when retiring
Ilya Dryomov [Wed, 28 Apr 2021 12:27:12 +0000 (14:27 +0200)]
librbd/cache/pwl/ssd/WriteLog: decrement m_bytes_allocated when retiring

Currently if ssd cache is filled to capacity, all future I/O hangs
indefinitely because even though the cache eventually becomes clean
and retires enough entries to get back under RETIRE_HIGH_WATER, this
isn't communicated to AbstractWriteLog::check_allocation().

Fixes: https://tracker.ceph.com/issues/50560
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agolibrbd/cache/pwl/ssd/WriteLog: fix free()/delete mismatch
Ilya Dryomov [Thu, 29 Apr 2021 13:03:46 +0000 (15:03 +0200)]
librbd/cache/pwl/ssd/WriteLog: fix free()/delete mismatch

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agolibrbd/cache/pwl/ssd/WriteLog: fix indentation
Ilya Dryomov [Mon, 26 Apr 2021 13:57:43 +0000 (15:57 +0200)]
librbd/cache/pwl/ssd/WriteLog: fix indentation

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge pull request #40502 from zdover23/wip-doc-podman-version-octopus-note-2021...
zdover23 [Thu, 29 Apr 2021 19:53:58 +0000 (05:53 +1000)]
Merge pull request #40502 from zdover23/wip-doc-podman-version-octopus-note-2021-30-Mar

doc/cephadm: add podman version note to install

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #40072 from wornet-mwo/dashboard--grafana-hostname-corrections
Ernesto Puerta [Thu, 29 Apr 2021 17:40:57 +0000 (19:40 +0200)]
Merge pull request #40072 from wornet-mwo/dashboard--grafana-hostname-corrections

mgr/dashboard: Fixed name clash when hostname similar to another

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: p-se <NOT@FOUND>
4 years agoRGW Zipper - Permenant User storage API 40967/head
Daniel Gryniewicz [Wed, 31 Mar 2021 13:42:13 +0000 (09:42 -0400)]
RGW Zipper - Permenant User storage API

The load/store/remove APIs for User are needed, so make them consistent
and permenant.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #41040 from tchaikov/wip-doc-mds-conf
Kefu Chai [Thu, 29 Apr 2021 16:33:41 +0000 (00:33 +0800)]
Merge pull request #41040 from tchaikov/wip-doc-mds-conf

doc/cephfs/mds-config-ref: render options using confval directive

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agorbd: --source-spec-file should be --source-spec-path 41085/head
Ilya Dryomov [Thu, 29 Apr 2021 15:47:49 +0000 (17:47 +0200)]
rbd: --source-spec-file should be --source-spec-path

It was renamed during development, get rid of the leftovers.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge pull request #41028 from mkogan1/wip-rgw-tracker-50467
Mark Kogan [Thu, 29 Apr 2021 15:48:54 +0000 (18:48 +0300)]
Merge pull request #41028 from mkogan1/wip-rgw-tracker-50467

rgw: fix segfault related to explicit object manifest handling

4 years agoMerge pull request #41083 from rhcs-dashboard/fix-50580-master
Ernesto Puerta [Thu, 29 Apr 2021 15:42:38 +0000 (17:42 +0200)]
Merge pull request #41083 from rhcs-dashboard/fix-50580-master

mgr/dashboard: OSDs placement text is unreadable

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #41082 from tchaikov/wip-50558
Kefu Chai [Thu, 29 Apr 2021 14:59:02 +0000 (22:59 +0800)]
Merge pull request #41082 from tchaikov/wip-50558

os/bluestore: Revert" Optimizing the lock of bluestore writing process"

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #41064 from petrutlucian94/win_at_removedir
Kefu Chai [Thu, 29 Apr 2021 14:58:16 +0000 (22:58 +0800)]
Merge pull request #41064 from petrutlucian94/win_at_removedir

include: define AT_REMOVEDIR on Windows

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41038 from tchaikov/wip-cmake-liburing
Kefu Chai [Thu, 29 Apr 2021 14:20:09 +0000 (22:20 +0800)]
Merge pull request #41038 from tchaikov/wip-cmake-liburing

cmake: pass "CC" using configure when building liburing

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
4 years agomgr/dashboard:OSDs placement text is unreadable 41083/head
Aashish Sharma [Thu, 29 Apr 2021 12:57:59 +0000 (18:27 +0530)]
mgr/dashboard:OSDs placement text is unreadable

While displaying the host pattern in the OSDs placement tab, it gets splited with semi-colons. Also adjusted the column size of Container Image ID and Placement columns.

Fixes: https://tracker.ceph.com/issues/50580
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
4 years agoos/bluestore: Revert" Optimizing the lock of bluestore writing process" 41082/head
Kefu Chai [Thu, 29 Apr 2021 12:01:24 +0000 (20:01 +0800)]
os/bluestore: Revert" Optimizing the lock of bluestore writing process"

This reverts commit e80d3f7a891af99ba0d4cfe99e5530016ca867ac.

Fixes: https://tracker.ceph.com/issues/50571
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/onode-staged-tree: implement erase for perf-staged-tree 40998/head
Yingxin Cheng [Fri, 23 Apr 2021 02:24:01 +0000 (10:24 +0800)]
crimson/onode-staged-tree: implement erase for perf-staged-tree

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement synthetic tests for value erase
Yingxin Cheng [Fri, 23 Apr 2021 02:20:50 +0000 (10:20 +0800)]
crimson/onode-staged-tree: implement synthetic tests for value erase

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: fix ownership issues at node-level
Yingxin Cheng [Fri, 23 Apr 2021 02:17:31 +0000 (10:17 +0800)]
crimson/onode-staged-tree: fix ownership issues at node-level

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: allow to insert item to an empty node
Yingxin Cheng [Fri, 23 Apr 2021 02:11:03 +0000 (10:11 +0800)]
crimson/onode-staged-tree: allow to insert item to an empty node

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: move try_downgrade_root() into fix_index()
Yingxin Cheng [Fri, 23 Apr 2021 02:03:18 +0000 (10:03 +0800)]
crimson/onode-staged-tree: move try_downgrade_root() into fix_index()

Specifically, apply_children_merge() doesn't know whether it will be
retired due to fix_parent_index().

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: don't validate child when it's outdated
Yingxin Cheng [Fri, 23 Apr 2021 01:25:29 +0000 (09:25 +0800)]
crimson/onode-staged-tree: don't validate child when it's outdated

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: pass origin_left_addr to apply_children_merge()
Yingxin Cheng [Thu, 22 Apr 2021 08:46:44 +0000 (16:46 +0800)]
crimson/onode-staged-tree: pass origin_left_addr to apply_children_merge()

rebuild_extent() may change the address of the left child, we need to
pass the origin_left_addr in order to validate if it is correct.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/.../node_extent_manager: replay extents may be dirty
Samuel Just [Wed, 21 Apr 2021 07:00:03 +0000 (00:00 -0700)]
crimson/.../node_extent_manager: replay extents may be dirty

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/onode-staged-tree: cleanup tree_utils.h
Yingxin Cheng [Mon, 19 Apr 2021 05:16:24 +0000 (13:16 +0800)]
crimson/onode-staged-tree: cleanup tree_utils.h

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: test fix_index() in internal node
Yingxin Cheng [Mon, 19 Apr 2021 03:13:36 +0000 (11:13 +0800)]
crimson/onode-staged-tree: test fix_index() in internal node

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: test merge in internal node
Yingxin Cheng [Fri, 16 Apr 2021 05:46:27 +0000 (13:46 +0800)]
crimson/onode-staged-tree: test merge in internal node

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement staged::get_prev_slot()
Yingxin Cheng [Fri, 16 Apr 2021 05:45:09 +0000 (13:45 +0800)]
crimson/onode-staged-tree: implement staged::get_prev_slot()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: test merge in leaf node
Yingxin Cheng [Thu, 15 Apr 2021 06:53:51 +0000 (14:53 +0800)]
crimson/onode-staged-tree: test merge in leaf node

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement layout-level merge
Yingxin Cheng [Wed, 14 Apr 2021 01:39:50 +0000 (09:39 +0800)]
crimson/onode-staged-tree: implement layout-level merge

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: test erase in leaf node
Yingxin Cheng [Thu, 8 Apr 2021 07:46:28 +0000 (15:46 +0800)]
crimson/onode-staged-tree: test erase in leaf node

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement staged::erase()
Yingxin Cheng [Mon, 12 Apr 2021 03:59:31 +0000 (11:59 +0800)]
crimson/onode-staged-tree: implement staged::erase()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: fix container_t::update_size() to accept negative value
Yingxin Cheng [Wed, 7 Apr 2021 08:09:41 +0000 (16:09 +0800)]
crimson/onode-staged-tree: fix container_t::update_size() to accept negative value

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement staged::is_keys_one()
Yingxin Cheng [Wed, 7 Apr 2021 07:34:19 +0000 (15:34 +0800)]
crimson/onode-staged-tree: implement staged::is_keys_one()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement node-level erase/merge logic
Yingxin Cheng [Fri, 23 Apr 2021 03:07:12 +0000 (11:07 +0800)]
crimson/onode-staged-tree: implement node-level erase/merge logic

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement delta encode/decode for erase ops
Yingxin Cheng [Fri, 23 Apr 2021 03:00:34 +0000 (11:00 +0800)]
crimson/onode-staged-tree: implement delta encode/decode for erase ops

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: improve logs
Yingxin Cheng [Sun, 11 Apr 2021 15:58:02 +0000 (23:58 +0800)]
crimson/onode-staged-tree: improve logs

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement fast Node::get_name()
Yingxin Cheng [Sun, 11 Apr 2021 15:49:33 +0000 (23:49 +0800)]
crimson/onode-staged-tree: implement fast Node::get_name()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: fix get_pivot_index() for leaf node
Yingxin Cheng [Sun, 11 Apr 2021 15:22:37 +0000 (23:22 +0800)]
crimson/onode-staged-tree: fix get_pivot_index() for leaf node

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: be explicit about node num-key/value invariants
Yingxin Cheng [Fri, 2 Apr 2021 07:27:45 +0000 (15:27 +0800)]
crimson/onode-staged-tree: be explicit about node num-key/value invariants

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: cleanup node interfaces
Yingxin Cheng [Thu, 1 Apr 2021 06:01:42 +0000 (14:01 +0800)]
crimson/onode-staged-tree: cleanup node interfaces

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement states for NodeExtentAccessorT
Yingxin Cheng [Mon, 22 Mar 2021 03:34:31 +0000 (11:34 +0800)]
crimson/onode-staged-tree: implement states for NodeExtentAccessorT

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement NodeExtentManager::retire_extent()
Yingxin Cheng [Thu, 18 Mar 2021 08:35:21 +0000 (16:35 +0800)]
crimson/onode-staged-tree: implement NodeExtentManager::retire_extent()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: fix log
Yingxin Cheng [Thu, 18 Mar 2021 08:22:08 +0000 (16:22 +0800)]
crimson/onode-staged-tree: fix log

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: remove implemented TODO
Yingxin Cheng [Wed, 3 Mar 2021 08:48:59 +0000 (16:48 +0800)]
crimson/onode-staged-tree: remove implemented TODO

Already implemented in c32c1032de1223169a1223d1b8995856e8763df5

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: implement tree-level erase interfaces
Yingxin Cheng [Wed, 3 Mar 2021 07:48:16 +0000 (15:48 +0800)]
crimson/onode-staged-tree: implement tree-level erase interfaces

Define and implement erase related interfaces from BTree, BTree::Cursor,
tree_cursor_t, Node to LeafNode.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: add invalid state to tree_cursor_t
Yingxin Cheng [Thu, 18 Mar 2021 09:17:22 +0000 (17:17 +0800)]
crimson/onode-staged-tree: add invalid state to tree_cursor_t

If a key-value pair is erased from the tree, the according tree_cursor_t
is untracked and becomes invalid.

From Cursor point-of-view, it becomes an end Cursor if the internal
cursor is invalidated.

From Value point-of-view, it becomes untracked if the value is erased.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: cleanup replace_track/track_split()
Yingxin Cheng [Thu, 18 Mar 2021 09:16:17 +0000 (17:16 +0800)]
crimson/onode-staged-tree: cleanup replace_track/track_split()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/onode-staged-tree: disable concurrent gc
Yingxin Cheng [Fri, 2 Apr 2021 06:51:02 +0000 (14:51 +0800)]
crimson/onode-staged-tree: disable concurrent gc

Fix test/perf hang according to 947b103eed0720bc6276274b1b707b221b895a62

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge pull request #40493 from CongMinYin/fix-rwl-fragment
Ilya Dryomov [Thu, 29 Apr 2021 07:35:21 +0000 (09:35 +0200)]
Merge pull request #40493 from CongMinYin/fix-rwl-fragment

librbd/cache/pwl: Fix pmem cache fragment issue

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agolibrbd/cache/pwl: Fix pmem cache fragment issue 40493/head
Yin Congmin [Tue, 30 Mar 2021 14:47:33 +0000 (22:47 +0800)]
librbd/cache/pwl: Fix pmem cache fragment issue

I/O may hang due to pmem cache fragment issue when blocks are diffrent
in size. Call pmdk API(pmemobj_defrag) to solve.

Fixes: https://tracker.ceph.com/issues/49879
Signed-off-by: Yin Congmin <congmin.yin@intel.com>
4 years agoMerge PR #41072 into master
Sage Weil [Wed, 28 Apr 2021 22:42:49 +0000 (18:42 -0400)]
Merge PR #41072 into master

* refs/pull/41072/head:
doc/releases/nautilus: fix a braino in 14.2.20 release note

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge PR #40924 into master
Sage Weil [Wed, 28 Apr 2021 18:27:07 +0000 (14:27 -0400)]
Merge PR #40924 into master

* refs/pull/40924/head:
mgr/cephadm: check hostname resolution before adding host
cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
doc/cephadm: remove /etc/hosts from list of hostname resoltion methods

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #40593 from ideepika/wip-new-testing-params
Josh Durgin [Wed, 28 Apr 2021 18:26:58 +0000 (11:26 -0700)]
Merge pull request #40593 from ideepika/wip-new-testing-params

qa/config/rados: add dispatch delay testing params

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sam Just <sjust@redhat.com>
4 years agoMerge PR #40941 into master
Sage Weil [Wed, 28 Apr 2021 18:26:35 +0000 (14:26 -0400)]
Merge PR #40941 into master

* refs/pull/40941/head:
qa/suites/rados/cephadm/smoke-roleless: test client-keyring
qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
doc/cephadm: document the default 'admin' label
mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
mgr/cephadm: reimplement ceph.conf pushing
mgr/cephadm: use _write_remote_file for ceph.conf
mgr/cephadm: _write_remote_file helper
mgr/cephadm: add placementspec for which hosts get ceph.conf

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge PR #40943 into master
Sage Weil [Wed, 28 Apr 2021 18:26:07 +0000 (14:26 -0400)]
Merge PR #40943 into master

* refs/pull/40943/head:
mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
mgr/cephadm: don't allow upgrade start with less than 2 mgrs

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge PR #41049 into master
Sage Weil [Wed, 28 Apr 2021 18:25:30 +0000 (14:25 -0400)]
Merge PR #41049 into master

* refs/pull/41049/head:
cephadm: re-assimilate user provided conf after mgr created

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>