]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agorgw: increase log level for same or older period pull msg 33527/head
Ali Maredia [Tue, 25 Feb 2020 05:29:30 +0000 (00:29 -0500)]
rgw: increase log level for same or older period pull msg

Signed-off-by: Ali Maredia <amaredia@redhat.com>
5 years agoMerge pull request #33440 from dillaman/wip-44103
Mykola Golub [Tue, 25 Feb 2020 04:35:09 +0000 (06:35 +0200)]
Merge pull request #33440 from dillaman/wip-44103

rbd-mirror: provide initial snapshot replay status

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge PR #33497 into master
Sage Weil [Tue, 25 Feb 2020 03:47:07 +0000 (21:47 -0600)]
Merge PR #33497 into master

* refs/pull/33497/head:
qa/suites/rados/singleton/all/thrash-eio: whitelist 'slow request'
qa: Whitelist 'slow request' within a bunch of tests

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #33138 into master
Sage Weil [Tue, 25 Feb 2020 03:43:51 +0000 (21:43 -0600)]
Merge PR #33138 into master

* refs/pull/33138/head:
common/TextTable: only pad between columns
mgr/status: align with ceph table style
mgr/osd_perf_query: make table match ceph style
mgr: adjust tables to have 2 space column separation
common/TextTable: default to 2 spaces separating columns

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33413 into master
Patrick Donnelly [Tue, 25 Feb 2020 02:18:19 +0000 (18:18 -0800)]
Merge PR #33413 into master

* refs/pull/33413/head:
test: verify purge queue w/ large number of subvolumes
test: pass timeout argument to mount::wait_for_dir_empty()
mgr/volumes: access volume in lockless mode when fetching async job

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agocommon/TextTable: only pad between columns 33138/head
Sage Weil [Wed, 19 Feb 2020 22:53:40 +0000 (16:53 -0600)]
common/TextTable: only pad between columns

No need to pad on the right-hand side if there are no additional columns
that follow.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33113 into master
Sage Weil [Mon, 24 Feb 2020 21:58:57 +0000 (15:58 -0600)]
Merge PR #33113 into master

* refs/pull/33113/head:
doc/mgr/telemetry: added device channel details

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33439 into master
Sage Weil [Mon, 24 Feb 2020 21:17:17 +0000 (15:17 -0600)]
Merge PR #33439 into master

* refs/pull/33439/head:
common/options.cc: make rocksdb_delete_range_threshold very high

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agorbd-mirror: implement basic status feedback for snapshot mirroring 33440/head
Jason Dillaman [Thu, 20 Feb 2020 18:47:18 +0000 (13:47 -0500)]
rbd-mirror: implement basic status feedback for snapshot mirroring

The feedback includes the newest remote mirror snapshot timestamp,
the newest completely synced local mirror snapshot timestamp,
and optionally the in-progress sync snapshot timestamp and
percent complete.

Fixes: https://tracker.ceph.com/issues/44103
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: moved local to remote snapshot lookup to common function
Jason Dillaman [Thu, 20 Feb 2020 17:57:26 +0000 (12:57 -0500)]
rbd-mirror: moved local to remote snapshot lookup to common function

This will be needed by the status formatter to lookup the remote
snapshot timestamp since the associated local snapshot timestamp
will be the time the snapshot was created on the local side.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: expand lock scope for snapshot replayer
Jason Dillaman [Thu, 20 Feb 2020 17:40:15 +0000 (12:40 -0500)]
rbd-mirror: expand lock scope for snapshot replayer

The status callback will need access to the current state, so the
lock should be held while the snapshot scan is in-progress.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: periodically update sync position for snapshot-based images
Jason Dillaman [Thu, 20 Feb 2020 00:03:40 +0000 (19:03 -0500)]
rbd-mirror: periodically update sync position for snapshot-based images

This will allow the sync to restart at the last known successfully copied
object.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33487 into master
Sage Weil [Mon, 24 Feb 2020 20:40:51 +0000 (14:40 -0600)]
Merge PR #33487 into master

* refs/pull/33487/head:
mgr/cephadm: upgrade: fix handling when target container id changes
mgr/cephadm: upgrade: handle stopped daemons

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33496 into master
Sage Weil [Mon, 24 Feb 2020 20:40:19 +0000 (14:40 -0600)]
Merge PR #33496 into master

* refs/pull/33496/head:
mgr/cephadm: combine get_daemons_by_daemon -> get_daemons_by_service
mgr/cephadm: remove apply_mon support
mgr/cephadm: use generics for add_mon
mgr/cephadm: use _apply_service for mgrs
mgr/cephadm: refactor most daemon add methods
mgr/cephadm: refactor _update_service and all apply methods
mgr/cephadm: fix get_unique_name when name in use

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33465 into master
Sage Weil [Mon, 24 Feb 2020 20:40:05 +0000 (14:40 -0600)]
Merge PR #33465 into master

* refs/pull/33465/head:
mgr/cephadm: implement placement by label
mgr/cephadm: fix self.log call in get_unique_name
mgr/cephadm: fix NodePlacement host names
mgr/tests/test_orchestrator: test PlacementSpec parsing
mgr/orch: remove label: prefix when parsing placementspec
mgr/orch: PlacementSpec: add all_hosts property

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33514 into master
Sage Weil [Mon, 24 Feb 2020 20:39:54 +0000 (14:39 -0600)]
Merge PR #33514 into master

* refs/pull/33514/head:
mgr/cephadm: drop mixin parent

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33477 into master
Sage Weil [Mon, 24 Feb 2020 20:04:04 +0000 (14:04 -0600)]
Merge PR #33477 into master

* refs/pull/33477/head:
qa/tasks/mgr/test_orchestrator_cli: fix test_host_ls

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33474 into master
Sage Weil [Mon, 24 Feb 2020 20:03:13 +0000 (14:03 -0600)]
Merge PR #33474 into master

* refs/pull/33474/head:
mgr/orch: make arg hostname, not host

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33418 into master
Sage Weil [Mon, 24 Feb 2020 19:42:08 +0000 (13:42 -0600)]
Merge PR #33418 into master

* refs/pull/33418/head:
mon: stash newer map on bootstrap when addr doesn't match

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #33285 into master
Patrick Donnelly [Mon, 24 Feb 2020 19:28:19 +0000 (11:28 -0800)]
Merge PR #33285 into master

* refs/pull/33285/head:
src/common: fix help text for echo option of cephfs-shell

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #33291 into master
Patrick Donnelly [Mon, 24 Feb 2020 19:14:34 +0000 (11:14 -0800)]
Merge PR #33291 into master

* refs/pull/33291/head:
mds: fix use-after-free in Migrater

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agomgr/cephadm: combine get_daemons_by_daemon -> get_daemons_by_service 33496/head
Sage Weil [Mon, 24 Feb 2020 16:45:37 +0000 (10:45 -0600)]
mgr/cephadm: combine get_daemons_by_daemon -> get_daemons_by_service

These were the same.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: remove apply_mon support
Sage Weil [Sun, 23 Feb 2020 19:46:08 +0000 (13:46 -0600)]
mgr/cephadm: remove apply_mon support

Our apply method doesn't support removing mons at this point.  And using
it for adding mons is just an awkward version of 'daemon add'.

Update docs and cephadm.py task accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: use generics for add_mon
Sage Weil [Sun, 23 Feb 2020 19:30:09 +0000 (13:30 -0600)]
mgr/cephadm: use generics for add_mon

Adjust apply_mon a bit so that the arg order for _create_mon is still
correct, and so that the name inference is done in the caller.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: use _apply_service for mgrs
Sage Weil [Sun, 23 Feb 2020 19:17:34 +0000 (13:17 -0600)]
mgr/cephadm: use _apply_service for mgrs

Note that we are losing some of the special logic about removing standby
mgrs only.  This should be added back *after* we fix up the scheduler
to be more intelligent about choosing hosts that already host daemons,
and make removal pick hosts that aren't selected (by label, or by
scheduler, etc.).

A few bugs to track this:
 https://tracker.ceph.com/issues/44167
 https://tracker.ceph.com/issues/44252 (prefer standby mgrs *and* mdss)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: refactor most daemon add methods
Sage Weil [Fri, 21 Feb 2020 22:56:50 +0000 (16:56 -0600)]
mgr/cephadm: refactor most daemon add methods

New _add_daemons() that shares what we can with _apply_service().

Unlike _apply_service(), the _add_daemon() path requires the user to
explicitly place daemons on hosts--no automatic placement is performed.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: refactor _update_service and all apply methods
Sage Weil [Fri, 21 Feb 2020 22:43:26 +0000 (16:43 -0600)]
mgr/cephadm: refactor _update_service and all apply methods

- Use a common _apply_service() helper
- Consolidate _add_new_daemon logic into _apply_service
- Do the NodeAssignment all in one place

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: fix get_unique_name when name in use
Sage Weil [Sun, 23 Feb 2020 19:38:25 +0000 (13:38 -0600)]
mgr/cephadm: fix get_unique_name when name in use

If we are not adding a uniqueifying suffix, we need to error out instead
of looping.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33500 from tchaikov/wip-cmake-cleanup
Kefu Chai [Mon, 24 Feb 2020 16:43:07 +0000 (00:43 +0800)]
Merge pull request #33500 from tchaikov/wip-cmake-cleanup

cmake: cleanups

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agomgr/cephadm: drop mixin parent 33514/head
Sage Weil [Mon, 24 Feb 2020 15:54:45 +0000 (09:54 -0600)]
mgr/cephadm: drop mixin parent

This was added a while back to let us block on completions, but that
code has since been removed.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: upgrade: fix handling when target container id changes 33487/head
Sage Weil [Mon, 24 Feb 2020 15:28:42 +0000 (09:28 -0600)]
mgr/cephadm: upgrade: fix handling when target container id changes

If the same target_name pulls a new hash partway through the upgrade
(e.g., because the tag was updated in the registry), we restart the
upgrade.

Fix the code so that we update target_id instead of (unused) image_id.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: upgrade: handle stopped daemons
Sage Weil [Sat, 22 Feb 2020 15:41:30 +0000 (09:41 -0600)]
mgr/cephadm: upgrade: handle stopped daemons

A stopped daemon should have the correct target_name, and we should ensure
that the host has an up-to-date image, so that when it does start it
comes up with the new image.  If it has an old image name, we should
redeploy as per usual.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/singleton/all/thrash-eio: whitelist 'slow request' 33497/head
Sage Weil [Sun, 23 Feb 2020 21:00:41 +0000 (15:00 -0600)]
qa/suites/rados/singleton/all/thrash-eio: whitelist 'slow request'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa: Whitelist 'slow request' within a bunch of tests
Sridhar Seshasayee [Mon, 24 Feb 2020 14:29:56 +0000 (19:59 +0530)]
qa: Whitelist 'slow request' within a bunch of tests

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
5 years agoMerge PR #33484 into master
Sage Weil [Mon, 24 Feb 2020 14:16:12 +0000 (08:16 -0600)]
Merge PR #33484 into master

* refs/pull/33484/head:
mgr/cephadm: catch exceptions when scraping ceph-volume inventory

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/cephadm: implement placement by label 33465/head
Sage Weil [Sun, 23 Feb 2020 15:09:38 +0000 (09:09 -0600)]
mgr/cephadm: implement placement by label

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: fix self.log call in get_unique_name
Sage Weil [Sun, 23 Feb 2020 14:23:00 +0000 (08:23 -0600)]
mgr/cephadm: fix self.log call in get_unique_name

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: fix NodePlacement host names
Sage Weil [Fri, 21 Feb 2020 21:49:18 +0000 (15:49 -0600)]
mgr/cephadm: fix NodePlacement host names

This broke back in 82e4f1e0f1332f7d4f27dd0f83d394a6f14c6bd2, I think.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/tests/test_orchestrator: test PlacementSpec parsing
Sage Weil [Fri, 21 Feb 2020 16:57:32 +0000 (10:57 -0600)]
mgr/tests/test_orchestrator: test PlacementSpec parsing

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: remove label: prefix when parsing placementspec
Sage Weil [Fri, 21 Feb 2020 16:57:16 +0000 (10:57 -0600)]
mgr/orch: remove label: prefix when parsing placementspec

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: PlacementSpec: add all_hosts property
Sage Weil [Fri, 21 Feb 2020 15:27:28 +0000 (09:27 -0600)]
mgr/orch: PlacementSpec: add all_hosts property

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33481 from tchaikov/wip-crimson-cflags
Kefu Chai [Mon, 24 Feb 2020 12:10:52 +0000 (20:10 +0800)]
Merge pull request #33481 from tchaikov/wip-crimson-cflags

cmake: move crimson-crush to crimson/

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agotest: verify purge queue w/ large number of subvolumes 33413/head
Venky Shankar [Wed, 19 Feb 2020 14:19:31 +0000 (09:19 -0500)]
test: verify purge queue w/ large number of subvolumes

Fixes: http://tracker.ceph.com/issues/44207
Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agotest: pass timeout argument to mount::wait_for_dir_empty()
Venky Shankar [Mon, 24 Feb 2020 07:27:25 +0000 (02:27 -0500)]
test: pass timeout argument to mount::wait_for_dir_empty()

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/volumes: access volume in lockless mode when fetching async job
Venky Shankar [Wed, 19 Feb 2020 12:31:40 +0000 (07:31 -0500)]
mgr/volumes: access volume in lockless mode when fetching async job

Saw a deadlock when deleting lot of subvolumes -- purge threads were
stuck in accessing global lock for volume access. This can happen
when there is a concurrent remove (which renames and signals the
purge threads) and a purge thread is just about to scan the trash
directory for entries.

For the fix, purge threads fetches entries by accessing the volume
in lockless mode. This is safe from functionality point-of-view as
the rename and directory scan is correctly handled by the filesystem.
Worst case the purge thread would pick up the trash entry on next
scan, never leaving a stale trash entry.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #33429 from votdev/add_always_on_column 32231/head
Lenz Grimmer [Mon, 24 Feb 2020 09:15:20 +0000 (09:15 +0000)]
Merge pull request #33429 from votdev/add_always_on_column

mgr/dashboard: Add 'Always-on' column to mgr module list

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agocmake: reduce the indent level 33500/head
Kefu Chai [Mon, 24 Feb 2020 04:44:11 +0000 (12:44 +0800)]
cmake: reduce the indent level

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: use loop for applying new policies
Kefu Chai [Mon, 24 Feb 2020 04:32:54 +0000 (12:32 +0800)]
cmake: use loop for applying new policies

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orch: make arg hostname, not host 33474/head
Sage Weil [Fri, 21 Feb 2020 21:17:03 +0000 (15:17 -0600)]
mgr/orch: make arg hostname, not host

For optional args, it can't be --host because this (currently) conflicts
with a core ceph option.  We change all of them for consistency.

This fixes 'ceph orch ps --host foo'.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/status: align with ceph table style
Sage Weil [Sat, 8 Feb 2020 19:24:13 +0000 (13:24 -0600)]
mgr/status: align with ceph table style

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/osd_perf_query: make table match ceph style
Sage Weil [Sat, 8 Feb 2020 19:15:06 +0000 (13:15 -0600)]
mgr/osd_perf_query: make table match ceph style

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr: adjust tables to have 2 space column separation
Sage Weil [Sat, 8 Feb 2020 19:14:29 +0000 (13:14 -0600)]
mgr: adjust tables to have 2 space column separation

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon/TextTable: default to 2 spaces separating columns
Sage Weil [Sat, 8 Feb 2020 19:13:11 +0000 (13:13 -0600)]
common/TextTable: default to 2 spaces separating columns

This is what other projects and libraries default to, and it is more
legible.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33485 into master
Sage Weil [Sun, 23 Feb 2020 21:45:01 +0000 (15:45 -0600)]
Merge PR #33485 into master

* refs/pull/33485/head:
qa/workunits/cephadm/test_adoption: run as root

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33467 into master
Sage Weil [Sun, 23 Feb 2020 21:38:32 +0000 (15:38 -0600)]
Merge PR #33467 into master

* refs/pull/33467/head:
doc/orchestrator: Substitute `host` for `node`
mgr/orchestrator: Substitute `node` with `host`, globally

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33328 into master
Sage Weil [Sun, 23 Feb 2020 21:12:48 +0000 (15:12 -0600)]
Merge PR #33328 into master

* refs/pull/33328/head:
osd/OSD: Log slow ops/types to cluster logs

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #33380 into master
Sage Weil [Sun, 23 Feb 2020 21:12:20 +0000 (15:12 -0600)]
Merge PR #33380 into master

* refs/pull/33380/head:
common/admin_socket: Added printing of error message constucted in handlers.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agodoc/orchestrator: Substitute `host` for `node` 33467/head
Sebastian Wagner [Fri, 21 Feb 2020 17:15:14 +0000 (18:15 +0100)]
doc/orchestrator: Substitute `host` for `node`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/orchestrator: Substitute `node` with `host`, globally
Sebastian Wagner [Fri, 21 Feb 2020 17:03:48 +0000 (18:03 +0100)]
mgr/orchestrator: Substitute `node` with `host`, globally

Right now, there is a mix of `node` and `host`. Unify this to `host`

* mgr/rook is special, as Kubernetes nativaly uses "node"

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoqa/workunits/cephadm/test_adoption: run as root 33485/head
Sage Weil [Sat, 22 Feb 2020 13:54:11 +0000 (07:54 -0600)]
qa/workunits/cephadm/test_adoption: run as root

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33448 from dillaman/wip-librbd-group-snaps
Mykola Golub [Sun, 23 Feb 2020 09:07:33 +0000 (11:07 +0200)]
Merge pull request #33448 from dillaman/wip-librbd-group-snaps

librbd: fix broken group snapshot handling

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33335 from dillaman/wip-44043
Mykola Golub [Sun, 23 Feb 2020 09:06:44 +0000 (11:06 +0200)]
Merge pull request #33335 from dillaman/wip-44043

rbd-mirror: apply image state during snapshot replay

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33451 from dillaman/wip-rbd-support-tasks
Mykola Golub [Sun, 23 Feb 2020 09:05:55 +0000 (11:05 +0200)]
Merge pull request #33451 from dillaman/wip-rbd-support-tasks

pybind/mgr/rbd_support: wait for latest OSD map prior to handling commands

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #31963 from yison/rwl-image-writeback-cache-seq2
Jason Dillaman [Sat, 22 Feb 2020 20:27:35 +0000 (15:27 -0500)]
Merge pull request #31963 from yison/rwl-image-writeback-cache-seq2

rbd/cache: Replicated Write Log core codes part 2

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33461 into master
Sage Weil [Sat, 22 Feb 2020 18:57:03 +0000 (12:57 -0600)]
Merge PR #33461 into master

* refs/pull/33461/head:
cephadm: Simplify is_available
cephadm: Improve type signature of is_available
cephadm: Fix type errors found by mypy
cephadm: Enable and start chrony using any packager
cephadm: Add Packager for Zypper (openSUSE / SLES)
cephadm: Normalize mypy annotations

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33486 into master
Sage Weil [Sat, 22 Feb 2020 18:56:26 +0000 (12:56 -0600)]
Merge PR #33486 into master

* refs/pull/33486/head:
qa/suites/rados/cephadm/smoke: run a few orch commands
mgr/orch: fix 'host ls'

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33475 into master
Sage Weil [Sat, 22 Feb 2020 18:55:27 +0000 (12:55 -0600)]
Merge PR #33475 into master

* refs/pull/33475/head:
qa/suites/rados/cephadm/upgrade: change start version

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33091 into master
Sage Weil [Sat, 22 Feb 2020 18:05:55 +0000 (12:05 -0600)]
Merge PR #33091 into master

* refs/pull/33091/head:
qa/suites/rados: disable device scraping
qa/standalone/ceph-helpers: disable device monitoring
qa/tasks/ceph.py: add pre-mgr-commands option for ceph task
mgr/devicehealth: set default monitoring to 'on'

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33235 into master
Sage Weil [Sat, 22 Feb 2020 18:05:45 +0000 (12:05 -0600)]
Merge PR #33235 into master

* refs/pull/33235/head:
os/bluestore/BlueFS: fixed printing stats

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33362 into master
Sage Weil [Sat, 22 Feb 2020 18:05:31 +0000 (12:05 -0600)]
Merge PR #33362 into master

* refs/pull/33362/head:
common/config :remove duplicaed code.
common/config: remove useless code.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33404 into master
Sage Weil [Sat, 22 Feb 2020 18:05:19 +0000 (12:05 -0600)]
Merge PR #33404 into master

* refs/pull/33404/head:
selinux: Allow ceph to setsched

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/suites/rados/cephadm/smoke: run a few orch commands 33486/head
Sage Weil [Sat, 22 Feb 2020 15:23:12 +0000 (09:23 -0600)]
qa/suites/rados/cephadm/smoke: run a few orch commands

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: fix 'host ls'
Sage Weil [Sat, 22 Feb 2020 15:20:51 +0000 (09:20 -0600)]
mgr/orch: fix 'host ls'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33472 into master
Sage Weil [Sat, 22 Feb 2020 14:16:17 +0000 (08:16 -0600)]
Merge PR #33472 into master

* refs/pull/33472/head:
cephadm: allow users to provide their dashboard cert during bootstrap

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/cephadm/upgrade: change start version 33475/head
Sage Weil [Fri, 21 Feb 2020 21:25:51 +0000 (15:25 -0600)]
qa/suites/rados/cephadm/upgrade: change start version

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33469 into master
Sage Weil [Sat, 22 Feb 2020 14:13:06 +0000 (08:13 -0600)]
Merge PR #33469 into master

* refs/pull/33469/head:
mgr/cephadm: fix upgrade ok-to-stop condition check

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: catch exceptions when scraping ceph-volume inventory 33484/head
Sage Weil [Sat, 22 Feb 2020 13:33:48 +0000 (07:33 -0600)]
mgr/cephadm: catch exceptions when scraping ceph-volume inventory

This matches what we do with the background 'cephadm ls'.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33473 from liewegas/remove-memstore-test
Kefu Chai [Sat, 22 Feb 2020 04:01:48 +0000 (12:01 +0800)]
Merge pull request #33473 from liewegas/remove-memstore-test

test/CMakeLists: disable memstore make check test

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: move crimson-crush to crimson/ 33481/head
Kefu Chai [Fri, 21 Feb 2020 12:57:49 +0000 (20:57 +0800)]
cmake: move crimson-crush to crimson/

so it's able to use crimson::cflags, this interface target could be
defined after crush/CMakeLists.txt is included by upper directory, so
just move it into crimson/CMakeLists.txt

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33106 from Yan-waller/wip-walle-fixbackfillundersized
Xie Xingguo [Sat, 22 Feb 2020 03:24:19 +0000 (11:24 +0800)]
Merge pull request #33106 from Yan-waller/wip-walle-fixbackfillundersized

osd/PG: restart peering for undersized PG on any down stray peer coming back

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
5 years agoqa/tasks/mgr/test_orchestrator_cli: fix test_host_ls 33477/head
Sage Weil [Sat, 22 Feb 2020 01:16:06 +0000 (19:16 -0600)]
qa/tasks/mgr/test_orchestrator_cli: fix test_host_ls

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33401 from liewegas/wip-octopus-notes
Josh Durgin [Sat, 22 Feb 2020 00:26:37 +0000 (16:26 -0800)]
Merge pull request #33401 from liewegas/wip-octopus-notes

doc/release/octopus: note about upgrade times

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #33476 into master
Patrick Donnelly [Fri, 21 Feb 2020 23:15:48 +0000 (15:15 -0800)]
Merge PR #33476 into master

* refs/pull/33476/head:
mgr/volumes: fix placement default value

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr/volumes: fix placement default value 33476/head
Sage Weil [Fri, 21 Feb 2020 23:02:59 +0000 (17:02 -0600)]
mgr/volumes: fix placement default value

Fixes: https://tracker.ceph.com/issues/44244
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: Simplify is_available 33461/head
Kristoffer Grönlund [Fri, 21 Feb 2020 22:26:46 +0000 (23:26 +0100)]
cephadm: Simplify is_available

There is no need to return a closure to call
from is_available, it can just do the work
directly.

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
5 years agocephadm: Improve type signature of is_available
Kristoffer Grönlund [Fri, 21 Feb 2020 22:20:03 +0000 (23:20 +0100)]
cephadm: Improve type signature of is_available

Specify the function signature expected by `is_available`
using the mypy Callable type.

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
5 years agocephadm: Fix type errors found by mypy
Kristoffer Grönlund [Fri, 21 Feb 2020 22:10:09 +0000 (23:10 +0100)]
cephadm: Fix type errors found by mypy

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
5 years agoMerge pull request #33412 from idryomov/wip-krbd-fsx-build-deps
Ilya Dryomov [Fri, 21 Feb 2020 21:38:49 +0000 (22:38 +0100)]
Merge pull request #33412 from idryomov/wip-krbd-fsx-build-deps

qa: rbd_workunit_suites_fsx: install build dependencies

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agotest/CMakeLists: disable memstore make check test 33473/head
Sage Weil [Fri, 21 Feb 2020 21:03:38 +0000 (15:03 -0600)]
test/CMakeLists: disable memstore make check test

This is flaky, with frequent failures like

[ RUN      ] ObjectStore/StoreTest.CompressionTest/0
2020-02-21T19:06:13.940+0000 7f5cdErrors while running CTest
Build step 'Execute shell' marked build as failure

Tracked by https://tracker.ceph.com/issues/44243

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33468 into master
Sage Weil [Fri, 21 Feb 2020 20:58:29 +0000 (14:58 -0600)]
Merge PR #33468 into master

* refs/pull/33468/head:
debian: fix ceph-mgr-modules-core files

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #33457 into master
Sage Weil [Fri, 21 Feb 2020 20:41:59 +0000 (14:41 -0600)]
Merge PR #33457 into master

* refs/pull/33457/head:
qa/workunits/cephadm: separate out test_adoption.sh; fix

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33464 into master
Sage Weil [Fri, 21 Feb 2020 20:10:07 +0000 (14:10 -0600)]
Merge PR #33464 into master

* refs/pull/33464/head:
mgr/BaseMgrModule: drop GIL for is_authorized check
mgr/ActivePyModules: drop GIL to register/unregister clients

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agocephadm: allow users to provide their dashboard cert during bootstrap 33472/head
Daniel-Pivonka [Fri, 21 Feb 2020 19:14:00 +0000 (14:14 -0500)]
cephadm: allow users to provide their dashboard cert during bootstrap

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
5 years agoMerge PR #33466 into master
Sage Weil [Fri, 21 Feb 2020 19:11:52 +0000 (13:11 -0600)]
Merge PR #33466 into master

* refs/pull/33466/head:
cmake: exclude unittest_alloc_aging from "all"

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: fix upgrade ok-to-stop condition check 33469/head
Sage Weil [Fri, 21 Feb 2020 18:50:10 +0000 (12:50 -0600)]
mgr/cephadm: fix upgrade ok-to-stop condition check

Broke this in 1072a7e3b5026c1e605dd45967fa555d2e6a0d14

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agolibrbd: only create new mirror image state records for primary mirror snapshots 33335/head
Jason Dillaman [Fri, 21 Feb 2020 18:45:53 +0000 (13:45 -0500)]
librbd: only create new mirror image state records for primary mirror snapshots

The consolidation of primary and non-primary mirror snapshot namespaces
resulted in the creation of image state records for non-primary snapshots.
This was resulting in non-primary snapshots being prematurely marked as
complete.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: additional debugging messages for snapshot-based mirroring
Jason Dillaman [Fri, 21 Feb 2020 18:37:49 +0000 (13:37 -0500)]
rbd-mirror: additional debugging messages for snapshot-based mirroring

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: additional debugging messages for snapshot-based mirroring
Jason Dillaman [Fri, 21 Feb 2020 18:36:02 +0000 (13:36 -0500)]
librbd: additional debugging messages for snapshot-based mirroring

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33415 into master
Sage Weil [Fri, 21 Feb 2020 18:31:34 +0000 (12:31 -0600)]
Merge PR #33415 into master

* refs/pull/33415/head:
mgr/cephadm: progress for upgrade

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agodebian: fix ceph-mgr-modules-core files 33468/head
Sage Weil [Fri, 21 Feb 2020 18:16:34 +0000 (12:16 -0600)]
debian: fix ceph-mgr-modules-core files

Remove the files from ceph-mgr that are added to ceph-mgr-modules-core.

2020-02-21T17:59:56.031 INFO:teuthology.orchestra.run.smithi060.stdout:dpkg: error processing archive /tmp/apt-dpkg-install-YpwLHV/044-ceph-mgr_15.1.0-1037-ga6b324b-1bionic_amd64.deb (--unpack):
2020-02-21T17:59:56.031 INFO:teuthology.orchestra.run.smithi060.stdout: trying to overwrite '/usr/share/ceph/mgr/alerts/__init__.py', which is also in package ceph-mgr-modules-core 15.1.0-1037-ga6b324b-1bionic

Broken by 589626464d475b4ad96905fbddf11a5782a040f0

Signed-off-by: Sage Weil <sage@redhat.com>