]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agorgw: change cls rgw reshard status to enum class 30611/head
J. Eric Ivancich [Fri, 27 Sep 2019 00:57:39 +0000 (20:57 -0400)]
rgw: change cls rgw reshard status to enum class

Get the type safety and reduced impact on global namespace of enum
class.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge PR #33139 into master
Sage Weil [Tue, 11 Feb 2020 16:43:09 +0000 (10:43 -0600)]
Merge PR #33139 into master

* refs/pull/33139/head:
mgr/cephadm: catch exception in _check_hosts()
mgr/cephadm: do not crash module on exception in serve thread

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33175 into master
Sage Weil [Tue, 11 Feb 2020 16:42:58 +0000 (10:42 -0600)]
Merge PR #33175 into master

* refs/pull/33175/head:
mgr/cephadm: Add some more type annotations
mgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33189 into master
Sage Weil [Tue, 11 Feb 2020 16:42:46 +0000 (10:42 -0600)]
Merge PR #33189 into master

* refs/pull/33189/head:
mgr/cephadm: fix redeploy (etc) of crash containers
cephadm: do not use special unit, naming for crash agent
cephadm: 'crash' is a ceph daemon

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #33176 from jmolmo/bz_43972
Sebastian Wagner [Tue, 11 Feb 2020 15:40:19 +0000 (16:40 +0100)]
Merge pull request #33176 from jmolmo/bz_43972

mgr/rook: Fix error creating OSD's

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge PR #33027 into master
Sage Weil [Tue, 11 Feb 2020 14:28:43 +0000 (08:28 -0600)]
Merge PR #33027 into master

* refs/pull/33027/head:
os/bluestore/BlueFS: reclaim unused too-granular extents first
os/bluestore/BlueFS: track bluefs owned extents that are too granular
os/bluestore/BlueFS: verify that fnodes respect the bluefs alloc_size
os/bluestore/BlueFS: align bluefs' owned extents to alloc_size

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge PR #33188 into master
Sage Weil [Tue, 11 Feb 2020 14:28:27 +0000 (08:28 -0600)]
Merge PR #33188 into master

* refs/pull/33188/head:
qa/workunits/cephtool/test.sh: delete test_erasure pool

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #33187 from dillaman/wip-44066
Mykola Golub [Tue, 11 Feb 2020 14:27:35 +0000 (16:27 +0200)]
Merge pull request #33187 from dillaman/wip-44066

qa/workunits/rbd: override CEPH_ARGS when initializing the site name

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33002 from dillaman/wip-43613
Mykola Golub [Tue, 11 Feb 2020 14:26:34 +0000 (16:26 +0200)]
Merge pull request #33002 from dillaman/wip-43613

rbd-mirror: initial snapshot-based mirroring bootstrap logic

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33054 from cbodley/wip-rgw-pubsub-syncstop
Casey Bodley [Tue, 11 Feb 2020 13:13:05 +0000 (08:13 -0500)]
Merge pull request #33054 from cbodley/wip-rgw-pubsub-syncstop

rgw: use new Stopped state for special handling of 'bucket sync disable'

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoMerge pull request #33199 from tchaikov/wip-crimson-do-with
Kefu Chai [Tue, 11 Feb 2020 11:35:02 +0000 (19:35 +0800)]
Merge pull request #33199 from tchaikov/wip-crimson-do-with

crimson/common: more friendly to seastar::do_with()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/common: more friendly to seastar::do_with() 33199/head
Kefu Chai [Tue, 11 Feb 2020 09:57:42 +0000 (17:57 +0800)]
crimson/common: more friendly to seastar::do_with()

so we don't need to do the box-unbox dance when callng
seastar::do_with() with multiple with'ed variables and
a continuation which returns `errator<...>::future`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33172 from tchaikov/wip-43582
Kefu Chai [Tue, 11 Feb 2020 06:18:37 +0000 (14:18 +0800)]
Merge pull request #33172 from tchaikov/wip-43582

ceph-monstore-tool: correct the key for storing mgr_command_descs

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33177 from tchaikov/wip-clang-pybind
Kefu Chai [Tue, 11 Feb 2020 04:45:58 +0000 (12:45 +0800)]
Merge pull request #33177 from tchaikov/wip-clang-pybind

pybind: customize compiler before checking cflags

Reviewed-by: Mark Kogan <mkogan@redhat.com>
5 years agoMerge PR #33135 into master
Sage Weil [Tue, 11 Feb 2020 02:57:42 +0000 (20:57 -0600)]
Merge PR #33135 into master

* refs/pull/33135/head:
mon: fix tell command registration
ceph.in: fix -h/help behavior for tell commands
ceph.in: remove '{osd,mds,mon} tell' deprecation warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33190 into master
Sage Weil [Tue, 11 Feb 2020 01:53:37 +0000 (19:53 -0600)]
Merge PR #33190 into master

* refs/pull/33190/head:
cephadm: report image name for stopped daemons
cephadm: record the image name to unit.image

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #33186 from yuriw/wip-yuriw-crontab-master
Yuri Weinstein [Tue, 11 Feb 2020 00:16:13 +0000 (16:16 -0800)]
Merge pull request #33186 from yuriw/wip-yuriw-crontab-master

qa/tests: removed all runs for luminous - EOL

5 years agoMerge PR #33179 into master
Sage Weil [Mon, 10 Feb 2020 23:14:48 +0000 (17:14 -0600)]
Merge PR #33179 into master

* refs/pull/33179/head:
mgr/orchestrator: Use `pickle` to pass exceptions across sub-interpreters

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33184 into master
Sage Weil [Mon, 10 Feb 2020 23:14:02 +0000 (17:14 -0600)]
Merge PR #33184 into master

* refs/pull/33184/head:
qa/suites/rados/multimon/tasks/mon_clock_with_skews: whitelist MOST_DOWN
qa/suites/rados/multimon/tasks/mon_clock_with_skews: disable ntpd etc

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33043 into master
Sage Weil [Mon, 10 Feb 2020 20:49:35 +0000 (14:49 -0600)]
Merge PR #33043 into master

* refs/pull/33043/head:
doc/releases: octopus draft notes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #32965 from Dmole/patch-3
Jason Dillaman [Mon, 10 Feb 2020 20:41:13 +0000 (15:41 -0500)]
Merge pull request #32965 from Dmole/patch-3

doc: quick-rbd.rst de-duplicate

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33181 into master
Sage Weil [Mon, 10 Feb 2020 19:29:08 +0000 (13:29 -0600)]
Merge PR #33181 into master

* refs/pull/33181/head:
qa/workunits/cephadm/test_cephadm: fix typo

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agodoc/releases: octopus draft notes 33043/head
Sage Weil [Mon, 3 Feb 2020 15:31:36 +0000 (09:31 -0600)]
doc/releases: octopus draft notes

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: fix redeploy (etc) of crash containers 33189/head
Sage Weil [Mon, 10 Feb 2020 16:06:21 +0000 (10:06 -0600)]
mgr/cephadm: fix redeploy (etc) of crash containers

When deploying a crash container, the crash keyring is the crash keyring,
and there is not additional crash_keyring for the implicit crash
container.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: do not use special unit, naming for crash agent
Sage Weil [Mon, 10 Feb 2020 16:05:29 +0000 (10:05 -0600)]
cephadm: do not use special unit, naming for crash agent

Use the normal unit file, with crash.$hostname as the name.  This makes
the crash agent behave like all of the other services instead of being
special.  The exception is that the crash agent is still implicitly
deployed alongside other containers.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: 'crash' is a ceph daemon
Sage Weil [Mon, 10 Feb 2020 15:22:24 +0000 (09:22 -0600)]
cephadm: 'crash' is a ceph daemon

- we can run ceph -v inside
- we need to mount the crash dir

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33131 into master
Sage Weil [Mon, 10 Feb 2020 18:17:45 +0000 (12:17 -0600)]
Merge PR #33131 into master

* refs/pull/33131/head:
mgr/orch: 'ceph orchestrator ...' -> 'ceph orch ...'

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33162 into master
Sage Weil [Mon, 10 Feb 2020 18:17:17 +0000 (12:17 -0600)]
Merge PR #33162 into master

* refs/pull/33162/head:
cephadm: KillMode=none in unit file
cephadm: clean up unit string syntax a bit

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agocephadm: report image name for stopped daemons 33190/head
Sage Weil [Mon, 10 Feb 2020 18:02:28 +0000 (12:02 -0600)]
cephadm: report image name for stopped daemons

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: record the image name to unit.image
Sage Weil [Mon, 10 Feb 2020 17:57:16 +0000 (11:57 -0600)]
cephadm: record the image name to unit.image

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephtool/test.sh: delete test_erasure pool 33188/head
Sage Weil [Mon, 10 Feb 2020 17:20:07 +0000 (11:20 -0600)]
qa/workunits/cephtool/test.sh: delete test_erasure pool

Other parts of this script leave OSDs reweighted, which can make this test
fail to go fully clean.

 0   ssd 0.08789         osd.0          up  0.63213 1.00000
 1   ssd 0.08789         osd.1          up  0.63213 1.00000
 2   ssd 0.08789         osd.2          up  1.00000 1.00000

35.0 raw ([2,1,2147483647], p2) up ([2,1,2147483647], p2) acting ([2,1,2], p2)

Fix by just deleting this pool when we're done.

Fixes: https://tracker.ceph.com/issues/44067
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33185 from tchaikov/wip-44063
Kefu Chai [Mon, 10 Feb 2020 17:01:25 +0000 (01:01 +0800)]
Merge pull request #33185 from tchaikov/wip-44063

pybind/mgr: bump six to 1.14

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoqa/workunits/rbd: override CEPH_ARGS when initializing the site name 33187/head
Jason Dillaman [Mon, 10 Feb 2020 16:34:49 +0000 (11:34 -0500)]
qa/workunits/rbd: override CEPH_ARGS when initializing the site name

The mirroring site name is stored in the MON config which requires
higher privledges than the standard "client.mirror" user.

Fixes: https://tracker.ceph.com/issues/44066
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoqa/tests: removed all runs for luminous - EOL 33186/head
Yuri Weinstein [Mon, 10 Feb 2020 16:20:59 +0000 (08:20 -0800)]
qa/tests: removed all runs for luminous - EOL

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agodoc: quick-rbd.rst de-duplicate 32965/head
Tim [Wed, 29 Jan 2020 15:10:09 +0000 (10:10 -0500)]
doc: quick-rbd.rst de-duplicate

Remove code duplication from the dependency.

Signed-off-by: Tim <elatllat@gmail.com>
5 years agopybind/mgr: bump six to 1.14 33185/head
Kefu Chai [Mon, 10 Feb 2020 15:30:34 +0000 (23:30 +0800)]
pybind/mgr: bump six to 1.14

otherwise some packages which uses six.ensure_text will fail, as it
was introduced by 1.12. and 1.14 is the latest stable version of
six. so let's use it instead.

Fixes: https://tracker.ceph.com/issues/44063
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/pybind: fix expectations for mirror snapshots 33002/head
Jason Dillaman [Mon, 10 Feb 2020 15:16:59 +0000 (10:16 -0500)]
test/pybind: fix expectations for mirror snapshots

When snapshot-based mirroring is enabled, the primary image
should always have at least one mirror-based snapshot to help
distinguish it from an incomplete non-primary image.

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

* refs/pull/33137/head:
mon/PGMap: fix digest summary of PGs by state
mon/PGMap: fix compat encoding of num_pg_by_state

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomon: fix tell command registration 33135/head
Sage Weil [Sat, 8 Feb 2020 15:25:01 +0000 (09:25 -0600)]
mon: fix tell command registration

Pass full cmddesc, not just prefix.

Broken by 3394b70ba18cffa49317141ff444ba9990d6170b

Fixes: https://tracker.ceph.com/issues/44050
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph.in: fix -h/help behavior for tell commands
Sage Weil [Sat, 8 Feb 2020 14:49:50 +0000 (08:49 -0600)]
ceph.in: fix -h/help behavior for tell commands

- add "Tell $type commands" heading
- 'ceph tell mon.a -h' now works
- 'ceph tell mon.a prefix -h' also works

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agopybind: check arguments also when searching for "clang" 33177/head
Kefu Chai [Mon, 10 Feb 2020 14:06:24 +0000 (22:06 +0800)]
pybind: check arguments also when searching for "clang"

if "ccache" is used, compiler[0] would be "ccache", and compiler[1]
would be "clang", in this case, we should search for "clang" until
an argument starting with "-" is found. it signals be the first
cflag passed to the compiler.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind: convert filterfalse to list before returning
Kefu Chai [Mon, 10 Feb 2020 13:41:10 +0000 (21:41 +0800)]
pybind: convert filterfalse to list before returning

distutils expects a list not an iterator

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind: customize compiler before checking cflags
Kefu Chai [Mon, 10 Feb 2020 11:13:47 +0000 (19:13 +0800)]
pybind: customize compiler before checking cflags

otherwise we are always looking at the default compiler on 'unix' --
'cc'. and will fail to filter cflags not supported by clang, if we
are compiling the python bindings using clang.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrbd: corrected error code from image_snapshot_create API
Jason Dillaman [Wed, 5 Feb 2020 14:27:30 +0000 (09:27 -0500)]
librbd: corrected error code from image_snapshot_create API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/orchestrator: Use `pickle` to pass exceptions across sub-interpreters 33179/head
Sebastian Wagner [Mon, 10 Feb 2020 13:20:25 +0000 (14:20 +0100)]
mgr/orchestrator: Use `pickle` to pass exceptions across sub-interpreters

`copy.deepcopy` doesn't work to cross sub-interpreter boundaries.

Fixes: https://tracker.ceph.com/issues/43913
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: Add some more type annotations 33175/head
Sebastian Wagner [Mon, 3 Feb 2020 14:55:32 +0000 (15:55 +0100)]
mgr/cephadm: Add some more type annotations

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec
Sebastian Wagner [Mon, 10 Feb 2020 10:58:06 +0000 (11:58 +0100)]
mgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec

Both classes are essentially equal. Keeping both just makes thigs
more compicated.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/rook: Fix error creating OSD's 33176/head
Juan Miguel Olmo Martínez [Fri, 7 Feb 2020 17:32:25 +0000 (18:32 +0100)]
mgr/rook: Fix error creating OSD's

Fixes: https://tracker.ceph.com/issues/43972
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
5 years agoMerge pull request #33035 from jdurgin/wip-target-ratio
Kefu Chai [Mon, 10 Feb 2020 10:41:07 +0000 (18:41 +0800)]
Merge pull request #33035 from jdurgin/wip-target-ratio

mgr/pg_autoscaler: treat target ratios as weights

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agodoc: update mondb recovery script 33172/head
Kefu Chai [Mon, 10 Feb 2020 09:36:04 +0000 (17:36 +0800)]
doc: update mondb recovery script

to note that we also need to add mgr's key to monitor's keyring

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-monstore-tool: correct the key for storing mgr_command_descs
Kefu Chai [Mon, 10 Feb 2020 09:33:26 +0000 (17:33 +0800)]
ceph-monstore-tool: correct the key for storing mgr_command_descs

Fixes: https://tracker.ceph.com/issues/43582
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-monstore-tool: rename mon-ids in initial monmap
Kefu Chai [Mon, 10 Feb 2020 08:27:22 +0000 (16:27 +0800)]
ceph-monstore-tool: rename mon-ids in initial monmap

when ceph-mon starts, it checks to see if it's listed in the monmap, if
not it complains
```
no public_addr or public_network specified, and mon.a not present in
monmap or ceph.conf.
```
then bails out. normally, the monitor will try to rename its name in
monmap when performing "mkfs", but in our case, we are merely using the
"mkfs" monmap for passing the monmap built by ceph-monstore-tools, and
we don't actually go through the "mkfs" process. so, ceph-mon won't
rename when booting up.

in this change, user is allowed to specify the mon-ids in command line
when rebuilding mondb, the default mon-ids would be a,b,c,... if not
specified.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/pg_autoscaler: add unit tests for effective_target_ratio 33035/head
Josh Durgin [Sun, 2 Feb 2020 21:29:13 +0000 (16:29 -0500)]
mgr/pg_autoscaler: add unit tests for effective_target_ratio

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/pg_autoscaler: remove unused imports
Josh Durgin [Sat, 1 Feb 2020 23:16:53 +0000 (18:16 -0500)]
mgr/pg_autoscaler: remove unused imports

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/pg_autoscaler: cleanup pool_id type
Josh Durgin [Sat, 1 Feb 2020 19:09:25 +0000 (14:09 -0500)]
mgr/pg_autoscaler: cleanup pool_id type

Keep it as an int so we don't have to cast back and forth.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/pg_autoscaler: correct and simplify progress tracking
Josh Durgin [Sat, 1 Feb 2020 19:00:24 +0000 (14:00 -0500)]
mgr/pg_autoscaler: correct and simplify progress tracking

Reset the progress each time we make an adjustment, and track progress
from that initial state to that new target. Previously we were also
using the wrong target: the current pg_num_target, not the new value
(pg_num_final) that we set.

Look up the pool by name, not id, in _maybe_adjust(), since that is how it is
retrieved by osdmap.get_pools_by_name().

Dedupe some logic into PgAdjustmentProgress to simplify things.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agoPendingReleaseNotes: mention target_size_ratio change
Josh Durgin [Sat, 1 Feb 2020 20:28:33 +0000 (15:28 -0500)]
PendingReleaseNotes: mention target_size_ratio change

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agodoc: update autoscaler docs for target ratio
Josh Durgin [Sat, 1 Feb 2020 20:27:37 +0000 (15:27 -0500)]
doc: update autoscaler docs for target ratio

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/pg_autoscaler: include effective target ratio in status
Josh Durgin [Sat, 1 Feb 2020 20:22:50 +0000 (15:22 -0500)]
mgr/pg_autoscaler: include effective target ratio in status

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/pg_autoscaler: add warning when target bytes and ratio are both set
Josh Durgin [Sat, 1 Feb 2020 19:59:13 +0000 (14:59 -0500)]
mgr/pg_autoscaler: add warning when target bytes and ratio are both set

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/pg_autoscaler: remove target ratio warning
Josh Durgin [Sat, 1 Feb 2020 19:41:32 +0000 (14:41 -0500)]
mgr/pg_autoscaler: remove target ratio warning

Since the ratios are normalized, they cannot exceed 1.0 or overcommit
combined with target_bytes.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agoqa: use ratios >1 in pg_autoscaler test
Josh Durgin [Sun, 2 Feb 2020 21:22:04 +0000 (16:22 -0500)]
qa: use ratios >1 in pg_autoscaler test

Also check for pg_num_target being set correctly, rather than pg_num,
so the test doesn't depend on merging/splitting speed.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/pg_autoscaler: treat target ratios as weights
Josh Durgin [Sat, 1 Feb 2020 04:31:40 +0000 (23:31 -0500)]
mgr/pg_autoscaler: treat target ratios as weights

Normalize across pools so that it's simpler to use - this way you
don't have to adjust every other pool when you add one.

Handle pools with target_bytes by taking their capacity off the top,
and dividing the rest into the pools with a target_ratio.

If both target bytes and ratio are specified, ignore bytes. This
matches the docs and makes accounting simpler.

Fixes: https://tracker.ceph.com/issues/43947
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/orch: 'ceph orchestrator ...' -> 'ceph orch ...' 33131/head
Sage Weil [Fri, 7 Feb 2020 19:20:42 +0000 (13:20 -0600)]
mgr/orch: 'ceph orchestrator ...' -> 'ceph orch ...'

Less typing for all!

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm: fix typo 33181/head
Sage Weil [Sun, 9 Feb 2020 21:38:48 +0000 (15:38 -0600)]
qa/workunits/cephadm/test_cephadm: fix typo

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

* refs/pull/33126/head:
doc/mgr/orchestrator_cli: update support table
mgr/deepsea: remove
mgr/ansible: remove

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33136 into master
Sage Weil [Sun, 9 Feb 2020 21:34:59 +0000 (15:34 -0600)]
Merge PR #33136 into master

* refs/pull/33136/head:
cephadm: fix ceph version probe

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: fix ceph version probe 33136/head
Sage Weil [Sat, 8 Feb 2020 17:32:58 +0000 (11:32 -0600)]
cephadm: fix ceph version probe

docker returns '<no value>' if the label isn't present, in which case we
still need to run ceph -v.

Also, don't probe non-ceph (e.g., monitoring) containers.

Also, only probe each image id once.

Add a simple test.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33133 into master
Sage Weil [Sun, 9 Feb 2020 19:55:27 +0000 (13:55 -0600)]
Merge PR #33133 into master

* refs/pull/33133/head:
qa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster
qa/workunits/cephadm/test_cephadm: 2 OSDs is enough
cephadm: disable node-exporter cpu/memory limits for the time being

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/suites/rados/multimon/tasks/mon_clock_with_skews: whitelist MOST_DOWN 33184/head
Sage Weil [Sun, 9 Feb 2020 19:40:46 +0000 (13:40 -0600)]
qa/suites/rados/multimon/tasks/mon_clock_with_skews: whitelist MOST_DOWN

The skewed clock makes some mons miss elections.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33134 into master
Sage Weil [Sun, 9 Feb 2020 18:48:09 +0000 (12:48 -0600)]
Merge PR #33134 into master

* refs/pull/33134/head:
qa/workunits/cephadm/test_repos: don't try to use the refspec

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/suites/rados/multimon/tasks/mon_clock_with_skews: disable ntpd etc
Sage Weil [Sun, 9 Feb 2020 16:55:03 +0000 (10:55 -0600)]
qa/suites/rados/multimon/tasks/mon_clock_with_skews: disable ntpd etc

Fixes: https://tracker.ceph.com/issues/43889
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/mgr/orchestrator_cli: update support table 33126/head
Sage Weil [Sun, 9 Feb 2020 15:47:40 +0000 (09:47 -0600)]
doc/mgr/orchestrator_cli: update support table

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/deepsea: remove
Sage Weil [Fri, 7 Feb 2020 15:49:56 +0000 (09:49 -0600)]
mgr/deepsea: remove

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33117 into master
Sage Weil [Sun, 9 Feb 2020 15:40:10 +0000 (09:40 -0600)]
Merge PR #33117 into master

* refs/pull/33117/head:
qa/suites/upgrade/nautilus-x-singleton: ensure hit sets behave across upgrade
osd/PrimaryLogPG: use legacy timestamp rendering for hit_set objects
include/utime: allow legacy rendering of timestamp

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomon/PGMap: fix digest summary of PGs by state 33137/head
Sage Weil [Sun, 9 Feb 2020 15:27:53 +0000 (09:27 -0600)]
mon/PGMap: fix digest summary of PGs by state

This fixes the PG state summary seen in 'ceph -s' to reflect PG state bits
beyond 32 bits.

Fixes: https://tracker.ceph.com/issues/44052
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/PGMap: fix compat encoding of num_pg_by_state
Sage Weil [Sun, 9 Feb 2020 15:22:56 +0000 (09:22 -0600)]
mon/PGMap: fix compat encoding of num_pg_by_state

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32928 from ljishen/wip-rados-bench-latency
Kefu Chai [Sun, 9 Feb 2020 10:43:38 +0000 (18:43 +0800)]
Merge pull request #32928 from ljishen/wip-rados-bench-latency

rados bench: fix the delayed checking of completed ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #32934 from rzarzynski/wip-bl-32bytes
Kefu Chai [Sun, 9 Feb 2020 10:41:03 +0000 (18:41 +0800)]
Merge pull request #32934 from rzarzynski/wip-bl-32bytes

include, common: make ceph::bufferlist 32 bytes long on x86

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33099 from howard0su/wip_ceph_fix
Kefu Chai [Sun, 9 Feb 2020 10:36:03 +0000 (18:36 +0800)]
Merge pull request #33099 from howard0su/wip_ceph_fix

ceph.in: print decoded output in interactive mode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33101 from tchaikov/wip-thread-join
Kefu Chai [Sun, 9 Feb 2020 10:33:26 +0000 (18:33 +0800)]
Merge pull request #33101 from tchaikov/wip-thread-join

pybind/ceph_argparse: avoid int overflow

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33068 from yuvalif/verify-pubsub-inc-sync
Yuval Lifshitz [Sun, 9 Feb 2020 09:55:57 +0000 (11:55 +0200)]
Merge pull request #33068 from yuvalif/verify-pubsub-inc-sync

qa/rgw/pubsub: verify incremental sync is used in pubsub

5 years agoMerge PR #32816 into master
Patrick Donnelly [Sun, 9 Feb 2020 01:51:56 +0000 (17:51 -0800)]
Merge PR #32816 into master

* refs/pull/32816/head:
mds: check inode type when deciding if filelock should be in EXCL state
mds: don't delegate inos when handling replayed requests
mds: process re-sent async dir operations at clientreplay stage
mds: consider async dirops when checking directory empty
mds: always suppress issuing caps in Locker::issue_new_caps()
mds: try reconnect cap only when replayed request creates new inode
mds: set cap id to 1 for newly created inode

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agocephadm: KillMode=none in unit file 33162/head
Sage Weil [Sun, 9 Feb 2020 00:21:05 +0000 (18:21 -0600)]
cephadm: KillMode=none in unit file

The unit already has a ExecStop command that runs 'podman|docker stop',
so systemd should not *also* try to kill the process or else it may
screw up the container state

From https://www.redhat.com/sysadmin/podman-shareable-systemd-services

"Note: It’s important to set the kill mode to none. Otherwise, systemd
will start competing with Podman to stop and kill the container processes.
which can lead to various undesired side effects and invalid states."

Hopefully-fixes: https://tracker.ceph.com/issues/43883
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: clean up unit string syntax a bit
Sage Weil [Sun, 9 Feb 2020 00:17:34 +0000 (18:17 -0600)]
cephadm: clean up unit string syntax a bit

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster 33133/head
Sage Weil [Sat, 8 Feb 2020 23:19:34 +0000 (17:19 -0600)]
qa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster

The sleep 90 was way overkill.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm: 2 OSDs is enough
Sage Weil [Sat, 8 Feb 2020 23:51:26 +0000 (17:51 -0600)]
qa/workunits/cephadm/test_cephadm: 2 OSDs is enough

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: catch exception in _check_hosts() 33139/head
Sage Weil [Sat, 8 Feb 2020 16:14:53 +0000 (10:14 -0600)]
mgr/cephadm: catch exception in _check_hosts()

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: do not crash module on exception in serve thread
Sage Weil [Sat, 8 Feb 2020 16:05:39 +0000 (10:05 -0600)]
mgr/cephadm: do not crash module on exception in serve thread

This is a band-aid over a larger problem: we really need to process each
host independently and proceed with partial results when some hosts fail.
(Also, we should query hosts in parallel.)

In the meantime, this avoids crashing the cephadm module entirely.

Fixes: https://tracker.ceph.com/issues/44018
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph.in: remove '{osd,mds,mon} tell' deprecation warning
Sage Weil [Sat, 8 Feb 2020 14:35:35 +0000 (08:35 -0600)]
ceph.in: remove '{osd,mds,mon} tell' deprecation warning

The last one of the was removed in luminous.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: disable node-exporter cpu/memory limits for the time being
Sage Weil [Sat, 8 Feb 2020 14:22:24 +0000 (08:22 -0600)]
cephadm: disable node-exporter cpu/memory limits for the time being

Ubuntu 18.04 kernel does not support these.

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

* refs/pull/33092/head:
doc/rados/operations: adjust docs a bit
mon/OSDMonitor: accept 'autoscale_mode' argument to 'osd pool create'

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #33094 into master
Sage Weil [Sat, 8 Feb 2020 14:08:11 +0000 (08:08 -0600)]
Merge PR #33094 into master

* refs/pull/33094/head:
mgr/telemetry: split entity_name only once (handle ids with dots)

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33037 into master
Sage Weil [Sat, 8 Feb 2020 14:08:01 +0000 (08:08 -0600)]
Merge PR #33037 into master

* refs/pull/33037/head:
osd/OSD: choose more heartbeat peers from different subtrees

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
5 years agoqa/workunits/cephadm/test_repos: don't try to use the refspec 33134/head
Sage Weil [Sat, 8 Feb 2020 13:33:47 +0000 (07:33 -0600)]
qa/workunits/cephadm/test_repos: don't try to use the refspec

This is usually a sha1, and we can't reliably find packages based on
that.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33132 into master
Sage Weil [Sat, 8 Feb 2020 13:27:27 +0000 (07:27 -0600)]
Merge PR #33132 into master

* refs/pull/33132/head:
qa/workunits/cephadm/test_repos: apt update
qa/workunits/cephadm/test_repos: fix subst
qa/suites/rados/cephadm/.../test_repos: run without ulimit and coverage tools
qa/tasks/workunit: accept coverage_and_limits: false
qa/suites/rados/cephadm: move ubuntu_18.04_podman to shared location
qa/suites/rados/cephadm: fix conflicts, missing .qa link

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/workunits/cephadm/test_repos: apt update 33132/head
Sage Weil [Sat, 8 Feb 2020 04:16:29 +0000 (22:16 -0600)]
qa/workunits/cephadm/test_repos: apt update

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm/test_repos: fix subst
Sage Weil [Sat, 8 Feb 2020 01:08:49 +0000 (19:08 -0600)]
qa/workunits/cephadm/test_repos: fix subst

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33061 from tchaikov/wip-pybind-compiler-flags-patch
Kefu Chai [Sat, 8 Feb 2020 02:14:10 +0000 (10:14 +0800)]
Merge pull request #33061 from tchaikov/wip-pybind-compiler-flags-patch

pybind: refactor monkey_with_compiler()

Reviewed-By: Adam Emersen <aemerson@redhat.com>
5 years agoMerge PR #33098 into master
Sage Weil [Sat, 8 Feb 2020 01:12:43 +0000 (19:12 -0600)]
Merge PR #33098 into master

* refs/pull/33098/head:
mgr/orch,cephadm: add 'host set-addr'
mgr/orch: include addr (and labels) in 'host ls'
mgr/cephadm: fix 'cephadm check-host'
mgr/cephadm: use addr to contact host
mgr/orch: pass HostSpec to add_host
mgr/orch: HostSpec -> HostPlacementSpec

Reviewed-by: Sebastian Wagner <swagner@suse.com>