]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agolibrbd: api::Io now properly passing the parent trace information
Jason Dillaman [Thu, 14 May 2020 16:31:42 +0000 (12:31 -0400)]
librbd: api::Io now properly passing the parent trace information

A copy-and-paste error from moving the original implentation from
ImageRequestWQ resulted in the parent trace being incorrectly
uninitialized.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: ensure in-flight read-ahead + copy-on-read ops are finalized
Jason Dillaman [Fri, 8 May 2020 15:36:32 +0000 (11:36 -0400)]
librbd: ensure in-flight read-ahead + copy-on-read ops are finalized

Now that the image dispatcher isn't flushing AsyncOperations with each
flush request, we need to ensure that we flush all background ops prior
to fully closing the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: remove io::ImageRequestWQ
Jason Dillaman [Fri, 8 May 2020 03:03:08 +0000 (23:03 -0400)]
librbd: remove io::ImageRequestWQ

This has been fully deprecated in favor of the new plugable image
dispatcher system.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: switch to new api::Io dispatch helper methods
Jason Dillaman [Fri, 8 May 2020 01:55:44 +0000 (21:55 -0400)]
librbd: switch to new api::Io dispatch helper methods

This is another step in the removal of ImageRequestWQ in favor
of the new ImageDispatcher.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: created new api::Io helper methods
Jason Dillaman [Tue, 5 May 2020 20:02:58 +0000 (16:02 -0400)]
librbd: created new api::Io helper methods

These will be invoked by the user API and wrap various user API
specific logic.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: exclusive-lock dispatch flush pseudo-handling
Jason Dillaman [Thu, 7 May 2020 18:54:36 +0000 (14:54 -0400)]
librbd: exclusive-lock dispatch flush pseudo-handling

Ensure that the exclusive-lock layer tracks all in-flight IOs so that
it can flush the IOs from lower layers when the lock becomes required.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: qos dispatch flush pseudo-handling
Jason Dillaman [Thu, 7 May 2020 20:58:40 +0000 (16:58 -0400)]
librbd: qos dispatch flush pseudo-handling

Flush requests will be properly queued behind write operations to
ensure data consistency.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: generic helper for tracking in-flight IO and managing flush requests
Jason Dillaman [Thu, 7 May 2020 20:25:50 +0000 (16:25 -0400)]
librbd: generic helper for tracking in-flight IO and managing flush requests

Layers that potentially queue IOs but not all IOs will need to track all
in-flight IOs to properly ensure that a flush cannot complete while
older IO is still stuck in a queue.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: temporarily redirect ImageRequestWQ IO through ImageDispatcher
Jason Dillaman [Tue, 5 May 2020 23:35:58 +0000 (19:35 -0400)]
librbd: temporarily redirect ImageRequestWQ IO through ImageDispatcher

The next series of commits will work to remove ImageRequestWQ from librbd.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: complete ImageDispatchSpec upon AioCompletion finalization
Jason Dillaman [Wed, 6 May 2020 14:52:58 +0000 (10:52 -0400)]
librbd: complete ImageDispatchSpec upon AioCompletion finalization

This will allow ImageDispatchSpec to invoke any necessary finalizers
for the different dispatch layers and allows in-flight IO to be tracked
since the image dispatch layer finalizers won't be invoked until after
the AioCompletion fires.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: switched IO (un)block_write calls to new queue image dispatcher
Jason Dillaman [Tue, 5 May 2020 15:48:06 +0000 (11:48 -0400)]
librbd: switched IO (un)block_write calls to new queue image dispatcher

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: queue image IO dispatch layer
Jason Dillaman [Thu, 30 Apr 2020 17:07:33 +0000 (13:07 -0400)]
librbd: queue image IO dispatch layer

This layer replaces the queue implemented by ImageRequestWQ and handles
blocking all write requests through the dispatch pipeline.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: exclusive lock image IO dispatch layer
Jason Dillaman [Wed, 29 Apr 2020 23:17:12 +0000 (19:17 -0400)]
librbd: exclusive lock image IO dispatch layer

This layer will handle acquiring the exclusive lock if required upon
incoming IO requests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: refresh image IO dispatch layer
Jason Dillaman [Wed, 29 Apr 2020 22:10:47 +0000 (18:10 -0400)]
librbd: refresh image IO dispatch layer

This layer will handle refreshing the image if required upon incoming
IO requests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: QoS image io dispatch layer
Jason Dillaman [Wed, 29 Apr 2020 17:05:35 +0000 (13:05 -0400)]
librbd: QoS image io dispatch layer

Re-implement the existing QoS throttling behavior from ImageRequestWQ
as a new image IO dispatch layer. The existing QoS hooks in
ImageRequestWQ are temporarily hooked to the new layer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: support a finish handler for image IO dispatch layers
Jason Dillaman [Fri, 1 May 2020 01:13:08 +0000 (21:13 -0400)]
librbd: support a finish handler for image IO dispatch layers

This will be faster than allocating per-IO Context callbacks for
layers that need to track the in-flight state of particular IOs.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: init and shut down image IO dispatch layer
Jason Dillaman [Fri, 1 May 2020 01:37:56 +0000 (21:37 -0400)]
librbd: init and shut down image IO dispatch layer

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: initial implementation for image IO dispatcher
Jason Dillaman [Wed, 29 Apr 2020 13:52:33 +0000 (09:52 -0400)]
librbd: initial implementation for image IO dispatcher

This is similar to the object IO dispatcher but it expects image extents
for IO operations.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: add image dispatch layer to image dispatch spec
Jason Dillaman [Mon, 4 May 2020 23:21:06 +0000 (19:21 -0400)]
librbd: add image dispatch layer to image dispatch spec

This will allow image extent-based IOs to skip layers. Also added helpful
enums for the start of user-based API requests and internal requests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: added io::ImageDispatchSpec::C_Dispatcher
Jason Dillaman [Wed, 29 Apr 2020 00:34:34 +0000 (20:34 -0400)]
librbd: added io::ImageDispatchSpec::C_Dispatcher

This will assist with dispatching image extent-based IO requests
through the image IO dispatcher system (to be added in a later commit).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: move generic IO dispatcher logic to base class
Jason Dillaman [Wed, 29 Apr 2020 03:38:18 +0000 (23:38 -0400)]
librbd: move generic IO dispatcher logic to base class

This will allow re-use between the existing ObjectDispatcher and
the ImageDispatcher that will be added in a future commit.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agocommon: TokenBucketThrottle should use perfect forwarding for item
Jason Dillaman [Wed, 29 Apr 2020 16:27:46 +0000 (12:27 -0400)]
common: TokenBucketThrottle should use perfect forwarding for item

This will allow more than just a pointer to an item to be passed to
the callback.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31889 from ofriedma/wip-ofriedma-reshard-debug
ofriedma [Thu, 14 May 2020 15:11:00 +0000 (18:11 +0300)]
Merge pull request #31889 from ofriedma/wip-ofriedma-reshard-debug

rgw: Fix reshard log so we can know why the reshard is returning error

5 years agoMerge pull request #34003 from AmnonHanuhov/wip-radosbench_4k_rw_yaml
Kefu Chai [Thu, 14 May 2020 14:16:13 +0000 (22:16 +0800)]
Merge pull request #34003 from AmnonHanuhov/wip-radosbench_4k_rw_yaml

test/crimson: Added CPU cycles per operation as an acceptance criteria to radosbench_4k_r/w yaml

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34981 from sebastian-philipp/doc-dev-cephadm-cuncurrency
Sebastian Wagner [Thu, 14 May 2020 13:15:08 +0000 (15:15 +0200)]
Merge pull request #34981 from sebastian-philipp/doc-dev-cephadm-cuncurrency

doc/dev/cephadm: Note regarding network calls form CLI handlers

Reviewed-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge pull request #35066 from rzarzynski/wip-crimson-omap_get_keys-num
Kefu Chai [Thu, 14 May 2020 11:50:40 +0000 (19:50 +0800)]
Merge pull request #35066 from rzarzynski/wip-crimson-omap_get_keys-num

crimson/osd: fix key num handling in PGBackend::omap_get_keys().

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34668 from zdover23/wip-doc-ceph-orch-zap-45128
Sebastian Wagner [Thu, 14 May 2020 11:39:49 +0000 (13:39 +0200)]
Merge pull request #34668 from zdover23/wip-doc-ceph-orch-zap-45128

doc/ceph orch: Add ceph orch zap command

Reviewed-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge pull request #34944 from jschmid1/fix_osdspec_affinity_passing
Sebastian Wagner [Thu, 14 May 2020 11:31:14 +0000 (13:31 +0200)]
Merge pull request #34944 from jschmid1/fix_osdspec_affinity_passing

mgr/cephadm: fix env_var passing to cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #35030 from mgfritch/cephadm-shell-mount-special
Sebastian Wagner [Thu, 14 May 2020 11:30:34 +0000 (13:30 +0200)]
Merge pull request #35030 from mgfritch/cephadm-shell-mount-special

cephadm: fix shell mount for special files

Reviewed-by: Matthew Oliver <moliver@suse.com>
5 years agocrimson/osd: fix key num handling in PGBackend::omap_get_keys(). 35066/head
Radoslaw Zarzynski [Thu, 14 May 2020 10:17:05 +0000 (12:17 +0200)]
crimson/osd: fix key num handling in PGBackend::omap_get_keys().

The patch fixes running-out-of-buffer when decoding the data
from `omap_get_keys()`. In some cases, the declared number
of encoded keys is greater by 1 from the actual causing execption
`buffer::end_of_buffer` to be thrown at decoder.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #35011 from dillaman/wip-45504
Mykola Golub [Thu, 14 May 2020 09:20:41 +0000 (12:20 +0300)]
Merge pull request #35011 from dillaman/wip-45504

pybind/rbd: RBD.create() method's 'old_format' parameter now defaults to False

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #35022 from sebastian-philipp/cephadm-add-host-oserror
Sebastian Wagner [Thu, 14 May 2020 06:44:13 +0000 (08:44 +0200)]
Merge pull request #35022 from sebastian-philipp/cephadm-add-host-oserror

mgr/cephadm: Remove AsyncCompletion

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #34976 from changchengx/bufferlist_ut
Kefu Chai [Thu, 14 May 2020 03:34:37 +0000 (11:34 +0800)]
Merge pull request #34976 from changchengx/bufferlist_ut

test/bufferlist: fix and cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #35056 from agayev/fix-do-make
Kefu Chai [Thu, 14 May 2020 03:24:15 +0000 (11:24 +0800)]
Merge pull request #35056 from agayev/fix-do-make

do_cmake.sh: do not unnecessarily warn about debug build

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #35029 from yuriw/wip-yuriw-subsets-master
Yuri Weinstein [Wed, 13 May 2020 22:57:35 +0000 (15:57 -0700)]
Merge pull request #35029 from yuriw/wip-yuriw-subsets-master

qa/tests: reduce number of jobs for rados to 309

5 years agodo_cmake.sh: do not unnecessarily warn about debug build 35056/head
Abutalib Aghayev [Wed, 13 May 2020 21:07:55 +0000 (17:07 -0400)]
do_cmake.sh: do not unnecessarily warn about debug build

do_cmake.sh forgets to check the arguments passed to it and ends up warning
about debug build even if a user specifies a release build.

Signed-off-by: Abutalib Aghayev <agayev@gmail.com>
5 years agoMerge pull request #34969 from pritha-srivastava/wip-rgw-gc-fix
Casey Bodley [Wed, 13 May 2020 18:36:48 +0000 (14:36 -0400)]
Merge pull request #34969 from pritha-srivastava/wip-rgw-gc-fix

cls/rgw_gc: Fixing the iterator used to access urgent data map

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34965 from Devp00l/wip-45433
Laura Paduano [Wed, 13 May 2020 14:36:48 +0000 (16:36 +0200)]
Merge pull request #34965 from Devp00l/wip-45433

mgr/dashboard: Always use fast angular unit tests

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #35041 from smithfarm/wip-tcmalloc-nit
Nathan Cutler [Wed, 13 May 2020 13:53:10 +0000 (15:53 +0200)]
Merge pull request #35041 from smithfarm/wip-tcmalloc-nit

doc: fix TCMalloc spelling

Reviewed-by: Zac Dover <zac.dover@gmail.com>
5 years agoMerge pull request #33121 from tspmelo/wip-angular-9
Laura Paduano [Wed, 13 May 2020 12:33:24 +0000 (14:33 +0200)]
Merge pull request #33121 from tspmelo/wip-angular-9

mgr/dashboard: Update to Angular 9

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agodoc: fix TCMalloc spelling 35041/head
Nathan Cutler [Wed, 13 May 2020 11:59:56 +0000 (13:59 +0200)]
doc: fix TCMalloc spelling

The google/tcmalloc page on GitHub refers to "TCMalloc", not
"tc_malloc".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #35010 from pcuzner/k8sevents-sanitise
Sebastian Wagner [Wed, 13 May 2020 10:38:05 +0000 (12:38 +0200)]
Merge pull request #35010 from pcuzner/k8sevents-sanitise

mgr/k8sevents:sanitise kubernetes events

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34972 from tspmelo/wip-fix-45445
Lenz Grimmer [Wed, 13 May 2020 09:22:17 +0000 (11:22 +0200)]
Merge pull request #34972 from tspmelo/wip-fix-45445

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #33886 from sebastian-philipp/doc-mon-command-api
Sebastian Wagner [Wed, 13 May 2020 09:21:10 +0000 (11:21 +0200)]
Merge pull request #33886 from sebastian-philipp/doc-mon-command-api

doc: Add a generated reference of all mon commands.

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
5 years agoMerge pull request #35017 from tspmelo/wip-fix-fakefs
Lenz Grimmer [Wed, 13 May 2020 09:12:32 +0000 (11:12 +0200)]
Merge pull request #35017 from tspmelo/wip-fix-fakefs

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #34956 from tchaikov/wip-qa-tasks-cephfs-py3
Kefu Chai [Wed, 13 May 2020 07:21:41 +0000 (15:21 +0800)]
Merge pull request #34956 from tchaikov/wip-qa-tasks-cephfs-py3

qa/tasks/cephfs: remove sys.exc_clear() calls

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #34857 from tchaikov/wip-qa-tasks-no-filter
Kefu Chai [Wed, 13 May 2020 06:10:24 +0000 (14:10 +0800)]
Merge pull request #34857 from tchaikov/wip-qa-tasks-no-filter

qa/tasks: use list comprehension for checking the length

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr/dashboard: Add dashboard node script 33121/head
Tiago Melo [Sun, 26 Apr 2020 14:16:58 +0000 (14:16 +0000)]
mgr/dashboard: Add dashboard node script

This file should be used to agregate all external scripts we need.
Multiple flags can be used in the same call.

Available flags:

--env: Generates angular environment files.

--pre: Modifies 'angular.json' to enable the build of custom locales using
       angular --localize.
       Languages can be defined using the environment variable LANGS,
       if no value is provided all languages will be build.
       Default language is always build, even if not provided.
       p.e.: 'LANGS="pt" node cd --pre', will build EN and PT.
       For backward compatibility we accept both long and short version of
       languages, p.e.: 'pt' and 'pt-BR'

--post: Restores 'angular.json' to its original.

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Remove ngcc warnings
Tiago Melo [Thu, 26 Mar 2020 13:10:14 +0000 (12:10 -0100)]
mgr/dashboard: Remove ngcc warnings

Some packages are still not updated to be compatible with Angular 9
and can cause warnings.

I have whitelisted some that work well, so we don't see the warning every time.

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Update Node.js to latest LTS: v12.16.2
Tiago Melo [Tue, 24 Mar 2020 12:45:13 +0000 (11:45 -0100)]
mgr/dashboard: Update Node.js to latest LTS: v12.16.2

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Update npm dependencies
Tiago Melo [Wed, 29 Apr 2020 09:04:48 +0000 (09:04 +0000)]
mgr/dashboard: Update npm dependencies

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Fix SCSS imports
Tiago Melo [Thu, 7 Nov 2019 15:10:17 +0000 (14:10 -0100)]
mgr/dashboard: Fix SCSS imports

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Fix i18n configuration
Tiago Melo [Fri, 7 Feb 2020 17:17:35 +0000 (16:17 -0100)]
mgr/dashboard: Fix i18n configuration

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Few linting fixes
Tiago Melo [Tue, 24 Mar 2020 11:11:37 +0000 (10:11 -0100)]
mgr/dashboard: Few linting fixes

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Update Angular to v9
Tiago Melo [Wed, 29 Apr 2020 09:01:49 +0000 (09:01 +0000)]
mgr/dashboard: Update Angular to v9

This was done with "ng update" cli command.

Fixes: https://tracker.ceph.com/issues/44829
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agocephadm: return absolute path from pathify 35030/head
Michael Fritch [Tue, 12 May 2020 19:12:15 +0000 (13:12 -0600)]
cephadm: return absolute path from pathify

normalizes the user defined paths a bit better to avoid inconsistent
results with os.path.basename(), os.path.join(), etc.

For example:
$ cephadm shell --mount ~/

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/tests: reduce number of jobs for rados to 309 35029/head
Yuri Weinstein [Tue, 12 May 2020 22:40:01 +0000 (15:40 -0700)]
qa/tests: reduce number of jobs for rados to 309

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: add shell mount test
Michael Fritch [Mon, 11 May 2020 22:41:28 +0000 (16:41 -0600)]
qa/workunits/cephadm/test_cephadm.sh: add shell mount test

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: fix shell mount for special files
Michael Fritch [Mon, 11 May 2020 22:30:34 +0000 (16:30 -0600)]
cephadm: fix shell mount for special files

block/char devs, named pipes, sockets etc

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #35009 from ivancich/wip-orphan-pending-rel-notes
J. Eric Ivancich [Tue, 12 May 2020 21:30:38 +0000 (17:30 -0400)]
Merge pull request #35009 from ivancich/wip-orphan-pending-rel-notes

PendingReleaseNotes: rgw-orphan-list, deprecation, and fixes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
5 years agoMerge PR #34978 into master
Patrick Donnelly [Tue, 12 May 2020 18:59:51 +0000 (11:59 -0700)]
Merge PR #34978 into master

* refs/pull/34978/head:
qa/tasks/cephfs/mount.py: always setup the NAT rules
qa/tasks/cephfs/mount.py: fall back to use ip command to setup the bridge

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
5 years agoIncorporating sebastian-philipp's suggestions. 34668/head
Zac Dover [Tue, 12 May 2020 17:05:56 +0000 (03:05 +1000)]
Incorporating sebastian-philipp's suggestions.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
5 years agoMerge pull request #35021 from tchaikov/wip-cephfs-shell-pep8
Kefu Chai [Tue, 12 May 2020 16:41:25 +0000 (00:41 +0800)]
Merge pull request #35021 from tchaikov/wip-cephfs-shell-pep8

cephfs-shell: fix warnings reported by flake8

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agomgr/cephadm: Remove AsyncCompletion 35022/head
Sebastian Wagner [Tue, 12 May 2020 14:16:39 +0000 (16:16 +0200)]
mgr/cephadm: Remove AsyncCompletion

Simplyfy things a lot by not using multiprocessing.pool.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agocephfs-shell: fix warnings reported by flake8 35021/head
Kefu Chai [Tue, 12 May 2020 14:15:57 +0000 (22:15 +0800)]
cephfs-shell: fix warnings reported by flake8

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34746 from tspmelo/wip-form-loading
Lenz Grimmer [Tue, 12 May 2020 13:39:23 +0000 (15:39 +0200)]
Merge pull request #34746 from tspmelo/wip-form-loading

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agomgr/cephadm: Proper error for OSErrors
Sebastian Wagner [Tue, 12 May 2020 13:20:57 +0000 (15:20 +0200)]
mgr/cephadm: Proper error for OSErrors

Previsously, an OSError resulted in

    OSError: cannot send (already closed?)

which is not helpful.

Fixes: https://tracker.ceph.com/issues/45032
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: Fix HomeTest setup 35017/head
Tiago Melo [Tue, 12 May 2020 10:29:02 +0000 (10:29 +0000)]
mgr/dashboard: Fix HomeTest setup

'setup_controllers' was being called outside of the fake fs mock,
so the tests would fail if there was no real dist folder.

Fixes: https://tracker.ceph.com/issues/45516
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/cephadm: disable env_var passing until pr#34835 is merged 34944/head
Joshua Schmid [Tue, 12 May 2020 10:10:43 +0000 (12:10 +0200)]
mgr/cephadm: disable env_var passing until pr#34835 is merged

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/cephadm: generate and pass env vars to cephadm
Joshua Schmid [Tue, 12 May 2020 10:09:55 +0000 (12:09 +0200)]
mgr/cephadm: generate and pass env vars to cephadm

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agopython-common: do not pass envs after entrypoint
Joshua Schmid [Tue, 12 May 2020 10:08:52 +0000 (12:08 +0200)]
python-common: do not pass envs after entrypoint

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agobin/cephadm: move --env-var handling to global argparser
Joshua Schmid [Tue, 12 May 2020 10:08:11 +0000 (12:08 +0200)]
bin/cephadm: move --env-var handling to global argparser

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/cephadm: adapt env_var handling
Joshua Schmid [Tue, 12 May 2020 10:07:45 +0000 (12:07 +0200)]
mgr/cephadm: adapt env_var handling

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agodoc/dev/cephadm: Note regarding network calls form CLI handlers 34981/head
Sebastian Wagner [Mon, 11 May 2020 11:48:19 +0000 (13:48 +0200)]
doc/dev/cephadm: Note regarding network calls form CLI handlers

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34888 from jmolmo/fix_command_parse
Sebastian Wagner [Tue, 12 May 2020 07:58:29 +0000 (09:58 +0200)]
Merge pull request #34888 from jmolmo/fix_command_parse

cephadm: Fix error parsing shell command arguments

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34945 from sebastian-philipp/cephadm-remove-async-map-resurrect
Sebastian Wagner [Tue, 12 May 2020 07:54:25 +0000 (09:54 +0200)]
Merge pull request #34945 from sebastian-philipp/cephadm-remove-async-map-resurrect

mgr/cephadm: replace async_map_completion with a simple wrapper (again)

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #34970 from sebastian-philipp/bluestore-revert-sharding
Sebastian Wagner [Tue, 12 May 2020 07:42:33 +0000 (09:42 +0200)]
Merge pull request #34970 from sebastian-philipp/bluestore-revert-sharding

Revert "os/bluestore: Enable sharding by default"

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
5 years agoMerge pull request #34977 from mgfritch/cephadm-prom-encoding
Sebastian Wagner [Tue, 12 May 2020 07:38:00 +0000 (09:38 +0200)]
Merge pull request #34977 from mgfritch/cephadm-prom-encoding

mgr/cephadm: ceph_default_alerts.yml can be utf-8 encoded

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agotest/bufferlist: add space between string and time info 34976/head
Changcheng Liu [Tue, 12 May 2020 03:41:49 +0000 (11:41 +0800)]
test/bufferlist: add space between string and time info

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agotest/bufferlist: test move assignment operator not move constructor
Changcheng Liu [Sun, 10 May 2020 08:45:19 +0000 (16:45 +0800)]
test/bufferlist: test move assignment operator not move constructor

"bufferlist move = std::move(bl)" exercises the "move constructor".
But the purpose of this test is to verify the functionality of
"move assignment operator".
So this PR construct "move" first, and then assign rvalue reference to it.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agotest/bufferlist: correct the usage of string constructor
Changcheng Liu [Sun, 10 May 2020 02:29:44 +0000 (10:29 +0800)]
test/bufferlist: correct the usage of string constructor

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agoqa/tasks/cephfs/mount.py: always setup the NAT rules 34978/head
Xiubo Li [Tue, 12 May 2020 03:13:14 +0000 (23:13 -0400)]
qa/tasks/cephfs/mount.py: always setup the NAT rules

If the last test failed just after the 'ceph-brx' bridge is created
but with setuping the NAT rules in iptables, so if we run the test
case again, it will just skip seting the 'ceph-brx' and the NAT rules.
Then deleting the NAT rules will get the errors like:

iptables: Bad rule (does a matching rule exist in that chain?).

Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agoqa/tasks/cephfs/mount.py: fall back to use ip command to setup the bridge
Xiubo Li [Tue, 12 May 2020 02:26:51 +0000 (22:26 -0400)]
qa/tasks/cephfs/mount.py: fall back to use ip command to setup the bridge

CentOS/RHEL8 have abandoned the bridge-utils package so the brctl
cmd is none avalible, and on Ubuntu 18.04 and 20.04 the nmcli is
buggy to setup the bridge. So this will fall back to use ip cmd
to setup the bridge stuff.

Fixes: https://tracker.ceph.com/issues/45459
Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agoMerge pull request #34955 from tchaikov/wip-cbt-with-bluestore
Kefu Chai [Tue, 12 May 2020 02:37:48 +0000 (10:37 +0800)]
Merge pull request #34955 from tchaikov/wip-cbt-with-bluestore

scripts/run-cbt.sh: use bluestore for testing classic osd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #34962 into master
Patrick Donnelly [Tue, 12 May 2020 02:35:18 +0000 (19:35 -0700)]
Merge PR #34962 into master

* refs/pull/34962/head:
vstart_runner.py: use tuple instead of set

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agopybind/rbd: RBD.create() method's 'old_format' parameter now defaults to False 35011/head
Jason Dillaman [Mon, 11 May 2020 23:55:50 +0000 (19:55 -0400)]
pybind/rbd: RBD.create() method's 'old_format' parameter now defaults to False

The RBD v1 format has been deprecated for numerous releases and creation of
v1 format images has been disabled since the Mimic release. This fixes
the Python API's image create() method to ensure v2 images are created by
default (and no longer throw an exception that creation of v1 images are
disabled).

Fixes: https://tracker.ceph.com/issues/45504
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/k8sevents:sanitise kubernetes events 35010/head
Paul Cuzner [Mon, 11 May 2020 21:22:07 +0000 (09:22 +1200)]
mgr/k8sevents:sanitise kubernetes events

Kubernetes can generate events without a timestamp
or an event count. When this occurs the k8sevents 'ls'
command fails due to None type values. This patch
sanitises the event received before adding to the
internal data structures to account for these
issues.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
5 years agoPendingReleaseNotes: add missing quote character 35009/head
J. Eric Ivancich [Mon, 11 May 2020 19:18:08 +0000 (15:18 -0400)]
PendingReleaseNotes: add missing quote character

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoPendingReleaseNotes: `rgw-orphan-list` and deprecated `radosgw-admin orphans`
J. Eric Ivancich [Mon, 11 May 2020 19:16:36 +0000 (15:16 -0400)]
PendingReleaseNotes: `rgw-orphan-list` and deprecated `radosgw-admin orphans`

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #34938 from mgfritch/cephadm-systemd-stop-timeout
Sebastian Wagner [Mon, 11 May 2020 14:49:02 +0000 (16:49 +0200)]
Merge pull request #34938 from mgfritch/cephadm-systemd-stop-timeout

cephadm: extend systemd stop timeout

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34905 from tspmelo/wip-mirroring
Lenz Grimmer [Mon, 11 May 2020 13:58:18 +0000 (15:58 +0200)]
Merge pull request #34905 from tspmelo/wip-mirroring

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
5 years agovstart_runner.py: use tuple instead of set 34962/head
Rishabh Dave [Fri, 8 May 2020 11:40:24 +0000 (17:10 +0530)]
vstart_runner.py: use tuple instead of set

Using python3 leads to an error that says
"TypeError: unhashable type: 'Raw'".

Fixes: https://tracker.ceph.com/issues/45446
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge pull request #34926 from sebastian-philipp/mgr-mock-mon-store
Sebastian Wagner [Mon, 11 May 2020 12:05:06 +0000 (14:05 +0200)]
Merge pull request #34926 from sebastian-philipp/mgr-mock-mon-store

pybind/mgr: properly mock the mon store for pytest

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoRevert "os/bluestore: Enable sharding by default" 34970/head
Sebastian Wagner [Fri, 8 May 2020 22:13:31 +0000 (00:13 +0200)]
Revert "os/bluestore: Enable sharding by default"

This reverts commit aa1a116f9eef5d6fbe09d6ed99910223451431f1.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: ceph_default_alerts.yml can be utf-8 encoded 34977/head
Michael Fritch [Mon, 11 May 2020 00:43:21 +0000 (18:43 -0600)]
mgr/cephadm: ceph_default_alerts.yml can be utf-8 encoded

non-ascii chars introduced by 653c3f66823

Fixes: https://tracker.ceph.com/issues/45458
Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #34948 into master
Patrick Donnelly [Sat, 9 May 2020 16:53:33 +0000 (09:53 -0700)]
Merge PR #34948 into master

* refs/pull/34948/head:
doc/cephfs-shell: Add quota command usage
doc/cephfs-shell: Add du command usage
doc/cephfs-shell: Add df command usage

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge pull request #34958 from yuvalif/fix_versioning_in_notif
Yuval Lifshitz [Sat, 9 May 2020 08:52:09 +0000 (11:52 +0300)]
Merge pull request #34958 from yuvalif/fix_versioning_in_notif

rgw/notifications: version id was not sent in versioned buckets

5 years agoMerge pull request #34967 from tchaikov/wip-rpm-fmt
Kefu Chai [Sat, 9 May 2020 08:24:46 +0000 (16:24 +0800)]
Merge pull request #34967 from tchaikov/wip-rpm-fmt

rpm: BuildRequires fmt-devel on el8

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #34781 from lxbsz/run_shell1
Kefu Chai [Sat, 9 May 2020 07:10:55 +0000 (15:10 +0800)]
Merge pull request #34781 from lxbsz/run_shell1

qa/tasks/cephfs/mount.py: run_shell to use StringIO as default

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34834 from sidharthanup/qa-test-exports-fix
Kefu Chai [Sat, 9 May 2020 06:53:10 +0000 (14:53 +0800)]
Merge pull request #34834 from sidharthanup/qa-test-exports-fix

qa/test_exports: fix TestExports failure under new py3 compability changes

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