]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoMerge pull request #38927 from sebastian-philipp/cephadm-upgrade-retry-ceph-volume
Sebastian Wagner [Thu, 4 Feb 2021 10:56:52 +0000 (11:56 +0100)]
Merge pull request #38927 from sebastian-philipp/cephadm-upgrade-retry-ceph-volume

mgr/cephadm: try again calling ceph-volume without --filter-for-batch

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
4 years agoMerge pull request #39242 from vshankar/wip-cephfs-mirroring-doc-cleanup
Venky Shankar [Thu, 4 Feb 2021 04:44:24 +0000 (10:14 +0530)]
Merge pull request #39242 from vshankar/wip-cephfs-mirroring-doc-cleanup

doc: cleanup cephfs-mirroring document

4 years agoMerge pull request #39208 from sebastian-philipp/pyhton-common-more-typing
Kefu Chai [Thu, 4 Feb 2021 04:20:18 +0000 (12:20 +0800)]
Merge pull request #39208 from sebastian-philipp/pyhton-common-more-typing

python-common: Add more type annotations

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38685 from tchaikov/wip-gil
Kefu Chai [Thu, 4 Feb 2021 04:18:23 +0000 (12:18 +0800)]
Merge pull request #38685 from tchaikov/wip-gil

mgr/ActivePyModules.cc: always acquire locks without holding GIL

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39217 from myoungwon/wip-fix-seg-fault-manifest-ops
Kefu Chai [Thu, 4 Feb 2021 04:17:02 +0000 (12:17 +0800)]
Merge pull request #39217 from myoungwon/wip-fix-seg-fault-manifest-ops

osd: fix to call nullptr when cancel_manifest_ops

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39224 from petrutlucian94/rbd_fixes
Jason Dillaman [Thu, 4 Feb 2021 04:10:29 +0000 (23:10 -0500)]
Merge pull request #39224 from petrutlucian94/rbd_fixes

Windows RBD fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #39145 from ronen-fr/wip-ronenf-scrub-48793
Neha Ojha [Wed, 3 Feb 2021 23:49:24 +0000 (15:49 -0800)]
Merge pull request #39145 from ronen-fr/wip-ronenf-scrub-48793

osd: fix the scrubber behavior on multiple preemption attempts

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #39279 from cbodley/wip-cmake-spawn-options
Casey Bodley [Wed, 3 Feb 2021 22:14:36 +0000 (17:14 -0500)]
Merge pull request #39279 from cbodley/wip-cmake-spawn-options

cmake/rgw: forward spawn's compile options to rgw_common object library

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
4 years agoMerge pull request #39275 from neha-ojha/wip-49139
Neha Ojha [Wed, 3 Feb 2021 21:00:16 +0000 (13:00 -0800)]
Merge pull request #39275 from neha-ojha/wip-49139

qa/suites/rados/perf: pin to 18.04

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agocmake/rgw: forward spawn's compile options to rgw_common object library 39279/head
Casey Bodley [Wed, 3 Feb 2021 20:17:19 +0000 (15:17 -0500)]
cmake/rgw: forward spawn's compile options to rgw_common object library

since rgw_common is an OBJECT library, we can't use
target_link_libraries() for its dependency on spawn. we add its
include directories manually already with
$<TARGET_PROPERTY:spawn,INTERFACE_INCLUDE_DIRECTORIES>, but this didn't
pull in the compile definitions. this ultimately prevented the
WITH_BOOST_VALGRIND option from passing the BOOST_USE_VALGRIND
definition attached to boost::context

Signed-off-by: Casey Bodley <cbodley@redhat.com>
4 years agocmake: remove unnecessary target_include_directories() for spawn
Casey Bodley [Wed, 3 Feb 2021 20:17:47 +0000 (15:17 -0500)]
cmake: remove unnecessary target_include_directories() for spawn

targets that depend on spawn via target_link_libraries() automatically
pull in their compile options and include directories

Signed-off-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39274 from yuriw/wip-yuriw-crontab-master
Yuri Weinstein [Wed, 3 Feb 2021 20:07:21 +0000 (12:07 -0800)]
Merge pull request #39274 from yuriw/wip-yuriw-crontab-master

qa/tests: removed ceph-ansible (master and pacific)

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoqa/suites/perf-basic: pin to 18.04 39275/head
Neha Ojha [Wed, 3 Feb 2021 18:57:50 +0000 (18:57 +0000)]
qa/suites/perf-basic: pin to 18.04

This will have same problems as https://tracker.ceph.com/issues/49139

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoqa/tests: removed ceph-ansible (master and pacific) 39274/head
Yuri Weinstein [Wed, 3 Feb 2021 18:04:27 +0000 (10:04 -0800)]
qa/tests: removed ceph-ansible (master and pacific)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoqa/suites/rados/perf: pin to 18.04
Neha Ojha [Wed, 3 Feb 2021 17:29:59 +0000 (17:29 +0000)]
qa/suites/rados/perf: pin to 18.04

Caused by a07ca4c5c0f04c43c71231a898c2a89e99a80606

Fixes: https://tracker.ceph.com/issues/49139
Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #38687 into master
Jan Fajerski [Wed, 3 Feb 2021 17:29:59 +0000 (18:29 +0100)]
Merge PR #38687 into master

* refs/pull/38687/head:
ceph-volume: mock VGs with string properties in tests
ceph-volume: add some flexibility to bytes_to_extents

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge pull request #39186 from tchaikov/wip-mgr-telemetry-ann
Kefu Chai [Wed, 3 Feb 2021 16:40:07 +0000 (00:40 +0800)]
Merge pull request #39186 from tchaikov/wip-mgr-telemetry-ann

pybind/mgr: add typing annotation

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Yaarit Hatuka <yaarit@redhat.com>
4 years agoMerge pull request #39260 from idryomov/wip-expand-randomized-suite-doc
Ilya Dryomov [Wed, 3 Feb 2021 16:14:34 +0000 (17:14 +0100)]
Merge pull request #39260 from idryomov/wip-expand-randomized-suite-doc

qa: expand the documentation on the '$' suite feature

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37954 from joscollin/wip-F46226-log-dq-throttle-limit-new
fullerdj [Wed, 3 Feb 2021 15:42:40 +0000 (10:42 -0500)]
Merge pull request #37954 from joscollin/wip-F46226-log-dq-throttle-limit-new

msg,mon,common: log when DispatchQueue throttle limit is reached

4 years agoMerge PR #39069 into master
Sage Weil [Wed, 3 Feb 2021 15:38:49 +0000 (10:38 -0500)]
Merge PR #39069 into master

* refs/pull/39069/head:
mgr/cephadm/upgrade: tolerate pre-pacific upgrade state
mgr/cephadm/upgrade: scale down MDS cluster(s) for major version upgrades
mgr/cephadm: fix capitalization, level; drop elipses of log msgs
mgr/cephadm/upgrade: match against any repo_digest, not image_id
cephadm: return repo_digests (plural) in pull/inspect output
mgr/cephadm: include container_image_digests in inventory
cephadm: include image_digests list in 'ls' output
vstart.sh: only extract first container digest
mgr/cephadm: move release -> major translation to helper
mgr/cephadm/upgrade: tolerate old upgrade_state.target_versoin
mgr/cephadm/upgrade: set require-osd-release when done with OSDs
mgr: add lookup_release_name(int) to mgr interface
mgr/cephadm: verify container image version after we pull it
mgr/cephadm: only save version portion of version string
cephadm: fix 'inspect' and 'pull'
mgr/cephadm/upgrade: implement N-2 version checks on upgrade start

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge pull request #39234 from neha-ojha/wip-49064
Neha Ojha [Wed, 3 Feb 2021 14:56:02 +0000 (06:56 -0800)]
Merge pull request #39234 from neha-ojha/wip-49064

qa/*/test_envlibrados_for_rocksdb: use osd_client_message_cap to prevent slow requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoqa: expand the documentation on the '$' suite feature 39260/head
Ilya Dryomov [Thu, 21 Jan 2021 11:15:34 +0000 (12:15 +0100)]
qa: expand the documentation on the '$' suite feature

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agodoc: cleanup cephfs-mirroring document 39242/head
Venky Shankar [Wed, 3 Feb 2021 05:11:59 +0000 (00:11 -0500)]
doc: cleanup cephfs-mirroring document

Remove references to in-progress feature, remove internal interfaces
section and minor cleanups.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agopybind/mgr/hello: use f-string when appropriate 39186/head
Kefu Chai [Mon, 1 Feb 2021 10:53:18 +0000 (18:53 +0800)]
pybind/mgr/hello: use f-string when appropriate

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/crash: flake8 cleanups
Kefu Chai [Mon, 1 Feb 2021 06:06:39 +0000 (14:06 +0800)]
pybind/mgr/crash: flake8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/crash: add type annotations
Kefu Chai [Sun, 31 Jan 2021 10:44:15 +0000 (18:44 +0800)]
pybind/mgr/crash: add type annotations

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/crash: define options using Option
Kefu Chai [Sun, 31 Jan 2021 10:33:43 +0000 (18:33 +0800)]
pybind/mgr/crash: define options using Option

more type safe this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/crash: define commands using CLICommand
Kefu Chai [Sun, 31 Jan 2021 10:31:45 +0000 (18:31 +0800)]
pybind/mgr/crash: define commands using CLICommand

more type safe this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38955 from varshar16/wip-doc-update-nfs-ganesha-dynamic
Jeff Layton [Wed, 3 Feb 2021 12:45:38 +0000 (07:45 -0500)]
Merge pull request #38955 from varshar16/wip-doc-update-nfs-ganesha-dynamic

doc/cephfs/nfs: Add rook pod restart note, export and log block example

4 years agowin32*.sh: move debug symbols to separate files 39224/head
Lucian Petrut [Wed, 3 Feb 2021 08:59:24 +0000 (08:59 +0000)]
win32*.sh: move debug symbols to separate files

This patch simplifies releasing Windows binaries along with debug
symbols.

By default, we're going to provide minimum debug information (-g1).
The symbols are extracted from the binaries and placed in separate
files in the ".debug" folder, which is used by gdb implicitly.

This is more convenient than having separate versions of the binaries,
with or without debug symbols.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agopybind/mgr/alerts: define options using Option
Kefu Chai [Sun, 31 Jan 2021 10:00:50 +0000 (18:00 +0800)]
pybind/mgr/alerts: define options using Option

more type safe this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/cephadm: PEP8 cleanups
Kefu Chai [Sun, 31 Jan 2021 09:50:08 +0000 (17:50 +0800)]
pybind/mgr/cephadm: PEP8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/alerts: use CLIReadCommand to define commands
Kefu Chai [Sun, 31 Jan 2021 09:48:31 +0000 (17:48 +0800)]
pybind/mgr/alerts: use CLIReadCommand to define commands

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/status: PEP8 cleanups
Kefu Chai [Sun, 31 Jan 2021 09:47:52 +0000 (17:47 +0800)]
pybind/mgr/status: PEP8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/iostat: PEP8 cleanups
Kefu Chai [Sun, 31 Jan 2021 09:47:28 +0000 (17:47 +0800)]
pybind/mgr/iostat: PEP8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/devicehealth: PEP8 cleanups
Kefu Chai [Sun, 31 Jan 2021 09:47:07 +0000 (17:47 +0800)]
pybind/mgr/devicehealth: PEP8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/insights: PEP8 cleanups
Kefu Chai [Sun, 31 Jan 2021 09:46:46 +0000 (17:46 +0800)]
pybind/mgr/insights: PEP8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/prometheus: PEP8 cleanups
Kefu Chai [Sun, 31 Jan 2021 09:46:09 +0000 (17:46 +0800)]
pybind/mgr/prometheus: PEP8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/telemetry: use CLICommand to define commands
Kefu Chai [Sat, 30 Jan 2021 13:14:50 +0000 (21:14 +0800)]
mgr/telemetry: use CLICommand to define commands

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/telemetry: silence flake8 warnings
Kefu Chai [Sat, 30 Jan 2021 12:55:19 +0000 (20:55 +0800)]
mgr/telemetry: silence flake8 warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr: define substitution for autopep8 params
Kefu Chai [Sun, 31 Jan 2021 09:51:09 +0000 (17:51 +0800)]
pybind/mgr: define substitution for autopep8 params

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/telemetry: remove duplicated dict entry
Kefu Chai [Sat, 30 Jan 2021 12:44:06 +0000 (20:44 +0800)]
mgr/telemetry: remove duplicated dict entry

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/telemetry: remove duplicated method
Kefu Chai [Sat, 30 Jan 2021 12:42:59 +0000 (20:42 +0800)]
mgr/telemetry: remove duplicated method

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/telemetry: add typing annotations
Kefu Chai [Sat, 30 Jan 2021 12:40:54 +0000 (20:40 +0800)]
mgr/telemetry: add typing annotations

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/telemetry: use Option to define options
Kefu Chai [Sat, 30 Jan 2021 10:26:48 +0000 (18:26 +0800)]
mgr/telemetry: use Option to define options

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/hello: add typing annotation
Kefu Chai [Fri, 29 Jan 2021 16:48:36 +0000 (00:48 +0800)]
pybind/mgr/hello: add typing annotation

also, use Option and CLIReadCommand to define options and cli
commands. this module serves as a "hello world" example for
developers of mgr modules. so it's important to use the more
convenient and safer way to implement the module

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38911 from pcuzner/add-cluster-network-to-bootstrap
pcuzner [Wed, 3 Feb 2021 08:53:54 +0000 (21:53 +1300)]
Merge pull request #38911 from pcuzner/add-cluster-network-to-bootstrap

cephadm: Add cluster network to bootstrap

4 years agorbd: propagate rbd-wnbd errors
Lucian Petrut [Fri, 29 Jan 2021 13:38:19 +0000 (13:38 +0000)]
rbd: propagate rbd-wnbd errors

This change updates the "rbd device" commands, propagating
rbd-wnbd.exe exit codes.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agorbd: propagate WNBD start errors
Lucian Petrut [Fri, 29 Jan 2021 11:03:20 +0000 (11:03 +0000)]
rbd: propagate WNBD start errors

This change will propagate the errors that WNBD may return when
spinning up the IO workers.

Also, we'll avoid removing the registry record for failed
non-persistent mappings. Those will be cleaned up when the service
restarts or when explicitly unmapped.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agorbd: improve Windows remap failure handling
Lucian Petrut [Fri, 29 Jan 2021 09:54:10 +0000 (09:54 +0000)]
rbd: improve Windows remap failure handling

At the moment, if an image can't be remapped when the centralized
RBD service starts, the service will stop and already started
daemons will continue running.

This change adds a new option: "--remap-failure-fatal". If set,
when an image can't be remmaped, the service stops AND cleans up
the running daemons. By default, an error will be logged and the
service will continue running.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agorbd: add image map timeouts on Windows
Lucian Petrut [Thu, 28 Jan 2021 14:08:29 +0000 (14:08 +0000)]
rbd: add image map timeouts on Windows

This change adds configurable timeouts used when starting the centralized RBD
service and mapping images.

This change also fixes an issue where the service would wait indefinitely for
a failed mapping. This issue was caused by the fact that multiple child
processes were inheriting pipe handles.

Note that we can't use timeouts with Windows anonymous pipes, which is why
we're going to use unique named pipes.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agorbd: restrict Windows service exec calls
Lucian Petrut [Wed, 27 Jan 2021 12:58:48 +0000 (12:58 +0000)]
rbd: restrict Windows service exec calls

The centralized Ceph Windows service is responsible of managing
rbd-wnbd daemons. When starting, it's respawns the daemons using the
command line saved in the Windows registry. Also, for new mappings,
the command line is passed through a named pipe.

While writing to the according named pipe and windows registry entries
requires admin privileges, it's better to avoid running arbitrary
commands.

This patch will drop the executable from the commands that the
Ceph service accepts. Instead, it will only accept arguments that
are passed to the the binary that was used to start the service
(rbd-wnbd.exe).

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agorbd: allow non persistent Windows mappings
Lucian Petrut [Wed, 27 Jan 2021 09:06:19 +0000 (09:06 +0000)]
rbd: allow non persistent Windows mappings

At the moment, all Windows RBD mappings are persistent, being
recreated when the Ceph service starts.

This change adds the "--non-persistent" flag to allow skipping
certain images.

Note that even for non-persistent mappings, we're still storing
data in the Windows registry, allowing us to retrieve image
details such as the rbd pool as well as the admin socket path.

When the daemons stop or the Ceph service starts, non-persistent
entries are cleaned up from the Windows registry.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agorbd: fix Windows block count overflow
Lucian Petrut [Wed, 27 Jan 2021 08:30:54 +0000 (08:30 +0000)]
rbd: fix Windows block count overflow

rbd-wnbd uses uint32_t for storing the image total block count,
which will overflow for >2TB images that are using 512B blocks.

This patch will switch to a uint64_t.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agorbd: delegate map requests to the Windows service
Lucian Petrut [Tue, 26 Jan 2021 14:13:22 +0000 (14:13 +0000)]
rbd: delegate map requests to the Windows service

At the moment, rbd-wnbd daemons are tied to the Windows
session. When the user logs off or the WinRM remote session
terminates, the daemons are killed.

In order to avoid such issues, we'll delegate the daemon
initialization to the centralized Ceph Windows service.

We're using a named pipe for the Ceph service communication.
We're not using Ceph admin sockets for now since unix sockets
aren't available on Windows Server 2016.

Worth mentioning that the Ceph Windows service will restart
registered mappings when the host reboots based on the command
lines saved in the Windows registries. Writing to the registry
key as well as the service named pipe requires admin privileges.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agoMerge pull request #39239 from athanatos/sjust/wip-49114
Samuel Just [Wed, 3 Feb 2021 03:11:41 +0000 (19:11 -0800)]
Merge pull request #39239 from athanatos/sjust/wip-49114

crimson/os/seastore: fix staged-fltree build problems

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agocrimson/.../staged-fltree: propogate eagain in node, value 39239/head
Samuel Just [Wed, 3 Feb 2021 00:58:54 +0000 (16:58 -0800)]
crimson/.../staged-fltree: propogate eagain in node, value

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agocrimson/.../staged-fltree: fix tree_cursor_t::(trim|extend)_value
Samuel Just [Fri, 22 Jan 2021 00:46:13 +0000 (00:46 +0000)]
crimson/.../staged-fltree: fix tree_cursor_t::(trim|extend)_value

Signed-off-by: Samuel Just <sjust@redhat.com>
4 years agoMerge PR #39206 into master
Sage Weil [Tue, 2 Feb 2021 22:47:52 +0000 (17:47 -0500)]
Merge PR #39206 into master

* refs/pull/39206/head:
mgr/MetricTypes: condition encoding on feature bits

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge pull request #38924 from cyx1231st/wip-seastar-onode-tree-onode_t
Samuel Just [Tue, 2 Feb 2021 21:05:39 +0000 (13:05 -0800)]
Merge pull request #38924 from cyx1231st/wip-seastar-onode-tree-onode_t

crimson/onode-staged-tree: implement an extensive Value framework

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoqa/*/test_envlibrados_for_rocksdb: use osd_client_message_cap to prevent slow requests 39234/head
Neha Ojha [Tue, 2 Feb 2021 17:43:56 +0000 (17:43 +0000)]
qa/*/test_envlibrados_for_rocksdb: use osd_client_message_cap to prevent slow requests

EnvLibradosMutipoolTest.DBBulkLoadKeysInRandomOrder can overload OSDs and cause
heartbeat timeouts. Tests in test_envlibrados_for_rocksdb also generate slow
requests on OSDs. Use osd_client_message_cap to prevent this.
Since this option is disabled by default, this may be a good way to exercise it.

Fixes: https://tracker.ceph.com/issues/49064
Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39209 from idryomov/wip-unbreak-rbd-task
Ilya Dryomov [Tue, 2 Feb 2021 17:16:56 +0000 (18:16 +0100)]
Merge pull request #39209 from idryomov/wip-unbreak-rbd-task

qa/tasks/rbd: fix regressions introduced with rbd encryption support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge PR #39212 into master
Sage Weil [Tue, 2 Feb 2021 16:49:07 +0000 (11:49 -0500)]
Merge PR #39212 into master

* refs/pull/39212/head:
cpatch: python 3.6 -> 3.8
cpatch: new default base image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39207 from zdover23/wip-doc-removing-workbench-docs
zdover23 [Tue, 2 Feb 2021 16:14:24 +0000 (02:14 +1000)]
Merge pull request #39207 from zdover23/wip-doc-removing-workbench-docs

doc/dev: remove workbench sections

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39227 from tchaikov/wip-48825
Kefu Chai [Tue, 2 Feb 2021 16:11:41 +0000 (00:11 +0800)]
Merge pull request #39227 from tchaikov/wip-48825

mgr/zabbix: format ceph.[{#POOL},percent_used as float

Reviewed-by: Wido den Hollander <wido@widodh.nl>
4 years agoMerge pull request #39225 from tchaikov/wip-crimson-seastore-dec-ref
Kefu Chai [Tue, 2 Feb 2021 16:06:03 +0000 (00:06 +0800)]
Merge pull request #39225 from tchaikov/wip-crimson-seastore-dec-ref

crimson/os/seastore: don't use variadic template for dec_ref()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #38050 from ifed01/wip-ifed-fsck-spanning-blob
Igor Fedotov [Tue, 2 Feb 2021 15:09:08 +0000 (18:09 +0300)]
Merge pull request #38050 from ifed01/wip-ifed-fsck-spanning-blob

os/bluestore: detect and fix "zombie" spanning blobs using fsck.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agodoc/cephfs/nfs: Add rook pod restart note, export and log block example 38955/head
Varsha Rao [Mon, 18 Jan 2021 16:24:32 +0000 (21:54 +0530)]
doc/cephfs/nfs: Add rook pod restart note, export and log block example

Fixes: https://tracker.ceph.com/issues/48914
Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agopython-common: Set disallow_untyped_defs = True 39208/head
Sebastian Wagner [Mon, 1 Feb 2021 16:08:28 +0000 (17:08 +0100)]
python-common: Set disallow_untyped_defs = True

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agopython-common: removed unused exeption.py
Sebastian Wagner [Mon, 1 Feb 2021 16:06:57 +0000 (17:06 +0100)]
python-common: removed unused exeption.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agopython-common: Type annotation for ServiceSpec.from_json
Sebastian Wagner [Mon, 1 Feb 2021 15:13:19 +0000 (16:13 +0100)]
python-common: Type annotation for ServiceSpec.from_json

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/zabbix: format ceph.[{#POOL},percent_used as float 39227/head
Kefu Chai [Tue, 2 Feb 2021 13:36:18 +0000 (21:36 +0800)]
mgr/zabbix: format ceph.[{#POOL},percent_used as float

also, multiply it with 100, as we are using 1.0 for 100% here.

for more details regarding the mapping from value_type to its values.
see
https://www.zabbix.com/documentation/4.0/manual/api/reference/item/object

Fixes: https://tracker.ceph.com/issues/48825
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoos/bluestore: detect and fix "zombie" spanning blobs using fsck. 38050/head
Igor Fedotov [Thu, 12 Nov 2020 17:04:45 +0000 (20:04 +0300)]
os/bluestore: detect and fix "zombie" spanning blobs using fsck.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
4 years agocrimson/os/seastore: don't use variadic template for dec_ref() 39225/head
Kefu Chai [Tue, 2 Feb 2021 12:08:41 +0000 (20:08 +0800)]
crimson/os/seastore: don't use variadic template for dec_ref()

simpler this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39041 from ifed01/wip-ifed-fix-48966
Igor Fedotov [Tue, 2 Feb 2021 11:10:01 +0000 (14:10 +0300)]
Merge pull request #39041 from ifed01/wip-ifed-fix-48966

os/bluestore: fix a bug causing unexpected Onode's unpinned state.

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #38869 into master
Jan Fajerski [Tue, 2 Feb 2021 09:46:35 +0000 (10:46 +0100)]
Merge PR #38869 into master

* refs/pull/38869/head:
ceph-volume: Fix usage of is_lv

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
4 years agoMerge pull request #38975 from athanatos/sjust/wip-seastore-pipelines
Kefu Chai [Tue, 2 Feb 2021 09:40:37 +0000 (17:40 +0800)]
Merge pull request #38975 from athanatos/sjust/wip-seastore-pipelines

seastore: update to support pipelined write operations

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoos/bluestore: fix a bug causing unexpected Onode's unpinned state. 39041/head
Igor Fedotov [Sat, 23 Jan 2021 17:33:13 +0000 (20:33 +0300)]
os/bluestore: fix a bug causing unexpected Onode's unpinned state.

There could be a race for Onodes put() and get() methods:

put()(pinned, nref=3)
  int n = --nref; (nref = 2)
  if (n == 2) {
    ..
    std::lock_guard l(ocs->lock);
    ...
    pinned = pinned && nref > 2; (= false)
    ...                                     get()
    if (r) {                                ++nref; (=3)
      n = --nref; (nref = 2)                return;
    }
    ...
    return

As a result nref = 2, pinned = false which is wrong

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
4 years agoosd: fix to call nullptr when cancel_manifest_ops 39217/head
myoungwon oh [Tue, 2 Feb 2021 06:43:14 +0000 (15:43 +0900)]
osd: fix to call nullptr when cancel_manifest_ops

Segmentation fault can occur because
cancel_manifest_ops must call callback without checking
nullptr even though ManifestOp can be used with null callback
in start_dedup()

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsumg.com>
4 years agoMerge pull request #39205 from rzarzynski/wip-crimson-configurable-alien-threads-num
Kefu Chai [Tue, 2 Feb 2021 06:04:59 +0000 (14:04 +0800)]
Merge pull request #39205 from rzarzynski/wip-crimson-configurable-alien-threads-num

crimson: make the number of alien threads configurable.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
4 years agocephadm:updates following bootstrap code clean up 38911/head
Paul Cuzner [Tue, 2 Feb 2021 02:42:00 +0000 (15:42 +1300)]
cephadm:updates following bootstrap code clean up

Patch to align to new(ish) bootstrap code changes

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agocephadm: updated doc text
Paul Cuzner [Thu, 28 Jan 2021 03:35:57 +0000 (16:35 +1300)]
cephadm: updated doc text

The phrase "recommended"  has been removed.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agocephadm: unit test updates for cluster-network handling
Paul Cuzner [Sun, 17 Jan 2021 23:24:16 +0000 (12:24 +1300)]
cephadm: unit test updates for cluster-network handling

Tests updated to handle comma separated subnet lists

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agocephadm: updated handling of cluster_network parameter
Paul Cuzner [Sun, 17 Jan 2021 23:20:23 +0000 (12:20 +1300)]
cephadm: updated handling of cluster_network parameter

Parameter now supports a comma separated list of subnets and
detects the ipv4 or ipv6 setting on the cluster network to enable
osds to bind correctly.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agocephadm: install doc updated to include cluster-network parameter
Paul Cuzner [Thu, 14 Jan 2021 22:08:48 +0000 (11:08 +1300)]
cephadm: install doc updated to include cluster-network parameter

Install guide updated to include a description of the --cluster-network
parameter. The text also links to the complete definition for cluster-network
on the rados/configuration/network-config-ref page.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agocephadm: unit test updates for new subnet function
Paul Cuzner [Thu, 14 Jan 2021 20:56:15 +0000 (09:56 +1300)]
cephadm: unit test updates for new subnet function

Adds tests to validate the check_subnet function will work as
expected with various inputs

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agocephadm: Add cluster network parameter to bootstrap cmd
Paul Cuzner [Thu, 14 Jan 2021 20:53:34 +0000 (09:53 +1300)]
cephadm: Add cluster network parameter to bootstrap cmd

Adds a --cluster-network parameter to the bootstrap cmd to
set the internal cluster network.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agoMerge pull request #38956 from zdover23/2021_Jan_19_release_notes_grammar
Josh Durgin [Mon, 1 Feb 2021 23:31:48 +0000 (15:31 -0800)]
Merge pull request #38956 from zdover23/2021_Jan_19_release_notes_grammar

doc/PendingReleaseNotes: grammar and wording

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agomgr/cephadm/upgrade: tolerate pre-pacific upgrade state 39069/head
Sage Weil [Sat, 30 Jan 2021 22:35:21 +0000 (16:35 -0600)]
mgr/cephadm/upgrade: tolerate pre-pacific upgrade state

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/upgrade: scale down MDS cluster(s) for major version upgrades
Sage Weil [Tue, 26 Jan 2021 22:10:13 +0000 (16:10 -0600)]
mgr/cephadm/upgrade: scale down MDS cluster(s) for major version upgrades

For octopus -> pacific, as with other recent releases, we need to scale
down the MDS cluster(s) to a single daemon before upgrading.  (This is
because the MDS intra-cluster protocols aren't fully versioned.)

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: fix capitalization, level; drop elipses of log msgs
Sage Weil [Thu, 28 Jan 2021 15:02:27 +0000 (09:02 -0600)]
mgr/cephadm: fix capitalization, level; drop elipses of log msgs

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/upgrade: match against any repo_digest, not image_id
Sage Weil [Wed, 27 Jan 2021 14:54:00 +0000 (08:54 -0600)]
mgr/cephadm/upgrade: match against any repo_digest, not image_id

The image id can vary across hosts and (most notably) docker vs podman.
Instead, use the repo_digest as an image identifier.

Unfortunately, a single image may have multiple digests, even within the
same registry, so keep a list of the digests for the image we are
upgrading to, and ensure that each container has a digest that matches at
least one of them.

This allows upgrade to proceed in mixed docker+podman clusters.  However,
it does not yet address a cluster with mixed CPU architectures, because
the container image will have different digest(s) for each architecture
build.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: return repo_digests (plural) in pull/inspect output
Sage Weil [Wed, 27 Jan 2021 14:12:00 +0000 (08:12 -0600)]
cephadm: return repo_digests (plural) in pull/inspect output

When we inspect a (pulled) image, return all of the repo digests.  Update
the mgr/cephadm code accordingly to match.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #39149 into master
Sage Weil [Mon, 1 Feb 2021 22:25:01 +0000 (16:25 -0600)]
Merge PR #39149 into master

* refs/pull/39149/head:
qa/workunits/cephtool/test.sh: tolerate some settling for osd info vs dump test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agomgr/cephadm: include container_image_digests in inventory
Sage Weil [Wed, 27 Jan 2021 14:02:25 +0000 (08:02 -0600)]
mgr/cephadm: include container_image_digests in inventory

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: include image_digests list in 'ls' output
Sage Weil [Wed, 27 Jan 2021 13:50:14 +0000 (07:50 -0600)]
cephadm: include image_digests list in 'ls' output

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agovstart.sh: only extract first container digest
Sage Weil [Tue, 26 Jan 2021 19:11:13 +0000 (13:11 -0600)]
vstart.sh: only extract first container digest

Otherwise the container_image value includes the same hash twice, separated
by a newline, causing all sorts of confusion.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: move release -> major translation to helper
Sage Weil [Tue, 26 Jan 2021 15:24:54 +0000 (09:24 -0600)]
mgr/cephadm: move release -> major translation to helper

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/upgrade: tolerate old upgrade_state.target_versoin
Sage Weil [Tue, 26 Jan 2021 15:24:38 +0000 (09:24 -0600)]
mgr/cephadm/upgrade: tolerate old upgrade_state.target_versoin

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm/upgrade: set require-osd-release when done with OSDs
Sage Weil [Mon, 25 Jan 2021 23:21:05 +0000 (17:21 -0600)]
mgr/cephadm/upgrade: set require-osd-release when done with OSDs

After we've upgraded all of the osds, complete the major version upgrade
for core RADOS by setting the OSD cluster min.

Signed-off-by: Sage Weil <sage@newdream.net>