]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agotest/crimson/seastore/transaction_manager_test_state: remove duplicate setup
Samuel Just [Thu, 22 Apr 2021 23:53:56 +0000 (16:53 -0700)]
test/crimson/seastore/transaction_manager_test_state: remove duplicate setup

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agotest/crimson/gtest_seastar: init config and perf counters for crimson tests
Samuel Just [Thu, 22 Apr 2021 22:11:28 +0000 (15:11 -0700)]
test/crimson/gtest_seastar: init config and perf counters for crimson tests

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/tools/store-nbd: don't use detailed space tracker
Samuel Just [Tue, 27 Apr 2021 21:56:00 +0000 (14:56 -0700)]
crimson/tools/store-nbd: don't use detailed space tracker

Intended for debugging rather than performance testing.

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore/journal: close open segment and reset soft state in close()
Samuel Just [Wed, 28 Apr 2021 07:22:16 +0000 (00:22 -0700)]
crimson/os/seastore/journal: close open segment and reset soft state in close()

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/journal: use SegmentManager methods for block size, etc
Samuel Just [Wed, 28 Apr 2021 07:21:19 +0000 (00:21 -0700)]
crimson/os/journal: use SegmentManager methods for block size, etc

Otherwise, initing those values needs to be done after the SegmentManager
instance is mounted.  This is simpler for now.

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: only create handle in create_new_collection
Samuel Just [Wed, 28 Apr 2021 07:25:02 +0000 (00:25 -0700)]
crimson/os/seastore: only create handle in create_new_collection

FuturizedStore::create_new_collection isn't supposed to actually
create the collection.  See OSD::mkfs for a usage example.

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: clean up meta implementation
Samuel Just [Wed, 28 Apr 2021 07:24:00 +0000 (00:24 -0700)]
crimson/os/seastore: clean up meta implementation

There's really no reason to cache the decoded representation here since
the meta keys are only accessed during startup, mkfs.  This approach is
much simpler.

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/.../transaction_manager: skip zero mappings in mount
Samuel Just [Wed, 28 Apr 2021 08:43:02 +0000 (01:43 -0700)]
crimson/.../transaction_manager: skip zero mappings in mount

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: fix read() to use onode.size for len=0
Samuel Just [Wed, 28 Apr 2021 08:42:35 +0000 (01:42 -0700)]
crimson/os/seastore: fix read() to use onode.size for len=0

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: fix do_transaction -- transactions may be empty
Samuel Just [Fri, 30 Apr 2021 21:12:27 +0000 (14:12 -0700)]
crimson/os/seastore: fix do_transaction -- transactions may be empty

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: wire up get_fsid
Samuel Just [Fri, 30 Apr 2021 21:11:43 +0000 (14:11 -0700)]
crimson/os/seastore: wire up get_fsid

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: wire up stat
Samuel Just [Fri, 30 Apr 2021 21:10:57 +0000 (14:10 -0700)]
crimson/os/seastore: wire up stat

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore/seastore.cc: update to use new debug macros
Samuel Just [Fri, 30 Apr 2021 07:31:45 +0000 (07:31 +0000)]
crimson/os/seastore/seastore.cc: update to use new debug macros

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/os/seastore: convert cache and transaction_manager to use new debugging macros
Samuel Just [Thu, 29 Apr 2021 22:15:40 +0000 (15:15 -0700)]
crimson/os/seastore: convert cache and transaction_manager to use new debugging macros

The goal here is to capture the transaction address and to standardize the
prefix format.

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #41214 from tchaikov/wip-crimson-clang-cleanups
Kefu Chai [Fri, 7 May 2021 06:59:41 +0000 (14:59 +0800)]
Merge pull request #41214 from tchaikov/wip-crimson-clang-cleanups

crimson: clang related cleanups

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/common/config_proxy: add a helper for get_val<>() 41214/head
Kefu Chai [Fri, 7 May 2021 05:14:33 +0000 (13:14 +0800)]
crimson/common/config_proxy: add a helper for get_val<>()

otherwise we have to put something like

local_conf().template get_val<T>(name)

which is not quite convenient or readable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os/seastore: do not redefine default argument
Kefu Chai [Fri, 7 May 2021 05:03:24 +0000 (13:03 +0800)]
crimson/os/seastore: do not redefine default argument

we should not redefine a default argument of a method of templated class.

this change also address following error from clang:

../src/crimson/os/seastore/onode_manager/staged-fltree/node.cc:621:30: error: template parameter redefines default argument
template <bool FORCE_MERGE = false>
                             ^
../src/crimson/os/seastore/onode_manager/staged-fltree/node.h:438:32: note: previous default template argument defined here
  template <bool FORCE_MERGE = false>
                               ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os/seastore: do not capture non-variables
Kefu Chai [Fri, 7 May 2021 04:59:36 +0000 (12:59 +0800)]
crimson/os/seastore: do not capture non-variables

merge_stage and merge_size are structured bindings, they are not
variables. so cannot be captured without defining variables in
capture list.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os/seastore: do not capture unused variable
Kefu Chai [Fri, 7 May 2021 04:59:14 +0000 (12:59 +0800)]
crimson/os/seastore: do not capture unused variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41211 from neha-ojha/wip-remove-mon-election
Neha Ojha [Fri, 7 May 2021 02:10:28 +0000 (19:10 -0700)]
Merge pull request #41211 from neha-ojha/wip-remove-mon-election

qa/suites/rados/standalone: remove mon_election symlink

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoqa/suites/rados/standalone: remove mon_election symlink 41211/head
Neha Ojha [Fri, 7 May 2021 00:35:35 +0000 (00:35 +0000)]
qa/suites/rados/standalone: remove mon_election symlink

The standalone tests need parameters to be passed as ceph_args to
override defaults.

This was just doubling the number of standalone tests being run in each rados
run with no effect!

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #41201 into master
Sage Weil [Thu, 6 May 2021 20:55:16 +0000 (16:55 -0400)]
Merge PR #41201 into master

* refs/pull/41201/head:
doc/releases: 16.2.3

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
4 years agoMerge PR #41179 into master
Sage Weil [Thu, 6 May 2021 20:01:57 +0000 (16:01 -0400)]
Merge PR #41179 into master

* refs/pull/41179/head:
qa/tasks/cephadm_cases: longer wait for osd to start

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agodoc/releases: 16.2.3 41201/head
Sage Weil [Thu, 6 May 2021 15:26:51 +0000 (10:26 -0500)]
doc/releases: 16.2.3

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #41192 from petrutlucian94/boost_url
Kefu Chai [Thu, 6 May 2021 16:34:25 +0000 (00:34 +0800)]
Merge pull request #41192 from petrutlucian94/boost_url

win32*.sh: Update boost URL, fix windows build

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41198 from tchaikov/wip-doc-mgr-options
Kefu Chai [Thu, 6 May 2021 16:33:16 +0000 (00:33 +0800)]
Merge pull request #41198 from tchaikov/wip-doc-mgr-options

doc/_ext: load options defined by mgr modules

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #41163 into master
Sage Weil [Thu, 6 May 2021 15:24:38 +0000 (11:24 -0400)]
Merge PR #41163 into master

* refs/pull/41163/head:
doc/releases/releases.yml: add 16.2.2
doc/releases/pacific: note cepahdm ingress+rgw support
doc: 16.2.2 Release Notes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #41183 into master
Sage Weil [Thu, 6 May 2021 15:10:49 +0000 (11:10 -0400)]
Merge PR #41183 into master

* refs/pull/41183/head:
cephadm: normalize image digest in 'ls' output too

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge pull request #40311 from rhcs-dashboard/refactor-crushmap-component
Ernesto Puerta [Thu, 6 May 2021 14:36:26 +0000 (16:36 +0200)]
Merge pull request #40311 from rhcs-dashboard/refactor-crushmap-component

mgr/dashboard: avoid data processing in crush-map component

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge PR #41107 into master
Sage Weil [Thu, 6 May 2021 14:33:00 +0000 (10:33 -0400)]
Merge PR #41107 into master

* refs/pull/41107/head:
mgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too
mgr/cephadm: make 'host add' idempotent
mgr/cephadm: set host crush location based on HostSpec
python-common: add location property to HostSpec, + tests

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agodoc/_ext: rewrite directive using ObjectDescription 41198/head
Kefu Chai [Thu, 6 May 2021 07:36:27 +0000 (15:36 +0800)]
doc/_ext: rewrite directive using ObjectDescription

which allows us to use different scheme when defining an option,

without this change, if two options in different mgr module share the
same name we cannot differentiate them, after this change, their id
would prefixed with the module name.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/rados/configuration/general-config-ref: use describe to define non-options
Kefu Chai [Thu, 6 May 2021 14:14:29 +0000 (22:14 +0800)]
doc/rados/configuration/general-config-ref: use describe to define non-options

max_open_files is not generated from yaml files, so define it using
"describe" directive instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/_ext: load options defined by mgr modules
Kefu Chai [Thu, 6 May 2021 04:51:23 +0000 (12:51 +0800)]
doc/_ext: load options defined by mgr modules

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agowin32*.sh: bump boost version to 1.75 41192/head
Lucian Petrut [Thu, 6 May 2021 12:39:00 +0000 (12:39 +0000)]
win32*.sh: bump boost version to 1.75

We're updating the Windows build scripts to use Boost 1.75, the same
as the Linux build.

We can now drop the custom Boost patches that were needed in order
to use mingw. Those have been merged upstream in the meantime.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agocephadm: normalize image digest in 'ls' output too 41183/head
Sage Weil [Wed, 5 May 2021 18:42:36 +0000 (14:42 -0400)]
cephadm: normalize image digest in 'ls' output too

We were previously only normalizing the 'inspect' output.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #41186 from zdover23/wip-doc-cephadm-upgrade-starting-the-upgrade...
Sebastian Wagner [Thu, 6 May 2021 11:18:09 +0000 (13:18 +0200)]
Merge pull request #41186 from zdover23/wip-doc-cephadm-upgrade-starting-the-upgrade-2021-05-06

doc/cephadm: rewriting "starting the upgrade"

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #41187 from zdover23/wip-doc-cephadm-upgrade-monitoring-the-upgrad...
Sebastian Wagner [Thu, 6 May 2021 11:17:21 +0000 (13:17 +0200)]
Merge pull request #41187 from zdover23/wip-doc-cephadm-upgrade-monitoring-the-upgrade-2021-05-06

doc/cephadm: rewrite "monitoring the upgrade"

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #41188 from zdover23/wip-doc-cephadm-upgrade-cancelling-the-upgrad...
Sebastian Wagner [Thu, 6 May 2021 11:16:04 +0000 (13:16 +0200)]
Merge pull request #41188 from zdover23/wip-doc-cephadm-upgrade-cancelling-the-upgrade-2021-05-06

doc/cephadm: rewrite "cancelling the upgrade"

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #41189 from zdover23/wip-doc-cephadm-upgrade-potential-problems...
Sebastian Wagner [Thu, 6 May 2021 11:15:27 +0000 (13:15 +0200)]
Merge pull request #41189 from zdover23/wip-doc-cephadm-upgrade-potential-problems-2021-05-06

doc/cephadm: rewrite "potential problems"

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #41190 from zdover23/wip-doc-cephadm-using-custom-containers-2021...
Sebastian Wagner [Thu, 6 May 2021 11:14:33 +0000 (13:14 +0200)]
Merge pull request #41190 from zdover23/wip-doc-cephadm-using-custom-containers-2021-05-06

doc/cephadm: rewrite "using customized con..."

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #41050 from rhcs-dashboard/fix-bucket-versioning-edit
Ernesto Puerta [Thu, 6 May 2021 09:32:51 +0000 (11:32 +0200)]
Merge pull request #41050 from rhcs-dashboard/fix-bucket-versioning-edit

mgr/dashboard: fix bucket versioning when locking is enabled

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
4 years agoMerge pull request #41126 from idryomov/wip-rbd-qemu-iotests-focal
Ilya Dryomov [Thu, 6 May 2021 09:14:46 +0000 (11:14 +0200)]
Merge pull request #41126 from idryomov/wip-rbd-qemu-iotests-focal

qa/workunits/rbd: use bionic version of qemu-iotests for focal

Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
4 years agomgr/dashboard: avoid data processing in crush-map component 40311/head
Avan Thakkar [Mon, 22 Mar 2021 14:40:20 +0000 (20:10 +0530)]
mgr/dashboard: avoid data processing in crush-map component

Fixes: https://tracker.ceph.com/issues/49236
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
4 years agowin32*.sh: improve logging
Lucian Petrut [Thu, 6 May 2021 07:18:56 +0000 (07:18 +0000)]
win32*.sh: improve logging

We'll use a log file when building the Ceph dependencies. Also, we'll
log some details about the operation that's about to be performed.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agowin32*.sh: fix boost url
Lucian Petrut [Thu, 6 May 2021 07:10:36 +0000 (07:10 +0000)]
win32*.sh: fix boost url

The boost download location has changed, breaking the Windows build.
Ths commit updates the boost download url.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agodoc/mgr/modules: should use Option class for defining options
Kefu Chai [Thu, 6 May 2021 03:57:27 +0000 (11:57 +0800)]
doc/mgr/modules: should use Option class for defining options

it is the encouraged way to define options nowadays.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/cephadm: rewrite "using customized con..." 41190/head
Zac Dover [Thu, 6 May 2021 00:54:24 +0000 (10:54 +1000)]
doc/cephadm: rewrite "using customized con..."

This PR rewrites the text in "Using Customized
Container Images" so that it is just a bit
clearer, and it also formats the prompt in the
text correctly.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agodoc/cephadm: rewrite "potential problems" 41189/head
Zac Dover [Thu, 6 May 2021 00:44:23 +0000 (10:44 +1000)]
doc/cephadm: rewrite "potential problems"

This PR adds correct prompts and slightly
reduces the cognitive load of the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agodoc/cephadm: rewrite "cancelling the upgrade" 41188/head
Zac Dover [Thu, 6 May 2021 00:34:26 +0000 (10:34 +1000)]
doc/cephadm: rewrite "cancelling the upgrade"

This PR corrects a single prompt in the section
"Cancelling the Upgrade".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agodoc/cephadm: rewrite "monitoring the upgrade" 41187/head
Zac Dover [Thu, 6 May 2021 00:30:02 +0000 (10:30 +1000)]
doc/cephadm: rewrite "monitoring the upgrade"

This PR adds correctly-formatted prompts and
makes slight alterations to the readability
of the text.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agodoc/cephadm: rewriting "starting the upgrade" 41186/head
Zac Dover [Thu, 6 May 2021 00:03:21 +0000 (10:03 +1000)]
doc/cephadm: rewriting "starting the upgrade"

This PR fixes the prompts in this section and
makes the sentences a tiny bit less onerous for
the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agodoc/releases/releases.yml: add 16.2.2 41163/head
Sage Weil [Wed, 5 May 2021 20:14:13 +0000 (15:14 -0500)]
doc/releases/releases.yml: add 16.2.2

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #40937 from MrFreezeex/snap-remove-fix
Ilya Dryomov [Wed, 5 May 2021 20:42:42 +0000 (22:42 +0200)]
Merge pull request #40937 from MrFreezeex/snap-remove-fix

librbd/mirror/snapshot: avoid UnlinkPeerRequest with a unlinked peer

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge PR #41148 into master
Sage Weil [Wed, 5 May 2021 18:53:22 +0000 (14:53 -0400)]
Merge PR #41148 into master

* refs/pull/41148/head:
Add Rocky Linux to supported DISTRO_NAMES

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge PR #41147 into master
Sage Weil [Wed, 5 May 2021 18:08:11 +0000 (14:08 -0400)]
Merge PR #41147 into master

* refs/pull/41147/head:
ceph_test_rados_api_service: stop threads before asserting
ceph_test_rados_api_service: more retries for servicemkap

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40551 from alimaredia/wip-rgw-dpp-update-master
J. Eric Ivancich [Wed, 5 May 2021 16:28:53 +0000 (12:28 -0400)]
Merge pull request #40551 from alimaredia/wip-rgw-dpp-update-master

rgw,test: Add even more DoutPrefixProvider's to the RGW codebase

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #40063 from rhcs-dashboard/cyclomatic-complexity
Ernesto Puerta [Wed, 5 May 2021 16:11:03 +0000 (18:11 +0200)]
Merge pull request #40063 from rhcs-dashboard/cyclomatic-complexity

mgr/dashboard: reduce cyclomatic complexity

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #40715 from pcuzner/pool-overview-enhancement
Ernesto Puerta [Wed, 5 May 2021 16:08:58 +0000 (18:08 +0200)]
Merge pull request #40715 from pcuzner/pool-overview-enhancement

mgr/dashboard:include compression stats on pool dashboard

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoqa/tasks/cephadm_cases: longer wait for osd to start 41179/head
Sage Weil [Wed, 5 May 2021 16:03:02 +0000 (11:03 -0500)]
qa/tasks/cephadm_cases: longer wait for osd to start

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #41149 into master
Sage Weil [Wed, 5 May 2021 15:57:28 +0000 (11:57 -0400)]
Merge PR #41149 into master

* refs/pull/41149/head:
mgr/cephadm: remove haproxy+keepalived container image from service spec

Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #41081 from votdev/issue_49718_disable_nfs_v3
Ernesto Puerta [Wed, 5 May 2021 15:47:58 +0000 (17:47 +0200)]
Merge pull request #41081 from votdev/issue_49718_disable_nfs_v3

mgr/dashboard: disable NFSv3 support in dashboard

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #41133 from nh2/patch-1
Kefu Chai [Wed, 5 May 2021 14:54:52 +0000 (22:54 +0800)]
Merge pull request #41133 from nh2/patch-1

cephfs.pyx: Fix docstring of get_layout

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/releases/pacific: note cepahdm ingress+rgw support
Sage Weil [Wed, 5 May 2021 14:28:39 +0000 (09:28 -0500)]
doc/releases/pacific: note cepahdm ingress+rgw support

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/dashboard: fix bucket versioning when locking is enabled 41050/head
Avan Thakkar [Tue, 27 Apr 2021 19:21:28 +0000 (00:51 +0530)]
mgr/dashboard: fix bucket versioning when locking is enabled

Fixes: https://tracker.ceph.com/issues/50545
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
4 years agopybind/cephfs: Fix docstring of get_layout 41133/head
Niklas Hambüchen [Tue, 4 May 2021 02:58:06 +0000 (04:58 +0200)]
pybind/cephfs: Fix docstring of get_layout

It was copy-pasted from another function.
Fixed by copy-pasting the docstring from the C docs.

Signed-off-by: Niklas Hambuechen <mail@nh2.me>
4 years agoMerge pull request #41165 from tchaikov/wip-cephfs-shell-manpage
Kefu Chai [Wed, 5 May 2021 09:43:26 +0000 (17:43 +0800)]
Merge pull request #41165 from tchaikov/wip-cephfs-shell-manpage

doc/man: build and install cephfs-shell manpage

Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40977 from xxhdx1985126/wip-seastore-xattr
Kefu Chai [Wed, 5 May 2021 07:23:00 +0000 (15:23 +0800)]
Merge pull request #40977 from xxhdx1985126/wip-seastore-xattr

crimson/os/seastore: formal extended attributes support

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41109 from markhpc/wip-bluefs_buffered_io-desc
Kefu Chai [Wed, 5 May 2021 06:45:40 +0000 (14:45 +0800)]
Merge pull request #41109 from markhpc/wip-bluefs_buffered_io-desc

src/common: Update bluefs_buffered_io descrption.

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agodoc/man: build and install cephfs-shell manpage 41165/head
Kefu Chai [Tue, 4 May 2021 02:59:03 +0000 (10:59 +0800)]
doc/man: build and install cephfs-shell manpage

otherwise the manpage of cephfs-shell is not built and installed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41142 from tchaikov/wip-cmake-global
Kefu Chai [Wed, 5 May 2021 04:52:53 +0000 (12:52 +0800)]
Merge pull request #41142 from tchaikov/wip-cmake-global

cmake: let libglobal_obj depend on legacy-option-headers

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agodoc/man/8/cephfs-shell: reformat options
Kefu Chai [Tue, 4 May 2021 03:08:15 +0000 (11:08 +0800)]
doc/man/8/cephfs-shell: reformat options

* format global options using option directive
* fix the header, so man/conf.py is able to parse
  the description
* define "Synopsis" section to be consistent with other manpages.
* drop reference to glossary using "term" as manapge does not have
  reference to glossary entries.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41160 into master
Patrick Donnelly [Wed, 5 May 2021 01:00:27 +0000 (18:00 -0700)]
Merge PR #41160 into master

* refs/pull/41160/head:
Revert "Merge PR #41134 into master"

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agodoc: 16.2.2 Release Notes
David Galloway [Tue, 4 May 2021 23:39:39 +0000 (19:39 -0400)]
doc: 16.2.2 Release Notes

Signed-off-by: David Galloway <dgallowa@redhat.com>
4 years agoRevert "Merge PR #41134 into master" 41160/head
Patrick Donnelly [Tue, 4 May 2021 21:30:39 +0000 (14:30 -0700)]
Revert "Merge PR #41134 into master"

This reverts commit 93bca2d0e9d771e3019af5e7228af7986c20ab61, reversing
changes made to 7e70b15c437a2fbe207b515a98b8b21880980867.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agorgw: add DPP's to logging for most ops 40551/head
Ali Maredia [Sat, 30 Jan 2021 05:47:55 +0000 (00:47 -0500)]
rgw: add DPP's to logging for most ops

This commit contains the following major
changes:

- Most log output lines for major ops now have
DoutPrefixProviders.

- Create new macro ldpp_subdout. This macro is meant
as a replacement for lsubdout for headerfiles that
do not define the rgw subsys.

- Changes to RGWObjManifest begin and end iterators.

- Make it so that rgw_dencoder.cc should only contain the
logic related to encoding.

Also add dpp to ldouts and lderr's already using
req_state and replace sync_env/env->dpp's with dpp's

Signed-off-by: Ali Maredia <amaredia@redhat.com>
Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41152 from linuxbox2/wip-restore-rgw-lua
Casey Bodley [Tue, 4 May 2021 19:14:29 +0000 (15:14 -0400)]
Merge pull request #41152 from linuxbox2/wip-restore-rgw-lua

cmake: restore Lua scripting support for RGW

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41024 from rhcs-dashboard/generate-manifest
Ernesto Puerta [Tue, 4 May 2021 18:52:30 +0000 (20:52 +0200)]
Merge pull request #41024 from rhcs-dashboard/generate-manifest

mgr/dashboard: Generate NPM dependencies manifest

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #41062 from rhcs-dashboard/50519-fix-ssl-cmd
Ernesto Puerta [Tue, 4 May 2021 18:46:05 +0000 (20:46 +0200)]
Merge pull request #41062 from rhcs-dashboard/50519-fix-ssl-cmd

mgr/dashboard: fix set-ssl-certificate{,-key} commands

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/cephadm: remove haproxy+keepalived container image from service spec 41149/head
Sage Weil [Tue, 4 May 2021 16:12:53 +0000 (12:12 -0400)]
mgr/cephadm: remove haproxy+keepalived container image from service spec

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocmake: restore Lua scripting support for RGW 41152/head
Matt Benjamin [Tue, 4 May 2021 16:09:45 +0000 (12:09 -0400)]
cmake: restore Lua scripting support for RGW

RGW linkage with Lua was broken by the following commit:

commit 7471fbfa4bf015c972c0e577da2a1ee87f62adfd
Author: Kefu Chai <kchai@redhat.com>
Date:   Mon Apr 26 22:44:16 2021 +0800

    cmake: require lua if WITH_CEPHFS is enabled

    in src/mds/Mantle.cc, the lua C binding APIs are used, so we should only
    require lua if WITH_CEPHFS is enabled.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
4 years agoceph_test_rados_api_service: stop threads before asserting 41147/head
Sage Weil [Tue, 4 May 2021 16:06:17 +0000 (11:06 -0500)]
ceph_test_rados_api_service: stop threads before asserting

Otherwise, if we assert, we'll hang here:

Thread 1 (Thread 0x7f74eba79580 (LWP 1688617)):
#0  0x00007f74eb2aa529 in futex_wait (private=<optimized out>, expected=132, futex_word=0x7ffd642b4b54) at ../sysdeps/unix/sysv/linux/futex-internal.h:61
#1  futex_wait_simple (private=<optimized out>, expected=132, futex_word=0x7ffd642b4b54) at ../sysdeps/nptl/futex-internal.h:135
#2  __pthread_cond_destroy (cond=0x7ffd642b4b30) at pthread_cond_destroy.c:54

#3  0x0000563ff2e5a891 in LibRadosService_StatusFormat_Test::TestBody (this=<optimized out>) at /usr/include/c++/7/bits/unique_ptr.h:78
#4  0x0000563ff2e9dc3a in testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void> (location=0x563ff2ea72e4 "the test body", method=<optimized out>, object=0x563ff422a6d0)
    at ./src/googletest/googletest/src/gtest.cc:2605
#5  testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void> (object=object@entry=0x563ff422a6d0, method=<optimized out>, location=location@entry=0x563ff2ea72e4 "the test body")
    at ./src/googletest/googletest/src/gtest.cc:2641
#6  0x0000563ff2e908c3 in testing::Test::Run (this=0x563ff422a6d0) at ./src/googletest/googletest/src/gtest.cc:2680
#7  0x0000563ff2e90a25 in testing::TestInfo::Run (this=0x563ff41a3b70) at ./src/googletest/googletest/src/gtest.cc:2858
#8  0x0000563ff2e90ec1 in testing::TestSuite::Run (this=0x563ff41b6230) at ./src/googletest/googletest/src/gtest.cc:3012
#9  0x0000563ff2e92bdc in testing::internal::UnitTestImpl::RunAllTests (this=<optimized out>) at ./src/googletest/googletest/src/gtest.cc:5723
#10 0x0000563ff2e9e14a in testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool> (location=0x563ff2ea8728 "auxiliary test code (environments or event listeners)",
    method=<optimized out>, object=0x563ff41a2d10) at ./src/googletest/googletest/src/gtest.cc:2605
#11 testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool> (object=0x563ff41a2d10, method=<optimized out>,
    location=location@entry=0x563ff2ea8728 "auxiliary test code (environments or event listeners)") at ./src/googletest/googletest/src/gtest.cc:2641
#12 0x0000563ff2e90ae8 in testing::UnitTest::Run (this=0x563ff30c0660 <testing::UnitTest::GetInstance()::instance>) at ./src/googletest/googletest/src/gtest.cc:5306

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoceph_test_rados_api_service: more retries for servicemkap
Sage Weil [Tue, 4 May 2021 16:01:38 +0000 (11:01 -0500)]
ceph_test_rados_api_service: more retries for servicemkap

Otherwise, this fails intermittently with

/build/ceph-16.2.1-257-g717ce59b/src/test/librados/service.cc:166: Failure
Expected: (0) != (retry), actual: 0 vs 0

Fixes: https://tracker.ceph.com/issues/50595
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoAdd Rocky Linux to supported DISTRO_NAMES 41148/head
Dennis Körner [Tue, 4 May 2021 15:59:59 +0000 (17:59 +0200)]
Add Rocky Linux to supported DISTRO_NAMES

Rocky Linux is a RHEL clone. I did a test-installation of ceph pacific on Rocky Linux RC1 with cephadm. As far as I can see, everything works as expected.

Signed-off-by: Dennis Körner <koerner@netzwerge.de>
4 years agoMerge PR #41134 into master
Patrick Donnelly [Tue, 4 May 2021 14:32:51 +0000 (07:32 -0700)]
Merge PR #41134 into master

* refs/pull/41134/head:
doc/man: build and install cephfs-shell manpage
doc/man/8/cephfs-shell: reformat options

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
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 pull request #40926 from ivancich/wip-orphan-list-pools
J. Eric Ivancich [Tue, 4 May 2021 13:08:48 +0000 (09:08 -0400)]
Merge pull request #40926 from ivancich/wip-orphan-list-pools

rgw: allow rgw-orphan-list to process multiple data pools

Reviewed-by: Michael Kidd <linuxkidd@gmail.com>
4 years agomgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too 41107/head
Sage Weil [Mon, 3 May 2021 16:09:09 +0000 (12:09 -0400)]
mgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: make 'host add' idempotent
Sage Weil [Mon, 3 May 2021 16:04:28 +0000 (12:04 -0400)]
mgr/cephadm: make 'host add' idempotent

Do not let prime_empty_host blow away inventory.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: set host crush location based on HostSpec
Sage Weil [Fri, 30 Apr 2021 15:10:38 +0000 (11:10 -0400)]
mgr/cephadm: set host crush location based on HostSpec

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agopython-common: add location property to HostSpec, + tests
Sage Weil [Fri, 30 Apr 2021 15:10:26 +0000 (11:10 -0400)]
python-common: add location property to HostSpec, + tests

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #40631 from cbodley/wip-49780
Casey Bodley [Tue, 4 May 2021 12:08:51 +0000 (08:08 -0400)]
Merge pull request #40631 from cbodley/wip-49780

rgw/sts: read_obj_policy() consults iam_user_policies on ENOENT

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
4 years agolibrbd/mirror/snapshot: avoid UnlinkPeerRequest with a unlinked peer 40937/head
Arthur Outhenin-Chalandre [Tue, 20 Apr 2021 11:51:45 +0000 (13:51 +0200)]
librbd/mirror/snapshot: avoid UnlinkPeerRequest with a unlinked peer

CreatePrimaryRequest could create some UnlinkPeerRequest with an already
unlinked peer in a scenario where you have multiple peers. This request
will not remove the peer (as it's already not linked to the requested
peer) and will skip deletion of the mirror snapshot if another peer
remains. Eventually the code will go through an infinite recursive loop
between CreatePrimaryRequest and UnlinkPeerRequest and segfault.

This commit adds an extra condition to make sure to not submit a
UnlinkPeerRequest if the peer is not linked to the current snapshot. If
there is already no peer in the list it will submit a UnlinkPeerRequest
to remove the snapshot.

Fixes: https://tracker.ceph.com/issues/50439
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
4 years agoMerge pull request #41033 from tchaikov/wip-osx-build
Kefu Chai [Tue, 4 May 2021 11:11:52 +0000 (19:11 +0800)]
Merge pull request #41033 from tchaikov/wip-osx-build

cmake,common: various cleanup for building on MacOS

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agotest/crimson: add tests for enhanced get/set attrs apis 40977/head
Xuehan Xu [Sun, 2 May 2021 07:22:16 +0000 (15:22 +0800)]
test/crimson: add tests for enhanced get/set attrs apis

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agocrimson/os/seastore: allow upper layer to set attrs other than OI_ATTR and SS_ATTR
Xuehan Xu [Tue, 20 Apr 2021 07:47:51 +0000 (15:47 +0800)]
crimson/os/seastore: allow upper layer to set attrs other than OI_ATTR and SS_ATTR

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agocrimson/os: change get/set attrs value to the bufferlist type
Xuehan Xu [Tue, 20 Apr 2021 07:45:43 +0000 (15:45 +0800)]
crimson/os: change get/set attrs value to the bufferlist type

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #41045 from jmolmo/fix_cv_lvm_lock
Sebastian Wagner [Tue, 4 May 2021 09:08:39 +0000 (11:08 +0200)]
Merge pull request #41045 from jmolmo/fix_cv_lvm_lock

mgr/cephadm: ceph-volume verbose only when fails

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #40313 from jmolmo/purge_iscsi_config
Sebastian Wagner [Tue, 4 May 2021 08:43:57 +0000 (10:43 +0200)]
Merge pull request #40313 from jmolmo/purge_iscsi_config

mgr/cephadm: Remove gateway.conf from iscsi pool when service is removed

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Sage Weil <sage@newdream.net>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #40799 from myoungwon/wip-fix-null-promote-obc
Samuel Just [Tue, 4 May 2021 07:55:33 +0000 (00:55 -0700)]
Merge pull request #40799 from myoungwon/wip-fix-null-promote-obc

osd: fix not set promote_obc when manifest object is rollbacked

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agodoc/man: build and install cephfs-shell manpage 41134/head
Kefu Chai [Tue, 4 May 2021 02:59:03 +0000 (10:59 +0800)]
doc/man: build and install cephfs-shell manpage

otherwise the manpage of cephfs-shell is not built and installed.

Signed-off-by: Kefu Chai <kchai@redhat.com>