]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoMerge PR #38511 into master
Patrick Donnelly [Fri, 11 Dec 2020 17:47:35 +0000 (09:47 -0800)]
Merge PR #38511 into master

* refs/pull/38511/head:
qa/tasks/cephfs/nfs: Check if host ip is in cluster info output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #38519 from rhcs-dashboard/fix-47727-master
Ernesto Puerta [Fri, 11 Dec 2020 16:14:50 +0000 (17:14 +0100)]
Merge pull request #38519 from rhcs-dashboard/fix-47727-master

mgr/dashboard: RGW User Form is validating disabled fields

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38125 from rhcs-dashboard/improve-CRUSH-info-columns
Ernesto Puerta [Fri, 11 Dec 2020 16:08:35 +0000 (17:08 +0100)]
Merge pull request #38125 from rhcs-dashboard/improve-CRUSH-info-columns

mgr/dashboard: Replace Replica size and Erasure code profile with a single column

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38494 from dillaman/wip-45694
Mykola Golub [Fri, 11 Dec 2020 15:40:12 +0000 (17:40 +0200)]
Merge pull request #38494 from dillaman/wip-45694

librbd: fix sporadic failures in TestMigration.StressLive

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #38515 from tchaikov/wip-script-run-cbt
Kefu Chai [Fri, 11 Dec 2020 14:34:53 +0000 (22:34 +0800)]
Merge pull request #38515 from tchaikov/wip-script-run-cbt

script/run-cbt.sh: drop bashism

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agolibrbd/deep_copy: added new migrating flag to object copy 38494/head
Jason Dillaman [Tue, 8 Dec 2020 19:16:49 +0000 (14:16 -0500)]
librbd/deep_copy: added new migrating flag to object copy

The migration operation and the copyup state machine will set
this flag when attempting to perform a deep-copy due to a
live-migration.

This flag will prevent a possible race condition between the
start of the object deep-copy when migration was enabled and
the writing portion of the deep-copy when migration might
have completed via external means.

Fixes: https://tracker.ceph.com/issues/45694
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd/deep_copy: added bitwise flag parameter to object copy
Jason Dillaman [Tue, 8 Dec 2020 18:11:20 +0000 (13:11 -0500)]
librbd/deep_copy: added bitwise flag parameter to object copy

This initial version subsumes the original "flatten" boolean flag.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38486 from Rjerk/fix-mds-conf-typo
Kefu Chai [Fri, 11 Dec 2020 12:46:24 +0000 (20:46 +0800)]
Merge pull request #38486 from Rjerk/fix-mds-conf-typo

doc: fix a couple of typos

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #38542 from SMIL-Infra/wip-doc-conf-typo
Kefu Chai [Fri, 11 Dec 2020 12:41:54 +0000 (20:41 +0800)]
Merge pull request #38542 from SMIL-Infra/wip-doc-conf-typo

doc: Fixes a typo in mon_dns_srv_name.

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38517 from dillaman/wip-48525
Mykola Golub [Fri, 11 Dec 2020 10:13:41 +0000 (12:13 +0200)]
Merge pull request #38517 from dillaman/wip-48525

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

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #38492 from dillaman/wip-librbd-io-tweaks
Mykola Golub [Fri, 11 Dec 2020 10:12:04 +0000 (12:12 +0200)]
Merge pull request #38492 from dillaman/wip-librbd-io-tweaks

librbd: minor fix to IO shut-down and increased IO logging

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agodoc: Fixes a typo in mon_dns_srv_name. 38542/head
胡玮文 [Fri, 11 Dec 2020 09:16:14 +0000 (17:16 +0800)]
doc: Fixes a typo in mon_dns_srv_name.

Signed-off-by: 胡玮文 <huww98@outlook.com>
4 years agoMerge pull request #38480 from yician1000/fix_48488
Kefu Chai [Fri, 11 Dec 2020 08:08:31 +0000 (16:08 +0800)]
Merge pull request #38480 from yician1000/fix_48488

mgr/restful: fix TypeError occurring in _gather_osds()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38384 from bk201/wip-48406
Kefu Chai [Fri, 11 Dec 2020 08:07:03 +0000 (16:07 +0800)]
Merge pull request #38384 from bk201/wip-48406

mgr/dashboard: fix test_dashboard_e2e.sh errors

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #37785 from lxbsz/conf1
Kefu Chai [Fri, 11 Dec 2020 08:04:51 +0000 (16:04 +0800)]
Merge pull request #37785 from lxbsz/conf1

common/config: do not expand the pid for socket admin

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38417 from changchengx/osdmap
Kefu Chai [Fri, 11 Dec 2020 08:04:00 +0000 (16:04 +0800)]
Merge pull request #38417 from changchengx/osdmap

osd/OSDMonitor: correct duplicated output info

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #38453 from b-ranto/wip-crash-serial
Kefu Chai [Fri, 11 Dec 2020 08:00:35 +0000 (16:00 +0800)]
Merge pull request #38453 from b-ranto/wip-crash-serial

mgr/crash: Serialize command handling

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #38501 from tchaikov/wip-cmake-crimson-test
Kefu Chai [Fri, 11 Dec 2020 07:52:22 +0000 (15:52 +0800)]
Merge pull request #38501 from tchaikov/wip-cmake-crimson-test

test/crimson: do not link against crimson-{os,common}

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #38516 from tchaikov/wip-cmake-rocksdb
Kefu Chai [Fri, 11 Dec 2020 04:47:51 +0000 (12:47 +0800)]
Merge pull request #38516 from tchaikov/wip-cmake-rocksdb

cmake: stop rebuilding rocksdb everytime

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #35314 from zdover23/wip-doc-elasticsearch-7-warning
Josh Durgin [Fri, 11 Dec 2020 02:54:51 +0000 (18:54 -0800)]
Merge pull request #35314 from zdover23/wip-doc-elasticsearch-7-warning

doc/radosgw: Note that ElasticSearch 7 doesn't work. Just 6 and lower.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #38523 from tchaikov/wip-gcc-toolset-9
Kefu Chai [Fri, 11 Dec 2020 02:41:53 +0000 (10:41 +0800)]
Merge pull request #38523 from tchaikov/wip-gcc-toolset-9

install-deps.sh: do not use gcc-toolset-9 from copr

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #38157 from sebastian-philipp/labeler-orchestrator
Kefu Chai [Fri, 11 Dec 2020 00:59:09 +0000 (08:59 +0800)]
Merge pull request #38157 from sebastian-philipp/labeler-orchestrator

github/labeler: Add some more to cephadm, add orchestrator

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38408 from trociny/wip-rbd-group-snap-create2
Jason Dillaman [Thu, 10 Dec 2020 23:06:50 +0000 (18:06 -0500)]
Merge pull request #38408 from trociny/wip-rbd-group-snap-create2

librbd: extend group snap create API to support flags

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38518 from trociny/wip-rbd-test-memleak
Jason Dillaman [Thu, 10 Dec 2020 23:06:24 +0000 (18:06 -0500)]
Merge pull request #38518 from trociny/wip-rbd-test-memleak

test/librbd: fix memory leak in TestLibRBD.ConcurentOperations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38490 from sebastian-philipp/mypy-0.790
Sebastian Wagner [Thu, 10 Dec 2020 21:41:47 +0000 (22:41 +0100)]
Merge pull request #38490 from sebastian-philipp/mypy-0.790

src,qa,dashboard: Upgrade to mypy 0.790

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #38075 from joke-lee/s3-auth-date-fix
Harish Munjulur [Thu, 10 Dec 2020 19:49:37 +0000 (11:49 -0800)]
Merge pull request #38075 from joke-lee/s3-auth-date-fix

rgw: fix RequestTimeTooSkewed when Date contain RFC-822/ISO 8601 standard timezone

4 years agoMerge pull request #37926 from BryceCao/wip-catch-non-int-exception
Harish Munjulur [Thu, 10 Dec 2020 19:48:47 +0000 (11:48 -0800)]
Merge pull request #37926 from BryceCao/wip-catch-non-int-exception

rgw : catch non int exception

4 years agoMerge pull request #37909 from alexandrsushko/prometheus-pg-laggy-46142
Kefu Chai [Thu, 10 Dec 2020 15:53:48 +0000 (23:53 +0800)]
Merge pull request #37909 from alexandrsushko/prometheus-pg-laggy-46142

mgr: Fix for dashboard/prometheus failure due to laggy pg state

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
4 years agoMerge pull request #38131 from linuxbox2/wip-lc-ix
J. Eric Ivancich [Thu, 10 Dec 2020 15:06:40 +0000 (10:06 -0500)]
Merge pull request #38131 from linuxbox2/wip-lc-ix

rgwlc: correctly dimension lc shard index vector

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agogithub/labeler: Add some more to cephadm, add orchestrator 38157/head
Sebastian Wagner [Wed, 18 Nov 2020 11:29:50 +0000 (12:29 +0100)]
github/labeler: Add some more to cephadm, add orchestrator

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #38524 from tchaikov/wip-crimson-qa-rbd
Kefu Chai [Thu, 10 Dec 2020 14:18:39 +0000 (22:18 +0800)]
Merge pull request #38524 from tchaikov/wip-crimson-qa-rbd

qa/suites: add crimson-rados/rbd test suites

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #38470 from sebastian-philipp/cephadm-command-unit-verbose
Sebastian Wagner [Thu, 10 Dec 2020 14:14:19 +0000 (15:14 +0100)]
Merge pull request #38470 from sebastian-philipp/cephadm-command-unit-verbose

cephadm: command_unit: call systemctl with verbose=True

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #38009 from ideepika/wip-48058-cephadm
Sebastian Wagner [Thu, 10 Dec 2020 14:13:42 +0000 (15:13 +0100)]
Merge pull request #38009 from ideepika/wip-48058-cephadm

qa/tasks/cephadm: update_info_yam() only if ctx.archive is valid

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36551 from CongMinYin/immutable_object_cache_throttle
Jason Dillaman [Thu, 10 Dec 2020 14:07:16 +0000 (09:07 -0500)]
Merge pull request #36551 from CongMinYin/immutable_object_cache_throttle

tools: add throttle mechanism to immutable object cache

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agorbd-mirror: do not attempt to unlink from more recent snapshots 38517/head
Jason Dillaman [Thu, 10 Dec 2020 04:17:24 +0000 (23:17 -0500)]
rbd-mirror: do not attempt to unlink from more recent snapshots

The snapshot-based mirroring replayer should only attempt to unlink
from any snapshots that are older than the end remote snapshot id to
prevent the remote side from incorrectly deleted the snapshot.

Fixes: https://tracker.ceph.com/issues/48527
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd/mirror: unlink peer might recursively loop
Jason Dillaman [Thu, 10 Dec 2020 03:30:17 +0000 (22:30 -0500)]
librbd/mirror: unlink peer might recursively loop

If the mirror peer set is (incorrectly) empty, it's not currently
possible for the unlink peer state machine to properly delete the
snapshot. This can result in a recursive loop between the create
primary snapshot state machine and the unlink peer state machine
until the stack depth grows too large.

Fixes: https://tracker.ceph.com/issues/48525
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoqa/suites: add crimson-rados/rbd test suites 38524/head
Kefu Chai [Thu, 10 Dec 2020 11:36:15 +0000 (19:36 +0800)]
qa/suites: add crimson-rados/rbd test suites

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38435 from votdev/issue_48449_test_standby
Ernesto Puerta [Thu, 10 Dec 2020 12:25:03 +0000 (13:25 +0100)]
Merge pull request #38435 from votdev/issue_48449_test_standby

mgr/dashboard: test_standby* (tasks.mgr.test_dashboard.TestDashboard) failed locally

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #38441 from bk201/wip-48455
Ernesto Puerta [Thu, 10 Dec 2020 12:23:46 +0000 (13:23 +0100)]
Merge pull request #38441 from bk201/wip-48455

mgr/dashboard: adjust refresh intervals of Services and Daemons

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #38212 from sebastian-philipp/mgr-cephadm-type-annotations-mandato...
Sebastian Wagner [Thu, 10 Dec 2020 12:15:57 +0000 (13:15 +0100)]
Merge pull request #38212 from sebastian-philipp/mgr-cephadm-type-annotations-mandatory-module

mgr/cephadm: make type annotations for module.py mandatory

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoinstall-deps.sh: do not use gcc-toolset-9 from copr 38523/head
Kefu Chai [Thu, 10 Dec 2020 10:48:24 +0000 (18:48 +0800)]
install-deps.sh: do not use gcc-toolset-9 from copr

since both CentOS and RHEL now include the updated
gcc-toolset-9-gcc-9.2.1-2.3.el8.

see also https://bugzilla.redhat.com/show_bug.cgi?id=1853900

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: use correct fmt string in logger().debug(...) 38501/head
Kefu Chai [Thu, 10 Dec 2020 07:17:56 +0000 (15:17 +0800)]
crimson/osd: use correct fmt string in logger().debug(...)

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: exclude unit tests from the "all" target
Kefu Chai [Thu, 10 Dec 2020 06:54:10 +0000 (14:54 +0800)]
cmake: exclude unit tests from the "all" target

no need to build unit tests when "make all", unless required explicitly,
like "make tests".

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agosrc/*: do not pass cct to ceph_version_to_str()
Kefu Chai [Thu, 10 Dec 2020 06:17:07 +0000 (14:17 +0800)]
src/*: do not pass cct to ceph_version_to_str()

in e5b1ae5554c4d8a20f9f0ff562b231ad0b0ba0ab, a new option named
"debug_version_for_testing" is introduced to override the version so
we can test version check.

in crimson, we have two families of shared functions.

- one of them is used by alien store. they are compiled with
  -DWITH_SEASTAR and -DWITH_ALIEN, to enable the shim code between
  seastar and POSIX thread.
- another is used by crimson in general. where no lock is allowed.

currently, we use the "crimson" and "ceph" namespace to differentiate
these two families of functions, so they can colocate in the same
executable without violating the ODR. see src/include/common_fwd.h for
more details.

the functions defined in src/common/version.cc are also shared by
alien store and crimson code. and because we have different
implementations of `CephContext` in crimson and in classic OSD (i.e.
alienstore), we have to have different implementations of this function
as well, if we follow the same approach. but since these functions are
very simple and are non-blocking, there is not much value in
differentiating them, it is better to inject the test settings using
environment variable instead of using ceph option subsystem.

in this change, "ceph_debug_version_for_testing" environment variable is
checked instead, so that crimson and alienstore can share the same
compilation unit of version.cc. and "debug_version_for_testing" option
is removed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: reorder linked libraries of crimson-alienstore
Kefu Chai [Wed, 9 Dec 2020 16:13:15 +0000 (00:13 +0800)]
cmake: reorder linked libraries of crimson-alienstore

so the libraries like libkv can access the symbols exposed by
crimson-alien-common.

this change should address the link failures like:

/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/16.0.0-8049-g1ab93e4d/rpm/el8/BUILD/ceph-16.0.0-8049-g1ab93e4d/src/common/PriorityCache.cc:175:
undefined reference to `ceph::common::PerfCountersBuilder::~PerfCountersBuilder()'

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: do not link crimson-alienstore against crimson-os
Kefu Chai [Wed, 9 Dec 2020 11:39:19 +0000 (19:39 +0800)]
cmake: do not link crimson-alienstore against crimson-os

crimson-os contains crimson-alienstore, we should not link the latter
against the former. this change partially reverts
490b6322fbbece053f1d92b29ae101bfb0976007

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: link unittest-seastar-alienstore-thread-pool against crimson-alienstore
Kefu Chai [Wed, 9 Dec 2020 11:30:20 +0000 (19:30 +0800)]
cmake: link unittest-seastar-alienstore-thread-pool against crimson-alienstore

no need to link it against crimson-os in a wholesale, crimson-alienstore
would be enough.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/crimson: do not link against crimson-{os,common}
Kefu Chai [Wed, 9 Dec 2020 09:42:43 +0000 (17:42 +0800)]
test/crimson: do not link against crimson-{os,common}

this change partially reverts 652dbacc7424efbd3c3175de8ba79ed29edd55c8
quite a few test does not use crimson-os at all, so no need to link
against this library.

even worse is that crimson-os contains crimson-seastore *and*
crimson-alienstore. this introduces cyclic references.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agorbd: make "group snap create" support quiesce options 38408/head
Mykola Golub [Wed, 9 Dec 2020 05:07:42 +0000 (05:07 +0000)]
rbd: make "group snap create" support quiesce options

Signed-off-by: Mykola Golub <mgolub@suse.com>
4 years agolibrbd: extend group snap create API to support flags
Mykola Golub [Wed, 2 Dec 2020 17:43:16 +0000 (17:43 +0000)]
librbd: extend group snap create API to support flags

Signed-off-by: Mykola Golub <mgolub@suse.com>
4 years agomgr/dashboard: RGW User Form is validating disabled fields 38519/head
Aashish Sharma [Thu, 10 Dec 2020 06:00:36 +0000 (11:30 +0530)]
mgr/dashboard: RGW User Form is validating disabled fields

When you try to submit a non valid form, angular is checking all the fields of the form, resulting in some wrong validations.

Fixes:https://tracker.ceph.com/issues/47727
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
4 years agotest/librbd: fix memory leak in TestLibRBD.ConcurentOperations 38518/head
Mykola Golub [Thu, 10 Dec 2020 06:00:34 +0000 (06:00 +0000)]
test/librbd: fix memory leak in TestLibRBD.ConcurentOperations

Signed-off-by: Mykola Golub <mgolub@suse.com>
4 years agopybind/mgr/prometheus/module.py: defaultdict for num_by_state 37909/head
Alexander Sushko [Fri, 27 Nov 2020 11:04:13 +0000 (14:04 +0300)]
pybind/mgr/prometheus/module.py: defaultdict for num_by_state

num_by_state[state] += count in get_pg_status method raises KeyError
if pg state is not in PG_STATES list. PG_STATES should be synced with
osd_types.cc:pg_state_string(). But sometimes it is not. After the
KeyError raise mgr metrics are not available at all.

Fixes: https://tracker.ceph.com/issues/46142
Signed-off-by: Alexander Sushko <alexandrsushko@gmail.com>
4 years agocmake: stop rebuilding rocksdb everytime 38516/head
Kefu Chai [Thu, 10 Dec 2020 04:22:48 +0000 (12:22 +0800)]
cmake: stop rebuilding rocksdb everytime

this change was originally introduced as a part of
418bfd7bb5ec1dcec2b011e9df118c33ce38d398, and latter migrated / changed
in the current form. but the idea is the same: to rebuild rocksdb even
if the stamp file shows that it has been built. there is no need to do
so, as we don't hack RocksDB as we used to. also,it is distracting to
check this log message when rebuilding the tree. so drop it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38431 from tchaikov/wip-rtd-doc
Kefu Chai [Thu, 10 Dec 2020 04:03:21 +0000 (12:03 +0800)]
Merge pull request #38431 from tchaikov/wip-rtd-doc

pybind,doc: build stub using cython and build API doc with RTD

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@hotmail.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoscript/run-cbt.sh: drop bashism 38515/head
Kefu Chai [Thu, 10 Dec 2020 03:13:55 +0000 (11:13 +0800)]
script/run-cbt.sh: drop bashism

* "local" is not supported by POSIX shell, so drop it
* assign "$*" to a non-array variable, see
  https://github.com/koalaman/shellcheck/wiki/SC2124
* fail early if "cd" fails, see
  https://github.com/koalaman/shellcheck/wiki/SC2164
* quote "$(...)" with quotes to avoid string split

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38329 from pcuzner/cephadm-exporter-docs
pcuzner [Wed, 9 Dec 2020 22:37:51 +0000 (11:37 +1300)]
Merge pull request #38329 from pcuzner/cephadm-exporter-docs

doc/dev/cephadm: document the cephadm exporter design

4 years agoMerge branch 'master' into cephadm-exporter-docs 38329/head
pcuzner [Wed, 9 Dec 2020 20:39:45 +0000 (09:39 +1300)]
Merge branch 'master' into cephadm-exporter-docs

4 years agodoc/dev/cephadm: update index links
Paul Cuzner [Wed, 9 Dec 2020 20:37:13 +0000 (09:37 +1300)]
doc/dev/cephadm: update index links

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agoMerge pull request #38472 from ronen-fr/wip-ronenf-qa-scrub
Ronen Friedman [Wed, 9 Dec 2020 19:41:14 +0000 (21:41 +0200)]
Merge pull request #38472 from ronen-fr/wip-ronenf-qa-scrub

test: cancelling both noscrub *and* nodeep-scrub

4 years agoMerge PR #38407 into master
Patrick Donnelly [Wed, 9 Dec 2020 19:29:10 +0000 (11:29 -0800)]
Merge PR #38407 into master

* refs/pull/38407/head:
qa: allow arbitrary mount options on kclient mounts

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge PR #38266 into master
Patrick Donnelly [Wed, 9 Dec 2020 19:23:11 +0000 (11:23 -0800)]
Merge PR #38266 into master

* refs/pull/38266/head:
client: add ceph.{cluster_fsid/client_id} vxattrs suppport

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge PR #38367 into master
Patrick Donnelly [Wed, 9 Dec 2020 19:21:28 +0000 (11:21 -0800)]
Merge PR #38367 into master

* refs/pull/38367/head:
pybind/cephfs: fix missing terminating NULL char in readlink()'s C string

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36127 into master
Patrick Donnelly [Wed, 9 Dec 2020 19:20:08 +0000 (11:20 -0800)]
Merge PR #36127 into master

* refs/pull/36127/head:
client: more reasonable statfs ffree

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
4 years agotest: cancelling both noscrub *and* nodeep-scrub 38472/head
Ronen Friedman [Mon, 7 Dec 2020 12:41:45 +0000 (14:41 +0200)]
test: cancelling both noscrub *and* nodeep-scrub

as part of osd-scrub-test.sh.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
4 years agoMerge pull request #37971 from lixiaoy1/rwl_plugin
Jason Dillaman [Wed, 9 Dec 2020 17:06:46 +0000 (12:06 -0500)]
Merge pull request #37971 from lixiaoy1/rwl_plugin

librbd/cache: make image persistent writeback cache as plugin

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoqa/tasks/cephfs/nfs: Check if host ip is in cluster info output 38511/head
Varsha Rao [Wed, 9 Dec 2020 16:52:50 +0000 (16:52 +0000)]
qa/tasks/cephfs/nfs: Check if host ip is in cluster info output

Along with host IP, sometimes Docker container IP's shows up in 'hostname -I'
output. Since this output is variable. Just check if host IP is present in the
cluster info output.

Fixes: https://tracker.ceph.com/issues/48491
Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #38484 from rhcs-dashboard/update-ssl-error-1
Ernesto Puerta [Wed, 9 Dec 2020 16:25:10 +0000 (17:25 +0100)]
Merge pull request #38484 from rhcs-dashboard/update-ssl-error-1

mgr/dashboard: Updating the inbuilt ssl providers error

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38459 from ronen-fr/wip-ronenf-lua-include
Yuval Lifshitz [Wed, 9 Dec 2020 13:36:32 +0000 (15:36 +0200)]
Merge pull request #38459 from ronen-fr/wip-ronenf-lua-include

rgw/lua: fixing incompatible declarations of CephContext

4 years agomgr/dashboard: Replace Replica size and Erasure code profile with a single column 38125/head
Alfonso Martínez [Wed, 2 Dec 2020 12:53:34 +0000 (13:53 +0100)]
mgr/dashboard: Replace Replica size and Erasure code profile with a single column

Replaces Type, Replica Size & Erasure Coded Profile columns
with 'Data Protection' column. Hidden Crush Rule set column in case if any
admin finds it useful to show it can still be done by removing isHidden: true line.

Fixes: https://tracker.ceph.com/issues/47901
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
4 years agoMerge pull request #37519 from pcuzner/docs-cephadm-config-drift
Sebastian Wagner [Wed, 9 Dec 2020 12:32:27 +0000 (13:32 +0100)]
Merge pull request #37519 from pcuzner/docs-cephadm-config-drift

doc/dev/cephadm: high level design for a compliance check feature

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoceph-conf: fix client's admin socket parsing 37785/head
Xiubo Li [Wed, 25 Nov 2020 05:54:04 +0000 (13:54 +0800)]
ceph-conf: fix client's admin socket parsing

For the 'admin socket' in ceph.conf, if the "$pid" is specified, it
will be expanded with the current process's PID.

For the ceph-conf command, if we specify the "--name" with a value
that have contained a socket daemon's PID, likes:

$ ceph-conf --name client.admin.133423 --show-config-value admin_socket

It will return a sockpath like:

/tmp/user/1000/ceph-asok.EZQumU/client.admin.133423.324523.asok

But the following is expected:

/tmp/user/1000/ceph-asok.EZQumU/client.admin.133423.asok

Stick "$name.$id" for mon/osd/mds/mgr daemons and for other try to
tripe the "$pid" from the name option's value and set a "PID" env.

Fixes: https://tracker.ceph.com/issues/47977
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38498 from bk201/wip-48506
Kefu Chai [Wed, 9 Dec 2020 10:17:20 +0000 (18:17 +0800)]
Merge pull request #38498 from bk201/wip-48506

mgr/dashboard: remove pyOpenSSL version pinning

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38415 from insujang/master
Kefu Chai [Wed, 9 Dec 2020 08:56:08 +0000 (16:56 +0800)]
Merge pull request #38415 from insujang/master

msg/async: refine worker creation in NetworkStack

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38457 from tchaikov/wip-mon-scrub-interval
Kefu Chai [Wed, 9 Dec 2020 08:45:00 +0000 (16:45 +0800)]
Merge pull request #38457 from tchaikov/wip-mon-scrub-interval

mon: use TYPE_SEC for mon_scrub_interval

Reviewed-by: Joao Eduardo Luis <joao@suse.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agomgr/cephadm: make type annotations for module.py mandatory 38212/head
Sebastian Wagner [Fri, 20 Nov 2020 12:04:50 +0000 (13:04 +0100)]
mgr/cephadm: make type annotations for module.py mandatory

Fixing bogus json representation for registry-login

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agosrc,qa: Upgrade to mypy 0.790 38490/head
Sebastian Wagner [Tue, 8 Dec 2020 14:36:11 +0000 (15:36 +0100)]
src,qa: Upgrade to mypy 0.790

dashboard/tools: Make sure {begin,end}_time are set.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/dashboard: remove pyOpenSSL version pinning 38498/head
Kiefer Chang [Wed, 9 Dec 2020 07:55:24 +0000 (15:55 +0800)]
mgr/dashboard: remove pyOpenSSL version pinning

Tests require a newer version of pyOpenSSL.

Fixes: https://tracker.ceph.com/issues/48506
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agoMerge pull request #38497 from tchaikov/wip-seastar
Kefu Chai [Wed, 9 Dec 2020 05:40:38 +0000 (13:40 +0800)]
Merge pull request #38497 from tchaikov/wip-seastar

seastar: update seastar submodule

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #38491 from agayev/fix-hmsmr-compilation
Kefu Chai [Wed, 9 Dec 2020 03:47:55 +0000 (11:47 +0800)]
Merge pull request #38491 from agayev/fix-hmsmr-compilation

os/bluestore: Fix HMSMRDevice.cc compilation.

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoseastar: update seastar submodule 38497/head
Kefu Chai [Wed, 9 Dec 2020 03:33:56 +0000 (11:33 +0800)]
seastar: update seastar submodule

to pick up recent fixes in file io

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38437 from ifed01/wip-ifed-alloc-replay-dump
Kefu Chai [Wed, 9 Dec 2020 03:00:20 +0000 (11:00 +0800)]
Merge pull request #38437 from ifed01/wip-ifed-alloc-replay-dump

os/bluestore: add more means to troubleshoot allocator(s)

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #38454 from tchaikov/wip-compressor-cleanup
Kefu Chai [Wed, 9 Dec 2020 02:58:23 +0000 (10:58 +0800)]
Merge pull request #38454 from tchaikov/wip-compressor-cleanup

compressor: put Compressor into TOPNSPC namespace and use string_view

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #38458 from tchaikov/wip-librados-cct
Kefu Chai [Wed, 9 Dec 2020 02:57:00 +0000 (10:57 +0800)]
Merge pull request #38458 from tchaikov/wip-librados-cct

librados: move definition of cct_deleter to .cc

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agodoc: fix a couple of typos 38486/head
Liu Lan [Tue, 8 Dec 2020 11:44:53 +0000 (19:44 +0800)]
doc: fix a couple of typos

Signed-off-by: Liu Lan <liulan_yewu@cmss.chinamobile.com>
4 years agoMerge pull request #38418 from anthonyeleven/anthonyeleven/clarify-op-priorities
Neha Ojha [Tue, 8 Dec 2020 21:14:58 +0000 (13:14 -0800)]
Merge pull request #38418 from anthonyeleven/anthonyeleven/clarify-op-priorities

doc: clarify osd recovery op priority and fix a couple of typos

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoos/bluestore: Fix HMSMRDevice.cc compilation. 38491/head
Abutalib Aghayev [Tue, 8 Dec 2020 15:38:59 +0000 (10:38 -0500)]
os/bluestore: Fix HMSMRDevice.cc compilation.

Signed-off-by: Abutalib Aghayev <agayev@psu.edu>
4 years agoMerge PR #38419 into master
Patrick Donnelly [Tue, 8 Dec 2020 15:35:23 +0000 (07:35 -0800)]
Merge PR #38419 into master

* refs/pull/38419/head:
vstart_runner: print result line unless opt_rotate_log is set

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agolibrbd/io: flush IO before shutting down image IO dispatchers 38492/head
Jason Dillaman [Tue, 8 Dec 2020 14:58:07 +0000 (09:58 -0500)]
librbd/io: flush IO before shutting down image IO dispatchers

Otherwise, if the dispatchers are shut down, there is a potential
race where the flush can be assigned to a stuck IO and never
completed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: additional debug logging in support of live-migration
Jason Dillaman [Tue, 8 Dec 2020 14:57:06 +0000 (09:57 -0500)]
librbd: additional debug logging in support of live-migration

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agotest/librados_test_stub: additional debug logging
Jason Dillaman [Tue, 8 Dec 2020 14:59:53 +0000 (09:59 -0500)]
test/librados_test_stub: additional debug logging

Allow actual IOs to be seen in the debug logs next to the client
debug logs issuing the IOs.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agomgr/dashboard: Adding the alert bad certificate error to the ssl providers error 38484/head
Nizamudeen A [Tue, 8 Dec 2020 14:35:28 +0000 (20:05 +0530)]
mgr/dashboard: Adding the alert bad certificate error to the ssl providers error

upstream tracked in https://github.com/cherrypy/cheroot/pull/348
Fixes: https://tracker.ceph.com/issues/48490
Signed-off-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/dashboard: Updating the inbuilt ssl providers error
Nizamudeen A [Tue, 8 Dec 2020 10:22:46 +0000 (15:52 +0530)]
mgr/dashboard: Updating the inbuilt ssl providers error

Fixes: https://tracker.ceph.com/issues/48490
Signed-off-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #37956 from dorindabassey/example-notific
Casey Bodley [Tue, 8 Dec 2020 13:51:04 +0000 (08:51 -0500)]
Merge pull request #37956 from dorindabassey/example-notific

examples/boto3/README: examples notification

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
4 years agoMerge pull request #38374 from rzarzynski/wip-crimson-backfill-remove
Kefu Chai [Tue, 8 Dec 2020 13:44:58 +0000 (21:44 +0800)]
Merge pull request #38374 from rzarzynski/wip-crimson-backfill-remove

crimson: add support for backfill, part 2 -- MOSDPGBackfillRemove

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38392 from rzarzynski/wip-crimson-backfill-virtual_pgfacade
Kefu Chai [Tue, 8 Dec 2020 13:43:46 +0000 (21:43 +0800)]
Merge pull request #38392 from rzarzynski/wip-crimson-backfill-virtual_pgfacade

crimson: use explicit, abstract interfaces for backfill's facades.

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38208 from sebastian-philipp/mgr-cephadm-type-annotations-mandatory
Sebastian Wagner [Tue, 8 Dec 2020 13:40:03 +0000 (14:40 +0100)]
Merge pull request #38208 from sebastian-philipp/mgr-cephadm-type-annotations-mandatory

mgr/cephadm: make type annotations mandatory for some modules

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agocrimson: use explicit, abstract interfaces for backfill's facades. 38392/head
Radoslaw Zarzynski [Wed, 2 Dec 2020 09:26:29 +0000 (10:26 +0100)]
crimson: use explicit, abstract interfaces for backfill's facades.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #37130 from pcuzner/cephadm-exporter
Sebastian Wagner [Tue, 8 Dec 2020 12:43:21 +0000 (13:43 +0100)]
Merge pull request #37130 from pcuzner/cephadm-exporter

cephadm:Add a daemon mode for cephadm to provide a metadata endpoint

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #38483 from tchaikov/wip-crimson-cleanup
Kefu Chai [Tue, 8 Dec 2020 11:32:36 +0000 (19:32 +0800)]
Merge pull request #38483 from tchaikov/wip-crimson-cleanup

crimson: cleanups

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>