Commit Graph

108850 Commits

Author SHA1 Message Date
David Zafman
e509b7c7d0 test: Add flush_pg_stats to avoid race with getting num_shards_repaired
Fixes: https://tracker.ceph.com/issues/44439

Signed-off-by: David Zafman <dzafman@redhat.com>
2020-03-06 04:25:37 +00:00
Sage Weil
77425b3c4a Merge PR #33766 into master
* refs/pull/33766/head:
	mgr/cephadm: fix placement when existing + specified don't overlap

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-05 18:58:00 -06:00
Sage Weil
d316156b1e Merge PR #33744 into master
* refs/pull/33744/head:
	qa/tasks/radosbench: fix usage of -O

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-05 16:41:48 -06:00
Sage Weil
718471b7e4 mgr/cephadm: fix placement when existing + specified don't overlap
If we have a daemon on A, and our spec is (count=2, hosts=[B]), we should
always return [A,B], but we sometimes were returning [B,B].

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 14:51:39 -06:00
Sage Weil
8a84ddeaa8 Merge PR #33531 into master
* refs/pull/33531/head:
	qa/tasks/mgr/test_orchestrator_cli: fix test_ps* tests
	mgr/test_orchestrator: refactor listing services/daemons
	mgr/dashboard: list services and daemons

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-03-05 13:20:21 -06:00
Sage Weil
2dc112e0aa Merge PR #33718 into master
* refs/pull/33718/head:
	mgr/dashboard: fix tasks.mgr.dashboard.test_rgw suite

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
2020-03-05 13:20:10 -06:00
Sage Weil
8eb58e5bba Merge PR #33745 into master
* refs/pull/33745/head:
	mgr/cephadm: upgrade: fix daemons missing image_id

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-05 13:18:34 -06:00
J. Eric Ivancich
03a3355db5
Merge pull request #33702 from ivancich/wip-bucket-listing-clear-results
rgw: cls_bucket_list_(un)ordered should clear results collection

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
2020-03-05 12:37:51 -05:00
J. Eric Ivancich
c52039a9e8 rgw: cls_bucket_list_(un)ordered should clear results collection
Each call to cls_bucket_list_(un)ordered should have an empty
collection to populate with results. Rather than rely on the caller to
insure this, it's more reliable to have these functions do the clear.

Additionally in some cases, a reserve call was added to the collection
to pre-allocate the space needed for the expected number of
results. This will potentially result in fewer re-allocations plus
copies.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2020-03-05 11:39:36 -05:00
J. Eric Ivancich
44a61a048a
Merge pull request #33693 from yaozongyou/fix-rgw-check-bucket-empty-bug
rgw: clear ent_list for each loop of bucket list

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2020-03-05 11:32:21 -05:00
J. Eric Ivancich
2551bce86d
Merge pull request #33398 from clwluvw/subuser-policy
rgw: Fix bug on subuser policy identity checker

Reviewed-by: Adam Emerson <aemerson@redhat.com>
2020-03-05 10:55:24 -05:00
Alfonso Martínez
eaa0d84a13 mgr/dashboard: fix tasks.mgr.dashboard.test_rgw suite
Fixes: https://tracker.ceph.com/issues/44405
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2020-03-05 16:22:55 +01:00
Patrick Donnelly
bacfa9f5a7
Merge PR #33687 into master
* refs/pull/33687/head:
	mgr/volume: adapt arg passing to ServiceSpec

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
2020-03-05 06:27:51 -08:00
Sage Weil
cdc778d351 Merge PR #33728 into master
* refs/pull/33728/head:
	mgr/orch: factor out nice_delta
	mgr/orch: show spec age in 'orch ls'
	mgr/cephadm: store timestamp with specs
	mgr/orch: add created timestamp to ServiceDescription
	mgr/orch: include uptime in 'orch ps'
	mgr/orch: include AGE column in 'orch ps'
	mgr/cephadm: populate new DaemonDescription timestamps
	mgr/orch: add new timestamps in DaemonDescription
	cephadm: include timestamps for configured, created
	cephadm: include timestamps for started, deploy

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-05 08:05:49 -06:00
Sage Weil
e8c268d1d4 Merge PR #33708 into master
* refs/pull/33708/head:
	ceph_test_cls_hello: set RETURNVEC on the expected EINVAL request

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2020-03-05 08:02:21 -06:00
Sage Weil
bb126cf9ab qa/tasks/mgr/test_orchestrator_cli: fix test_ps* tests
The ps output names daemons like 'type.foo', e.g., 'mgr.x'.  Now that
the test_orchestrator impl is less bonkers this needs to be adjusted to
match reality.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 08:00:42 -06:00
Sage Weil
e8078acf3c mgr/cephadm: upgrade: fix daemons missing image_id
If a daemon isn't running, we don't know the image_id (hash), so we skip.
But it's also possible to have a running daemon that doesn't report an
image_id... like right after we deploy it when the container hasn't
started up yet.  Skip those too.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 07:52:41 -06:00
Sage Weil
2b5008ce23 Merge PR #33729 into master
* refs/pull/33729/head:
	doc/releases: Octopus is not stable yet

Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-05 07:31:23 -06:00
Sage Weil
da19fd14db qa/tasks/radosbench: fix usage of -O
I tried to fix this in fb991fa5f6 but
was comparing an array to an int.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 07:27:24 -06:00
Sage Weil
94e77cc9c4 mgr/orch: factor out nice_delta
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:27 -06:00
Sage Weil
59127f69a1 mgr/orch: show spec age in 'orch ls'
Also rearrange the columns a bit.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:27 -06:00
Sage Weil
0e260d299f mgr/cephadm: store timestamp with specs
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:27 -06:00
Sage Weil
d417730232 mgr/orch: add created timestamp to ServiceDescription
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:27 -06:00
Sage Weil
f9c65b49ab mgr/orch: include uptime in 'orch ps'
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:26 -06:00
Sage Weil
20c4a9783d mgr/orch: include AGE column in 'orch ps'
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:26 -06:00
Sage Weil
c6cabac263 mgr/cephadm: populate new DaemonDescription timestamps
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:26 -06:00
Sage Weil
05dbfe1c64 mgr/orch: add new timestamps in DaemonDescription
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:26 -06:00
Sage Weil
a683065cd6 cephadm: include timestamps for configured, created
created = when daemon was first created
configured = when the daemonw as last (re)configured

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:26 -06:00
Sage Weil
99aadb094a cephadm: include timestamps for started, deploy
started == when the container started
deployed == when the container was (most recently) (re)deployed

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-05 06:42:26 -06:00
Sage Weil
2a1d9e97ff Merge PR #33733 into master
* refs/pull/33733/head:
	mgr/cephadm: if we had no record of deps, and deps are [], do not reconfig

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-05 06:34:48 -06:00
Sage Weil
683fc0f80c Merge PR #33734 into master
* refs/pull/33734/head:
	mgr/cephadm: do not refresh daemon and device inventory as often

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-05 06:34:38 -06:00
Sage Weil
b7fd2e8d1e Merge PR #33736 into master
* refs/pull/33736/head:
	mgr/cephadm: upgrade crash collectors too
	mgr/cephadm: fix service rm when there are no daemons

Reviewed-by: Joshua Schmid <jschmid@suse.de>
2020-03-05 06:34:18 -06:00
Lenz Grimmer
25b8ecc216
Merge pull request #33549 from rhcs-dashboard/44307-e2e-custom-credentials
mgr/dashboard: ability to provide custom credentials for E2E tests.

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-03-05 10:55:51 +01:00
Kefu Chai
57e25443dd
Merge pull request #30224 from chardan/jfw-wip-random-deduction-guide
common: random: added a deduction guide to make using the function ob…

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-05 17:17:54 +08:00
Kefu Chai
27e9ca0b9c
Merge pull request #32495 from toabctl/qa-mypy
qa: Add basic mypy support for the qa directory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-05 15:44:12 +08:00
Thomas Bechtold
46e22c422b qa: Enable basic mypy support for qa/ directory
A first step to do more automatic code checks on the qa/
directory. This is useful while transitioning to python3.

Also use log_exc to top-level to not run into:

error: Argument 1 to "log_exc" has incompatible type
  "Callable[[OSDThrasher], Any]"; expected "OSDThrasher"

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
2020-03-05 06:54:56 +01:00
Thomas Bechtold
f5e77561e9 qa: Fix problems detected by mypy
This is a first step to enable mypy on the qa/ directory.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
2020-03-05 06:53:31 +01:00
Kefu Chai
539c07818c
Merge pull request #33657 from tchaikov/wip-clang
client,common,mgr,rbd: clang related cleanups

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-By: Neha Ojha <nojha@redhat.com>
Reviewed-By: Patrick Donelly <pdonell@redhat.com>
2020-03-05 13:26:20 +08:00
Patrick Donnelly
16f2495471
Merge PR #33662 into master
* refs/pull/33662/head:
	mds: handle ceph_assert on blacklisting

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2020-03-04 20:01:39 -08:00
Sage Weil
25b2190d43 mgr/cephadm: upgrade crash collectors too
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-04 21:58:58 -06:00
Sage Weil
44cc052a88 mgr/cephadm: fix service rm when there are no daemons
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-04 21:57:36 -06:00
Kefu Chai
18f59107ac
Merge pull request #33707 from guits/guits-quick_fix_doc
doc: update erasure-code-profile.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-05 09:42:03 +08:00
Sage Weil
53120a6115 Merge PR #33730 into master
* refs/pull/33730/head:
	cephadm/vstart-smoke.sh: a smoke test to run against vstart
	mgr/cephadm: fix prom reconfig loop when dashboard is disabled
	mgr/cephadm: clean up log messages a bit
	mgr/cephadm: force remove daemons when removing service
	mgr/cephadm: do not error out on service rm|action if no daemons
	mgr/orchestrator: allow 'orch rm mon|mgr --force'

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-04 19:20:27 -06:00
Kefu Chai
38930d3df5
Merge pull request #33731 from wjwithagen/wjw-fix-test-compressor-gtest
src/test/compressor: Add missing gtest

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-05 07:50:41 +08:00
Sage Weil
d1ad1a9a69 mgr/cephadm: do not refresh daemon and device inventory as often
The device inventory rarely changes.

A daemon inventory of 60s may trigger every time around the loop when
doing upgrades, which is pretty slow (esp since it's currently done
synchronously).  We're doing a good job (I think?) of queueing refreshes,
so the only reason to time this data out is to catch daemon stops that
are caused by external factors.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-04 17:46:20 -06:00
Sage Weil
d999822be1 mgr/cephadm: if we had no record of deps, and deps are [], do not reconfig
None != []

This avoids a reconfig of every daemon on upgrade, among other things.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-04 17:17:08 -06:00
Guillaume Abrioux
25b6667459 doc: update erasure-code-profile.rst
Update this part of the documentation to reflect the change made by
3e86be7d50

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2020-03-05 00:13:50 +01:00
Sage Weil
050f5346bd Merge PR #33663 into master
* refs/pull/33663/head:
	mgr/cephadm: reduce boilerplate for unittests

Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-04 16:54:10 -06:00
Willem Jan Withagen
a11c72d6d6 src/test/compressor: Add missing gtest
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2020-03-04 22:50:44 +01:00
Joshua Schmid
179b24bd93 mgr/cephadm: reduce boilerplate for unittests
Signed-off-by: Joshua Schmid <jschmid@suse.de>
2020-03-04 15:13:38 -06:00