]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agorun-make-check.sh: let ctest generate XML output 40400/head
Kefu Chai [Thu, 25 Mar 2021 09:08:48 +0000 (17:08 +0800)]
run-make-check.sh: let ctest generate XML output

to enable XUnit plugin of jenkins to consume the ctest output and
publish it in the dashboard, we need to

* let ctest generate XML output instead of plain text output
* do not fail the test if any test case fails. this allows the publisher
  to do its job by checking the XML output.
* prevent ctest from compressing the output. see
  https://issues.jenkins.io/browse/JENKINS-21737

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40377 from tchaikov/wip-doc-fixes
Kefu Chai [Thu, 25 Mar 2021 02:39:14 +0000 (10:39 +0800)]
Merge pull request #40377 from tchaikov/wip-doc-fixes

doc/man: fix formatting

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #38044 from dvanders/dvanders_buffered
Neha Ojha [Thu, 25 Mar 2021 00:45:17 +0000 (17:45 -0700)]
Merge pull request #38044 from dvanders/dvanders_buffered

common/options: bluefs_buffered_io=true by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40380 from adamemerson/wip-num-rados-handles-die-die-die
Ali Maredia [Wed, 24 Mar 2021 22:39:35 +0000 (18:39 -0400)]
Merge pull request #40380 from adamemerson/wip-num-rados-handles-die-die-die

Die, `num_rados_handles`, die.

Reviewed-by: Ali Maredia <amaredia@redhat.com>
4 years agorgw: Remove spurious `num_rados_handles` option 40380/head
Adam C. Emerson [Wed, 24 Mar 2021 19:47:42 +0000 (15:47 -0400)]
rgw: Remove spurious `num_rados_handles` option

While any code that used the option is gone, it appears the option
itself was accidentally resurrected in various options.cc refactors
and transitions.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agodoc/install/windows-troubleshooting: fix typo 40377/head
Kefu Chai [Wed, 24 Mar 2021 15:10:44 +0000 (23:10 +0800)]
doc/install/windows-troubleshooting: fix typo

and tweak the format a little bit

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/man/8/ceph-volume: fix formatting
Kefu Chai [Wed, 24 Mar 2021 17:01:26 +0000 (01:01 +0800)]
doc/man/8/ceph-volume: fix formatting

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoadmin/build-doc: build man page in proper directory
Kefu Chai [Wed, 24 Mar 2021 17:00:23 +0000 (01:00 +0800)]
admin/build-doc: build man page in proper directory

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #40350 into master
Sage Weil [Wed, 24 Mar 2021 15:39:53 +0000 (11:39 -0400)]
Merge PR #40350 into master

* refs/pull/40350/head:
doc/cephadm: explicitly show host requirments in adding host section

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40235 from tchaikov/wip-cmake-test-fixture
Kefu Chai [Wed, 24 Mar 2021 15:20:26 +0000 (23:20 +0800)]
Merge pull request #40235 from tchaikov/wip-cmake-test-fixture

cmake: use fixture for preparing venv

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agocmake: use fixture for preparing venv 40235/head
Kefu Chai [Fri, 19 Mar 2021 09:26:37 +0000 (17:26 +0800)]
cmake: use fixture for preparing venv

this change should allow us to decouple "ninja tests" from "ctest".
in other words, we can just run

ctest -R run-tox-python-common -V

without running "ninja tests" first. before this change

${name}-venv is added as a dependency of "tests" target.

after this change,

setup-venv-for-${name} is added as a test, which is in turn a test of
run-tox-${name}, so we can just

ctest -R run-tox-${name}

now for preparing the venv and then testing the tox test of ${name}.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40344 from zdover23/wip-doc-cephadm-index-rewrite-2021-Mar-23
zdover23 [Wed, 24 Mar 2021 14:09:01 +0000 (00:09 +1000)]
Merge pull request #40344 from zdover23/wip-doc-cephadm-index-rewrite-2021-Mar-23

doc/cephadm: rewrite "index.rst"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #40353 into master
Patrick Donnelly [Wed, 24 Mar 2021 14:07:31 +0000 (07:07 -0700)]
Merge PR #40353 into master

* refs/pull/40353/head:
cephsqlite: add julian day offset in milliseconds

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40291 from tchaikov/wip-debian-cleanups
Kefu Chai [Wed, 24 Mar 2021 13:31:34 +0000 (21:31 +0800)]
Merge pull request #40291 from tchaikov/wip-debian-cleanups

debian: cleanups and exclude ceph_crypto from dh_shlibdep

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
4 years agoMerge pull request #39683 from maydaycc/wip-49487
Kefu Chai [Wed, 24 Mar 2021 12:21:11 +0000 (20:21 +0800)]
Merge pull request #39683 from maydaycc/wip-49487

osd: fix scrub reschedule bug

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
4 years agodebian/rules: add with_system_libs option 40291/head
Kefu Chai [Sun, 21 Mar 2021 15:04:49 +0000 (23:04 +0800)]
debian/rules: add with_system_libs option

so the maintainer can choose to use the packages shipped by distro.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodebian/control: remove cython from Build-Depends
Kefu Chai [Sun, 21 Mar 2021 14:55:37 +0000 (22:55 +0800)]
debian/control: remove cython from Build-Depends

as cython3 is enough. and we've dropped the python2 support.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodebian/rules: exclude ceph_crypto from dh_shlibdep
Kefu Chai [Sun, 21 Mar 2021 14:59:03 +0000 (22:59 +0800)]
debian/rules: exclude ceph_crypto from dh_shlibdep

as libceph_crypto* are plugins, and they are not self-contained. they
reference symbols offered by the executable loading them. dh_shlibdep
should not complain when checking them, so add them to the exclude list.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40346 from zdover23/wip-doc-cephadm-osd-service-2021-Mar-23-first
zdover23 [Wed, 24 Mar 2021 10:19:44 +0000 (20:19 +1000)]
Merge pull request #40346 from zdover23/wip-doc-cephadm-osd-service-2021-Mar-23-first

doc/cephadm: rewrite osd.rst - list devices

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agodoc/cephadm: rewrite "index.rst" 40344/head
Zac Dover [Tue, 23 Mar 2021 15:19:11 +0000 (01:19 +1000)]
doc/cephadm: rewrite "index.rst"

This PR rewrites the three paragraphs at the
front of the cephadm guide, increasing their
elegance and removing ambiguities.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #40357 from ybwang0211/quota_doc
Kefu Chai [Wed, 24 Mar 2021 09:33:28 +0000 (17:33 +0800)]
Merge pull request #40357 from ybwang0211/quota_doc

doc: remove duplicated 'quota' parameter in URL

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agodoc: remove duplicated 'quota' parameter in URL 40357/head
wangyingbin [Wed, 24 Mar 2021 06:05:18 +0000 (14:05 +0800)]
doc: remove duplicated 'quota' parameter in URL

Only one "quota" parameter is needed in the URL to indicate that it is a quota request.

Signed-off-by: wangyingbin <ybwang0211@163.com>
4 years agoMerge PR #40314 into master
Sage Weil [Wed, 24 Mar 2021 02:58:14 +0000 (22:58 -0400)]
Merge PR #40314 into master

* refs/pull/40314/head:
qa/tasks/cephadm: use 'orch apply mon' to deploy mons

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge PR #40324 into master
Sage Weil [Wed, 24 Mar 2021 02:58:05 +0000 (22:58 -0400)]
Merge PR #40324 into master

* refs/pull/40324/head:
mgr/cephadm/upgrade: do not crash if error races with user cancellation

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge PR #40305 into master
Patrick Donnelly [Wed, 24 Mar 2021 01:45:48 +0000 (18:45 -0700)]
Merge PR #40305 into master

* refs/pull/40305/head:
doc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agocephsqlite: add julian day offset in milliseconds 40353/head
Patrick Donnelly [Wed, 24 Mar 2021 00:34:45 +0000 (17:34 -0700)]
cephsqlite: add julian day offset in milliseconds

This magic number was copied from another VFS but was not adjusted for
the xCurrentTimeInt64 interface.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40320 into master
Sage Weil [Wed, 24 Mar 2021 00:15:24 +0000 (20:15 -0400)]
Merge PR #40320 into master

* refs/pull/40320/head:
mgr/orchestrator: move PORTS column in 'orch ps' output

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge PR #40322 into master
Sage Weil [Wed, 24 Mar 2021 00:15:11 +0000 (20:15 -0400)]
Merge PR #40322 into master

* refs/pull/40322/head:
cephadm: only bootstrap using image that matches cephadm version

Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #40216 from rhcs-dashboard/fix-role-cloning
Ernesto Puerta [Tue, 23 Mar 2021 19:10:18 +0000 (20:10 +0100)]
Merge pull request #40216 from rhcs-dashboard/fix-role-cloning

mgr/dashboard: Fix for broken User management role cloning

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #36402 from rhcs-dashboard/wip-45965-users-quota-usage
Ernesto Puerta [Tue, 23 Mar 2021 19:07:45 +0000 (20:07 +0100)]
Merge pull request #36402 from rhcs-dashboard/wip-45965-users-quota-usage

mgr/dashboard: Display users current quota usage

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agodoc/cephadm: explicitly show host requirments in adding host section 40350/head
Daniel Pivonka [Tue, 23 Mar 2021 17:50:33 +0000 (13:50 -0400)]
doc/cephadm: explicitly show host requirments in adding host section

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
4 years agodoc/cephadm: rewrite osd.rst - list devices 40346/head
Zac Dover [Tue, 23 Mar 2021 16:23:46 +0000 (02:23 +1000)]
doc/cephadm: rewrite osd.rst - list devices

This PR rewrites the "List Devices" section of
the OSD chapter of the Cephadm guide. This PR
is a simple grammar-and-elegance improvement.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #40208 from CongMinYin/fix-flush-block-bug
Jason Dillaman [Tue, 23 Mar 2021 13:54:35 +0000 (09:54 -0400)]
Merge pull request #40208 from CongMinYin/fix-flush-block-bug

librbd/cache/pwl: fix bug of flush request blocked by defered IO

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #40005 from rhcs-dashboard/49655-handle-no-rgw-daemons-running
Ernesto Puerta [Tue, 23 Mar 2021 11:51:47 +0000 (12:51 +0100)]
Merge pull request #40005 from rhcs-dashboard/49655-handle-no-rgw-daemons-running

mgr/dashboard: fix error shown when no rgw daemons are running.

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/dashboard: fix error notification shown when no rgw daemons are running. 40005/head
Alfonso Martínez [Tue, 23 Mar 2021 10:14:11 +0000 (11:14 +0100)]
mgr/dashboard: fix error notification shown when no rgw daemons are running.

- Adapted code to changes introduced in: https://github.com/ceph/ceph/pull/40220
- Improved error handling.
- Increased test coverage.
- Some refactoring.
- Simplified documentation about setting default daemon host and port.

Fixes: https://tracker.ceph.com/issues/49655
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
4 years agoMerge pull request #40300 from tchaikov/test-promtool
Kefu Chai [Tue, 23 Mar 2021 09:30:58 +0000 (17:30 +0800)]
Merge pull request #40300 from tchaikov/test-promtool

ceph.spec,install-deps: use golang-github-prometheus for promtools

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge pull request #40318 from batrick/libcephsqite-label
Kefu Chai [Tue, 23 Mar 2021 04:03:01 +0000 (12:03 +0800)]
Merge pull request #40318 from batrick/libcephsqite-label

.github/labeler: add libcephsqlite label

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #40192 into master
Patrick Donnelly [Tue, 23 Mar 2021 03:06:21 +0000 (20:06 -0700)]
Merge PR #40192 into master

* refs/pull/40192/head:
test: reduce number of threads to 32 in LibCephFS.ShutdownRace

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40174 into master
Patrick Donnelly [Tue, 23 Mar 2021 03:05:29 +0000 (20:05 -0700)]
Merge PR #40174 into master

* refs/pull/40174/head:
qa/vstart_runner: fix the admin_socket args parsing

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge PR #40158 into master
Patrick Donnelly [Tue, 23 Mar 2021 03:04:35 +0000 (20:04 -0700)]
Merge PR #40158 into master

* refs/pull/40158/head:
test: add test for removing non-existent xattr
mds: fix removexattr logic when there aren't any

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge PR #40146 into master
Patrick Donnelly [Tue, 23 Mar 2021 03:03:41 +0000 (20:03 -0700)]
Merge PR #40146 into master

* refs/pull/40146/head:
test: pass peer uuid when adding cephfs mirror peers
mon: check cephfs mirror peer based on remote cluster spec and file system name

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40145 into master
Patrick Donnelly [Tue, 23 Mar 2021 03:03:02 +0000 (20:03 -0700)]
Merge PR #40145 into master

* refs/pull/40145/head:
doc: add note about disabling standby-replay during upgrades
qa: add test for standby-replay disable
mon: fail standby-replay daemons when flag is turned off

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
4 years agoMerge PR #38443 into master
Patrick Donnelly [Tue, 23 Mar 2021 03:00:46 +0000 (20:00 -0700)]
Merge PR #38443 into master

* refs/pull/38443/head:
qa: set "shell" to False for run_ceph_w()
vstart_runner: make "shell" a default argument

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge pull request #39777 from xxhdx1985126/wip-alienstore-thread-pin
Kefu Chai [Tue, 23 Mar 2021 02:04:03 +0000 (10:04 +0800)]
Merge pull request #39777 from xxhdx1985126/wip-alienstore-thread-pin

crimson/os/alienstore: scatter alienstore threads onto specified cpu cores

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #39435 into master
Sage Weil [Tue, 23 Mar 2021 01:57:45 +0000 (21:57 -0400)]
Merge PR #39435 into master

* refs/pull/39435/head:
mgr/cephadm: redeploy daemons deployed using old image during upgrade
mgr/cephadm: add container digests of mgr that deployed daemon to unit.meta

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge pull request #40125 from ceph/wip-14218-notes
Josh Durgin [Tue, 23 Mar 2021 01:35:39 +0000 (18:35 -0700)]
Merge pull request #40125 from ceph/wip-14218-notes

doc: 14.2.18 Release Notes

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomgr/cephadm/upgrade: do not crash if error races with user cancellation 40324/head
Sage Weil [Mon, 22 Mar 2021 22:40:25 +0000 (18:40 -0400)]
mgr/cephadm/upgrade: do not crash if error races with user cancellation

If the user cancels the upgrade just before the upgrade thread runs into
a problem (and these things may be correlated!), ignore the failure
instead of crashing the module.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: only bootstrap using image that matches cephadm version 40322/head
Sage Weil [Mon, 22 Mar 2021 22:05:16 +0000 (18:05 -0400)]
cephadm: only bootstrap using image that matches cephadm version

Only allow bootstrap to deploy if the cephadm version matches the
ceph version in the container.  Allow the master branch version of cephadm
to deploy the latest stable version as well (at least for now).

Provide a flag to force bootstrap to continue despite the check.

Move the _pull_image call up into bootstrap so that it is easier to see
when it happens.

Fixes: https://tracker.ceph.com/issues/49884
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/cephadm: use 'orch apply mon' to deploy mons 40314/head
Sage Weil [Mon, 22 Mar 2021 13:58:39 +0000 (08:58 -0500)]
qa/tasks/cephadm: use 'orch apply mon' to deploy mons

The 'orch daemon add ...' command is not idempotent and can cause
duplicate (and failing) attempts to add the same mon.

Maintain the ability to add mons the old way for the benefit of testing
upgrades from early octopus versions of cephadm.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #40203 into master
Sage Weil [Mon, 22 Mar 2021 20:54:19 +0000 (16:54 -0400)]
Merge PR #40203 into master

* refs/pull/40203/head:
mgr/cephadm: retry after JSONDecodeError in wait_for_mgr_restart()

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agomgr/orchestrator: move PORTS column in 'orch ps' output 40320/head
Sage Weil [Mon, 22 Mar 2021 19:22:21 +0000 (15:22 -0400)]
mgr/orchestrator: move PORTS column in 'orch ps' output

Put it next to HOST.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #40290 into master
Sage Weil [Mon, 22 Mar 2021 17:26:06 +0000 (13:26 -0400)]
Merge PR #40290 into master

* refs/pull/40290/head:
qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #40288 into master
Sage Weil [Mon, 22 Mar 2021 17:25:29 +0000 (13:25 -0400)]
Merge PR #40288 into master

* refs/pull/40288/head:
mon/PGMap: change hard coded 0x10000 to macro CEPH_OSD_IN

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years ago.github/labeler: add libcephsqlite label 40318/head
Patrick Donnelly [Mon, 22 Mar 2021 17:20:24 +0000 (10:20 -0700)]
.github/labeler: add libcephsqlite label

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #39191 into master
Patrick Donnelly [Mon, 22 Mar 2021 17:06:08 +0000 (10:06 -0700)]
Merge PR #39191 into master

* refs/pull/39191/head:
pybind/mgr/snap_schedule: use ceph VFS
pybind/mgr/snap_schedule: idempotentize table creation
mgr: add ceph sqlite VFS
doc: add libcephsqlite
ceph.spec,debian: package libcephsqlite
test/libcephsqlite,qa: add tests for libcephsqlite
libcephsqlite: rework architecture and backend
SimpleRADOSStriper: wait for finished aios after write
SimpleRADOSStriper: add new minimal async striper
mon: define simple-rados-client-with-blocklist profile
librados: define must renew lock flag
common: add timeval conversion for durations
Revert "libradosstriper: add function to read into char*"
test_libcephsqlite: test random inserts
cephsqlite: fix compiler errors
cmake: improve build inst for cephsqlite
libcephsqlite: sqlite interface to RADOS
libradosstriper: add function to read into char*

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40201 from ceph/wip-tracker-48697
Guillaume Abrioux [Mon, 22 Mar 2021 16:09:44 +0000 (17:09 +0100)]
Merge pull request #40201 from ceph/wip-tracker-48697

ceph-volume: show devices with GPT headers as not available

4 years agoMerge pull request #40295 from tchaikov/wip-doc-links
zdover23 [Mon, 22 Mar 2021 15:43:15 +0000 (01:43 +1000)]
Merge pull request #40295 from tchaikov/wip-doc-links

doc: fix broken links

Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge PR #40245 into master
Sage Weil [Mon, 22 Mar 2021 15:11:56 +0000 (11:11 -0400)]
Merge PR #40245 into master

* refs/pull/40245/head:
mgr/cephadm: identify iscsi service by the pool

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge pull request #40293 from tchaikov/wip-cmake-cleanup
Kefu Chai [Mon, 22 Mar 2021 14:26:43 +0000 (22:26 +0800)]
Merge pull request #40293 from tchaikov/wip-cmake-cleanup

cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT globaly

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge PR #40301 into master
Sage Weil [Mon, 22 Mar 2021 14:08:05 +0000 (10:08 -0400)]
Merge PR #40301 into master

* refs/pull/40301/head:
qa/distros/podman: install containernetworking-plugins along with podman

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agodoc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port 40305/head
Varsha Rao [Mon, 22 Mar 2021 11:51:53 +0000 (17:21 +0530)]
doc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port

Fixes: https://tracker.ceph.com/issues/49921
Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #40282 from rzarzynski/wip-crimson-doc-waitstates
Kefu Chai [Mon, 22 Mar 2021 10:40:16 +0000 (18:40 +0800)]
Merge pull request #40282 from rzarzynski/wip-crimson-doc-waitstates

doc/crimson: document wait states

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/crimson: document wait states. 40282/head
Radoslaw Zarzynski [Sat, 20 Mar 2021 16:01:01 +0000 (16:01 +0000)]
doc/crimson: document wait states.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #40198 from jdurgin/wip-quick-fix-on-mount
Kefu Chai [Mon, 22 Mar 2021 07:23:48 +0000 (15:23 +0800)]
Merge pull request #40198 from jdurgin/wip-quick-fix-on-mount

common/options: turn off bluestore_fsck_quick_fix_on_mount by default

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40239 from tchaikov/wip-osd-silence-warning
Kefu Chai [Mon, 22 Mar 2021 07:22:16 +0000 (15:22 +0800)]
Merge pull request #40239 from tchaikov/wip-osd-silence-warning

osd/PeeringState: remove unused variable

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40143 from neha-ojha/wip-objectstore-debug
Kefu Chai [Mon, 22 Mar 2021 07:21:20 +0000 (15:21 +0800)]
Merge pull request #40143 from neha-ojha/wip-objectstore-debug

qa/suites/rados/objectstore/backends: use default level for filestore

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40243 from liewegas/fix-pg-health-messages
Kefu Chai [Mon, 22 Mar 2021 07:20:21 +0000 (15:20 +0800)]
Merge pull request #40243 from liewegas/fix-pg-health-messages

mon/PGMap: nicely format pg acting in health messages

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40238 from ygtzf/wip-blob-info
Kefu Chai [Mon, 22 Mar 2021 07:19:12 +0000 (15:19 +0800)]
Merge pull request #40238 from ygtzf/wip-blob-info

src/os: Remove redundant hexadecimal symbols from the log output

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40112 from lxbsz/lockdep2
Kefu Chai [Mon, 22 Mar 2021 07:15:42 +0000 (15:15 +0800)]
Merge pull request #40112 from lxbsz/lockdep2

BackTrace: reduce the array max number to 32

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39412 from tchaikov/wip-rocksdb
Kefu Chai [Mon, 22 Mar 2021 07:12:14 +0000 (15:12 +0800)]
Merge pull request #39412 from tchaikov/wip-rocksdb

bluestore: use string_view and bump rocksdb to v6.15.5

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #40033 from tchaikov/wip-47380
Kefu Chai [Mon, 22 Mar 2021 07:11:23 +0000 (15:11 +0800)]
Merge pull request #40033 from tchaikov/wip-47380

mon/OSDMonitor: drop stale failure_info after a grace period

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoqa/distros/podman: install containernetworking-plugins along with podman 40301/head
Kefu Chai [Mon, 22 Mar 2021 06:49:13 +0000 (14:49 +0800)]
qa/distros/podman: install containernetworking-plugins along with podman

/etc/cni/net.d/87-podman-bridge.conflist tries to load "bridge",
"firewall", "tuning" and "portmap" plugins, which are provided by
containernetworking-plugins package.

Fixes: https://tracker.ceph.com/issues/49909
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoceph.spec,install-deps: use golang-github-prometheus for promtools 40300/head
Kefu Chai [Mon, 22 Mar 2021 06:07:54 +0000 (14:07 +0800)]
ceph.spec,install-deps: use golang-github-prometheus for promtools

instead of installing docker for using promtools, install
golang-github-prometheus.

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/dashboard: Fix for broken User management role cloning 40216/head
Nizamudeen A [Thu, 18 Mar 2021 12:58:33 +0000 (18:28 +0530)]
mgr/dashboard: Fix for broken User management role cloning

Cloning a role in user management gets hit with a 415 error.

Fixes: https://tracker.ceph.com/issues/49880
Signed-off-by: Nizamudeen A <nia@redhat.com>
4 years agodoc/cephfs: fix broken links 40295/head
Kefu Chai [Sun, 21 Mar 2021 17:02:07 +0000 (01:02 +0800)]
doc/cephfs: fix broken links

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc: use :ref: instead relative path for links
Kefu Chai [Sun, 21 Mar 2021 17:01:07 +0000 (01:01 +0800)]
doc: use :ref: instead relative path for links

path is fragile when we move the file around, but link is more stable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/man: replace http://ceph.com/docs with https://docs.ceph.com
Kefu Chai [Sun, 21 Mar 2021 16:17:21 +0000 (00:17 +0800)]
doc/man: replace http://ceph.com/docs with https://docs.ceph.com

the former brings us to a 404 page

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoqa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh 40290/head
Sage Weil [Sun, 21 Mar 2021 14:07:49 +0000 (09:07 -0500)]
qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh

rgw changed the way it registered in the service map.  Wait a bit for
the old entries to be flushed out.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: retry after JSONDecodeError in wait_for_mgr_restart() 40203/head
John Fulton [Wed, 17 Mar 2021 22:03:46 +0000 (18:03 -0400)]
mgr/cephadm: retry after JSONDecodeError in wait_for_mgr_restart()

'ceph mgr dump' does not always return valid JSON so cephadm
will throw an exception sometimes when applying a spec as per
the issue this PR closes. Add a try/except to catch a possible
JSONDecodeError and retry after sleeping.

Fixes: https://tracker.ceph.com/issues/49870
Signed-off-by: John Fulton <fulton@redhat.com>
4 years agocmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT globaly 40293/head
Kefu Chai [Sun, 21 Mar 2021 15:06:00 +0000 (23:06 +0800)]
cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT globaly

turns out we also need it for compiling librados tests with libboost
1.75, so just define it globally

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: use list(APPEND..) when appropriate
Kefu Chai [Sun, 21 Mar 2021 15:06:43 +0000 (23:06 +0800)]
cmake: use list(APPEND..) when appropriate

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40102 from tchaikov/wip-doc-fixes
Kefu Chai [Sun, 21 Mar 2021 14:04:02 +0000 (22:04 +0800)]
Merge pull request #40102 from tchaikov/wip-doc-fixes

doc: theme, cmake and formatting related fixes

Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agocrimson/os/alienstore: add default behaviour for alien threads affinities 39777/head
Xuehan Xu [Thu, 18 Mar 2021 03:15:51 +0000 (11:15 +0800)]
crimson/os/alienstore: add default behaviour for alien threads affinities

currently, we allow alienstore to be scheduled on to any cpu cores other than
the starting three, as in most current tests we use the those cores for crimson-osd
seastar threads

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agomon/PGMap: change hard coded 0x10000 to macro CEPH_OSD_IN 40288/head
haoyixing [Sun, 21 Mar 2021 07:39:29 +0000 (07:39 +0000)]
mon/PGMap: change hard coded 0x10000 to macro CEPH_OSD_IN

0x10000 is same with CEPH_OSD_IN for osd weight, so change them to
that macro, more meaningful.

Signed-off-by: haoyixing <haoyixing@kuaishou.com>
4 years agoMerge pull request #40272 from tchaikov/wip-install-dep-remove-existing-boost
Kefu Chai [Sun, 21 Mar 2021 05:43:24 +0000 (13:43 +0800)]
Merge pull request #40272 from tchaikov/wip-install-dep-remove-existing-boost

install-deps.sh: remove existing ceph-libboost of different version

Reviewed-by: David Galloway <dgallowa@redhat.com>
4 years agoMerge PR #40147 into master
Sage Weil [Sat, 20 Mar 2021 23:57:23 +0000 (19:57 -0400)]
Merge PR #40147 into master

* refs/pull/40147/head:
python-common: Validate characters in service_id for container names

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #40244 into master
Sage Weil [Sat, 20 Mar 2021 23:56:58 +0000 (19:56 -0400)]
Merge PR #40244 into master

* refs/pull/40244/head:
qa/suites/rados/cephadm/smoke-roleless: deploy additional daemon types

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40266 from jdurgin/wip-release-notes-retry
David Galloway [Sat, 20 Mar 2021 18:58:42 +0000 (14:58 -0400)]
Merge pull request #40266 from jdurgin/wip-release-notes-retry

script/ceph-release-notes: add retries to pull request fetching

4 years agoMerge pull request #40271 from liu-chunmei/seastore_fix_segment_cleaner
Kefu Chai [Sat, 20 Mar 2021 14:34:53 +0000 (22:34 +0800)]
Merge pull request #40271 from liu-chunmei/seastore_fix_segment_cleaner

crimson/seastore: fix segment_cleaner bugs

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge PR #40219 into master
Sage Weil [Sat, 20 Mar 2021 13:17:26 +0000 (09:17 -0400)]
Merge PR #40219 into master

* refs/pull/40219/head:
mon/MgrStatMonitor: ignore MMgrReport from non-active mgr
mgr: tell monc when we get new servicemap, fsmap

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge PR #40117 into master
Sage Weil [Sat, 20 Mar 2021 13:16:41 +0000 (09:16 -0400)]
Merge PR #40117 into master

* refs/pull/40117/head:
mgr/orchestrator: DG loads properly the unmanaged attribute

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge PR #40103 into master
Sage Weil [Sat, 20 Mar 2021 13:16:14 +0000 (09:16 -0400)]
Merge PR #40103 into master

* refs/pull/40103/head:
cephadm: fix a minor typo in logging message

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge PR #40220 into master
Sage Weil [Sat, 20 Mar 2021 13:15:58 +0000 (09:15 -0400)]
Merge PR #40220 into master

* refs/pull/40220/head:
mgr/cephadm: identify rgw, cepfs-mirror in servicemap
mgr/ServiceMap: adjust 'ceph -s' summary
rgw: register daemons in servicemap by gid; include id
cephadm: fix rbd-mirror auth name

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge PR #40222 into master
Sage Weil [Sat, 20 Mar 2021 13:14:31 +0000 (09:14 -0400)]
Merge PR #40222 into master

* refs/pull/40222/head:
mgr/orchestrator: remove image name field from 'orch ps' and 'orch ls'

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge PR #40224 into master
Sage Weil [Sat, 20 Mar 2021 13:14:21 +0000 (09:14 -0400)]
Merge PR #40224 into master

* refs/pull/40224/head:
qa/suites/rados/cephadm/dashboard: test on centos

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #40241 into master
Sage Weil [Sat, 20 Mar 2021 13:14:10 +0000 (09:14 -0400)]
Merge PR #40241 into master

* refs/pull/40241/head:
cephadm: use debug verbosity during container exec

Reviewed-by: Adam King <adking@redhat.com>
4 years agoinstall-deps.sh: remove existing ceph-libboost of different version 40272/head
Kefu Chai [Sat, 20 Mar 2021 05:00:01 +0000 (13:00 +0800)]
install-deps.sh: remove existing ceph-libboost of different version

we install different versions of precompiled ceph-libboost packages
for different branches when building and testing them on ubuntu test
nodes. for instance,

- nautilus: v1.72
- octopus, pacific: v1.73

they share the same set of test nodes. and these ceph-libboost packages
conflict with each other, because they install files to the same places.

in order to avoid the confliction, we should uninstall existing packages
before installing a different version of ceph-libboost packages.

ceph-libboost${version}-dev is a package providing the shared headers of
boost library, so, in this change we check if it is installed before
returning or removing the existing packages.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/seastore: fix segment_cleaner bugs 40271/head
chunmei-liu [Sat, 20 Mar 2021 04:16:44 +0000 (21:16 -0700)]
crimson/seastore: fix segment_cleaner bugs

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
4 years agoMerge PR #40214 into master
Patrick Donnelly [Sat, 20 Mar 2021 03:11:47 +0000 (20:11 -0700)]
Merge PR #40214 into master

* refs/pull/40214/head:
mgr/volumes: Retain suid/guid bits in subvolume clone
pybind/cephfs: Add lchmod python binding
client/libcephfs: Add lchmod

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
4 years agoscript/ceph-release-notes: add retries to pull request fetching 40266/head
Josh Durgin [Sat, 20 Mar 2021 01:11:29 +0000 (21:11 -0400)]
script/ceph-release-notes: add retries to pull request fetching

API rate limits are easily hit without this for major releases.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>