]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Daniel-Pivonka [Thu, 14 Jan 2021 22:18:43 +0000 (17:18 -0500)]
mgr/cephadm: add ok-to-stop functions for ceph client services
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
674912bfed92537a97e625bb79397bf97f10b24b )
Sebastian Wagner [Mon, 1 Mar 2021 12:56:51 +0000 (13:56 +0100)]
mgr/test_orchestrator: Refactor create_osds
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
0f22f24a35651a37430296e6c2eea454b3489e6a )
Sebastian Wagner [Wed, 10 Feb 2021 12:39:44 +0000 (13:39 +0100)]
mgr/volumes: adapt to now orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
a455dff412525de847c6157242349309f941d64b )
Sebastian Wagner [Tue, 9 Feb 2021 11:02:02 +0000 (12:02 +0100)]
doc/mgr/orchestrator_modules: adapt to now orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
d529f1db8242d683df7ec0f405dc695f8203357d )
Sebastian Wagner [Tue, 9 Feb 2021 10:58:31 +0000 (11:58 +0100)]
mgr/selftest: adapt to now orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
828992d7fece771c207e7de01780db541165ec61 )
Sebastian Wagner [Mon, 8 Feb 2021 09:00:21 +0000 (10:00 +0100)]
mgr/dashboard: adapt to now orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
b92dc7120588b53293f8fcff5180b428d7f4a1ff )
Sebastian Wagner [Mon, 1 Mar 2021 13:10:19 +0000 (14:10 +0100)]
mgr/mds_autoscaler: Add to tox.ini
Fixes: f69abe6291958a9ccfb85ce77c9b86e8af8ecf21
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
bca36ab3cf7499a99824b225433e72b99aeb5b43 )
Sebastian Wagner [Mon, 8 Feb 2021 08:54:07 +0000 (09:54 +0100)]
mgr/mds_autoscaler: adapt to now orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
1d406328268b8d761a2a669889bceb5c5c9374b8 )
Sebastian Wagner [Mon, 8 Feb 2021 00:56:16 +0000 (01:56 +0100)]
mgr/test_orchestrator: adapt to now orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
1ecb93a47066aff0f68d9dd7abd145c2ca22dcd1 )
Sebastian Wagner [Mon, 8 Feb 2021 00:47:42 +0000 (01:47 +0100)]
mgr/rook: Adapt to new orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
42d5c8991a9b806b960623386c95128515468c6d )
Conflicts:
src/pybind/mgr/rook/module.py
Sebastian Wagner [Mon, 8 Feb 2021 00:37:07 +0000 (01:37 +0100)]
mgr/cephadm: Adapt cephadm to new orch interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
68030bec52c98b19c398aff26677f6ff4a71fbe3 )
Sebastian Wagner [Mon, 8 Feb 2021 00:24:38 +0000 (01:24 +0100)]
mgr/orch: Remove old tests
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
b6c770a4cb4ab1fdcf738dd1df2fe6ca8801f1ad )
Sebastian Wagner [Mon, 8 Feb 2021 00:21:37 +0000 (01:21 +0100)]
mgr/orch: adapt orchestrator CLI to new interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
e4d7d7676fdc5317631c2470208319f18cfc421a )
Sebastian Wagner [Mon, 8 Feb 2021 00:01:08 +0000 (01:01 +0100)]
mgr/orch: replace Completion with OrchResult(Generic[T])
Greatly simplify the orchestrator interface
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
fcf75136634aa7750a242c60b81b86619713fbbe )
Juan Miguel Olmo Martínez [Mon, 22 Feb 2021 13:00:43 +0000 (14:00 +0100)]
mgr/orchestrator: Fix ceph orch ls in Rook
Fixes: https://tracker.ceph.com/issues/49411
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
d070caedb5971351de9521e3125d162838270c2b )
Zac Dover [Sun, 28 Feb 2021 12:13:39 +0000 (22:13 +1000)]
doc/cephadm: rewrite "install cephadm"
This PR breaks the "Deploying a New Ceph Cluster"
section into several sub-sections, so that each sub-section
pertains to only one subject. I've also added some explanatory
text that puts the instructions into context more than they were
before.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
1b626b989538e4e9bf7e9a8e51f6fb1169efaa04 )
Zac Dover [Mon, 1 Mar 2021 14:01:05 +0000 (00:01 +1000)]
doc/cephadm: rewrite "b.strap a new cluster"
This PR rewrites the section "Bootstrap A New
Cluster" in the Cephadm Guide, in the Install
Chapter. I've broken this section up into what
seem to me to be the topics that the content
naturally divides into.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
2ec313caba9edb71ec3973e2a8eaa0fb23f3d122 )
Sage Weil [Mon, 1 Mar 2021 22:42:15 +0000 (17:42 -0500)]
cephadm: add docker.service dependency in systemd units
This ensures that (1) we start after the docker daemon is running, and
(2) a restart of docker will also restart the ceph services.
Fixes: https://tracker.ceph.com/issues/46745
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
0b5bc8fc2e11f1ec84be96e7a2bdbb884e1d0de3 )
Michael Fritch [Sat, 27 Feb 2021 05:16:41 +0000 (22:16 -0700)]
cephadm: add multi-digest test
quick unit test for inspect of a container with multiple digests
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
22f9712aaa0aac7c06771bf6ceba2c3ad5845b8c )
Sage Weil [Tue, 23 Feb 2021 21:51:09 +0000 (16:51 -0500)]
mgr/orchestrator: validate config options at apply time
Make sure config options are valid/exist.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
deb9eae5b19e9d1ac95a183c6211a9f8ec25833c )
Sage Weil [Tue, 23 Feb 2021 21:50:44 +0000 (16:50 -0500)]
mgr/cephadm: disallow managed options in ServiceSpec config section
If a service is managing a config option, prevent the user from specifying
it in the spec.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
48934492df463d04c1273161db4f26567c4a70ec )
Sage Weil [Tue, 23 Feb 2021 18:47:59 +0000 (13:47 -0500)]
mgr/cephadm: add config section to ServiceSpec
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
6b852c2e013566b252ada9c33a7865a4cb62d23e )
Zac Dover [Fri, 26 Feb 2021 12:10:51 +0000 (22:10 +1000)]
doc/cephadm: s/togeter/together
Exactly as it says in the title; this is a typo
I noticed while reading over the cephadm guide.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
8c191fb5f7339bd3fcefd172b29a433113efca8e )
Sage Weil [Wed, 24 Feb 2021 16:59:44 +0000 (11:59 -0500)]
cephadm: provide meta during bootstrap
This is slightly gross, but we need ctx.meta_json for the bootstrap case,
which deploys a mon and mgr.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
42d11d46b5f0b6707befd0e3fbf51926290df004 )
Sage Weil [Tue, 23 Feb 2021 17:28:27 +0000 (12:28 -0500)]
mgr/cephadm: put service_name in unit.meta and use it when available
Inferring service_name from the daemon name is error-prone.
Fixes: https://tracker.ceph.com/issues/46219
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
852ca83933bd49a5b0df0be37a2cd1574bbc2ea7 )
Sage Weil [Tue, 23 Feb 2021 17:25:37 +0000 (12:25 -0500)]
cephadm: accept arbitrary dict via --meta-json
e.g., --meta-json '{"foo": "bar"}'
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
f58485efb66548f2f7acd94e448e160480775f81 )
Sage Weil [Fri, 5 Feb 2021 21:48:42 +0000 (15:48 -0600)]
mgr/cephadm: incorporte memory_{usage,request,limit} from 'ls'
Keep this in our cached inventory.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
ab63356f4682588017174a1590707c56f5c429d0 )
Sage Weil [Fri, 5 Feb 2021 21:48:06 +0000 (15:48 -0600)]
cephadm: accept --memory-{request,limit}
Set a limit on the pod. Pass both request and limit as
POD_MEMORY_REQUEST and POD_MEMORY_LIMIT, for consistency with Rook.
Store the request and limit in a new unit.meta file, stored next to
unit.run.
Report everything in unit.meta with 'ls' result.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a49bebe0d9772cf60261d95d837be52634787feb )
Sage Weil [Fri, 5 Feb 2021 21:45:26 +0000 (15:45 -0600)]
cephadm: include memory_usage in 'ls' output
Report of container memory usage
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
7d78d21f7c0afc4d21cdbd28125960f67b2b30c8 )
Sebastian Wagner [Thu, 25 Feb 2021 15:57:07 +0000 (16:57 +0100)]
doc/cephadm: remove Orchestrator CLI from cephadm toc
not much useful information there anymore.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f4f3fee6fd1bc8e46c9f5fbc6b1bdb810a472225 )
Sebastian Wagner [Thu, 25 Feb 2021 14:17:36 +0000 (15:17 +0100)]
doc/cephadm: move host labels to host mgmt
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
a4aef4a49db70c310372ebc59b3ef6941333b878 )
Sebastian Wagner [Thu, 25 Feb 2021 14:14:36 +0000 (15:14 +0100)]
doc/cephadm: group MDS sections into one chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
1033c46ad79795479fb75bfc8cc5b8116210d501 )
Sebastian Wagner [Thu, 18 Feb 2021 17:07:44 +0000 (18:07 +0100)]
doc/cephadm: Add iscsi
Fixes https://tracker.ceph.com/issues/49488
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
46a203a5c6f4552fd4618e659e8ac7abbba0f186 )
Sebastian Wagner [Thu, 18 Feb 2021 16:36:11 +0000 (17:36 +0100)]
doc/cephadm: group NFS sections into one chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
8d07e35b2f10f8b6b6bb039e6c066ff3d1056d86 )
Sebastian Wagner [Thu, 18 Feb 2021 14:48:27 +0000 (15:48 +0100)]
doc/cephadm: rename monitoring chapter title
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
769642c77d83e1c70b61e064151e92498f92c8a5 )
Sebastian Wagner [Thu, 18 Feb 2021 14:39:59 +0000 (15:39 +0100)]
doc/cephadm: group MON sections into one chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
b3846f6f6a4ff3daf7c26eb087992bd230ee9a47 )
Sebastian Wagner [Thu, 18 Feb 2021 14:34:04 +0000 (15:34 +0100)]
doc/cephadm: make custom containers its own chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
0fb2ccb49b765d589f56b355589dc811fbf66d63 )
Sebastian Wagner [Thu, 18 Feb 2021 14:17:07 +0000 (15:17 +0100)]
doc/cephadm: group RGW mgmt sections into one chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
818ed4f2025d46a0822d025c5cae5eeb161099c3 )
Sebastian Wagner [Thu, 18 Feb 2021 14:24:21 +0000 (15:24 +0100)]
doc/cephadm: move scheduler topic to service mgmt
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
4f3305f3bb44d9169ef74b10cb9b95e14f177137 )
Conflicts:
doc/cephadm/index.rst
Sebastian Wagner [Thu, 18 Feb 2021 14:08:44 +0000 (15:08 +0100)]
doc/cephadm: move unmanaged=true to service-mgmt.rst
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
31470cfd5c04011dc69c106a921fc4dbf561ce46 )
Sebastian Wagner [Thu, 18 Feb 2021 14:06:31 +0000 (15:06 +0100)]
doc/cephadm: group general service mgmt sections into one chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
11fe5ef7cf7fb93440d58fee5594fad8bd7ef32b )
Sebastian Wagner [Thu, 18 Feb 2021 13:48:33 +0000 (14:48 +0100)]
doc/cephadm: group OSD mgmt sections into one chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
74bcd7c5f6fe1c6ddb1b01bae8e964d71b57d5a1 )
Sebastian Wagner [Thu, 18 Feb 2021 14:20:59 +0000 (15:20 +0100)]
doc/cephadm: Move FQDN chapter to host mgmt.rst
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
a3036d974c8c25eda6c50e6f997c826d4b8cea02 )
Sebastian Wagner [Thu, 18 Feb 2021 13:52:22 +0000 (14:52 +0100)]
doc/cephadm: Move SSH config from operations to host-mgmt.rst
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
1dbac10c710ee92ed41415d2b30af58a930eecf9 )
Sebastian Wagner [Thu, 18 Feb 2021 12:43:09 +0000 (13:43 +0100)]
doc/cephadm: group host mgmt sections into one chapter
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
88e8e91f7289b4c47056ecae1d2d198c7e7259a8 )
Daniel Pivonka [Tue, 23 Feb 2021 20:13:12 +0000 (15:13 -0500)]
cephadm: fix bug in orphan-initial-daemons logic
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
0197c7b13290e1d9b2a719ed6f2f70987c9592e3 )
Sebastian Wagner [Mon, 22 Feb 2021 12:00:34 +0000 (13:00 +0100)]
mgr/orch: drop __all__ from __init__.py
`__all__` is only required if you want to modify the `form .. import *`
behavior. We don't need it.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
b8dbdb6530ce3ce98df42abc3825e0876cf8388a )
Daniel Pivonka [Thu, 28 Jan 2021 21:36:11 +0000 (16:36 -0500)]
mgr/cephadm: add DaemonDescriptionStatus
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
ae83ffc7897a0912308001f55876fd51dd56ad40 )
Daniel Pivonka [Thu, 18 Feb 2021 21:23:23 +0000 (16:23 -0500)]
cephadm: version command hide traceback when login is needed
if image comes from a authenticated registry and login has not been done yet the traceback should be hidden and only show the error message
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
4c1c656d009230894674d33efed9c31b2bc2581d )
Sebastian Wagner [Mon, 15 Feb 2021 13:43:31 +0000 (14:43 +0100)]
doc/cephadm: troubleshooting: manually deploy MGR
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
a4179acbce3b9e71abb526a5b46436d6a3b96c82 )
Patrick Seidensal [Thu, 11 Feb 2021 15:22:06 +0000 (16:22 +0100)]
cephadm: fix port_in_use when IPv6 is disabled
Do not return "port is in use" when the protocol family tested is not
supported (due to being deactivated).
Fixes: https://tracker.ceph.com/issues/49273
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
a0ffcec4af7a6f464439023d3dd0ccb62c8a856c )
Juan Miguel Olmo Martínez [Thu, 11 Feb 2021 12:19:07 +0000 (13:19 +0100)]
cephadm: Allow to use paths in all <_devices> drivegroup sections
This will allow to use specific device paths in any osd component.
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
d02683efbfcd5aa1437ebb9e73f89db38f7e7aa6 )
Adam King [Wed, 17 Feb 2021 21:51:30 +0000 (16:51 -0500)]
mgr/cephadm: error if service action called with daemonless service
Fixes: https://tracker.ceph.com/issues/49348
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
0618c69dc5255bd407595250c6980cf4929a8ce6 )
Sage Weil [Wed, 17 Feb 2021 21:21:02 +0000 (15:21 -0600)]
mgr/cephadm: fix up the strings reporting osd ids
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a1ff3a9952778c1f20836b806de9fa5606432137 )
Sage Weil [Wed, 17 Feb 2021 21:20:22 +0000 (15:20 -0600)]
mgr/cephadm: remove daemon before osd destroy/purge
Otherwise it doesn't work!
Drop the fullname property: it is always "osd.{self.osd_id}".
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b5eab0ddfa0bb8ae7b1a6aec4ea2e4257a01a045 )
Sage Weil [Wed, 17 Feb 2021 20:57:10 +0000 (14:57 -0600)]
mgr/cephadm: simplify OSD __str__ for drain
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
ca4050b057296d3c62deefca0ffcb4f640b30102 )
Sage Weil [Wed, 17 Feb 2021 16:28:05 +0000 (10:28 -0600)]
mgr/cephadm: make drain adjust crush weight if not replacing
If we are replacing an OSD, we should mark it out and then back in
again when a new device shows up. However, if we are going to
destroy an OSD, we should just weight it to 0 in crush, so that data
doesn't move again once the OSD is purged.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
4fc1309f281356db0a074da22aa6f2daa034df8d )
Sage Weil [Wed, 17 Feb 2021 20:26:14 +0000 (14:26 -0600)]
mgr/cephadm: less log noise from osd drain code
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e2f0e56ddf3197f220c5a43c79d6bc43e4b135ce )
Sage Weil [Wed, 17 Feb 2021 20:31:57 +0000 (14:31 -0600)]
mgr/cephadm: fix 'orch daemon add osd ...'
When adding an osd daemon explicitly, there is no created timestamp
for the spec, and we should never not apply it.
Fixes: b129c1312113f56a227caeb535f656f5a090a85f
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e8643275e5d92af9539e60a7a80ef13d0f27af64 )
Sage Weil [Mon, 22 Feb 2021 23:07:26 +0000 (18:07 -0500)]
mgr/cephadm/upgrade: fix typo
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
8e05d9759b607582deaed872d4e4d61c1cc30689 )
Sebastian Wagner [Tue, 16 Feb 2021 15:54:11 +0000 (16:54 +0100)]
mgr/cephadm: remove spec from CephadmDaemonDeploySpec
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
d8bcaac10a1a7cdc8689375f37f5d59d86148314 )
Sage Weil [Wed, 17 Feb 2021 17:39:25 +0000 (12:39 -0500)]
mgr/cephadm/upgrade: restart mgr after mons upgrade to pacific
If we are upgrading to pacific, we need to restart the mgr *after* the
mons have a pacific quorum so that they can get the kv subscriptions.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
4d7dd0012962202532bde4fbc47554186c95b9fb )
Sage Weil [Tue, 16 Feb 2021 23:05:37 +0000 (18:05 -0500)]
mgr/cephadm: use get_foreign_ceph_option() instead of 'config get' mon command
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
9b5cbf40f8328060d7c6d04a474ee87d5bf03ca3 )
Yuri Weinstein [Mon, 8 Mar 2021 16:08:30 +0000 (08:08 -0800)]
Merge pull request #39741 from tchaikov/pacific-49502
pacific: mgr/rbd_support: bail out if snapshot mirroring is not enabled
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Sage Weil [Mon, 8 Mar 2021 15:42:59 +0000 (09:42 -0600)]
Merge PR #39856 into pacific
* refs/pull/39856/head:
qa/distro/ubuntu_20.04_podman: Avoid getting asked
qa/suites/rados/cephadm: drop centos/rhel cephadm tests for the moment
qa/sites/rados/cephadm/thrash: rename 3-tasks.yaml/ -> 3-tasks/
qa/suites/rados/cephadm: adjust distros
qa/suites/upgrade: use kubic; test all distros
qa/suites/rados/cephadm/upgrade: use kubic on centos
qa: new kubic distro files; use kubic podman for centos/rhel
qa/suites/rados/cephadm: Add 20.04 podman:testing
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sebastian Wagner [Mon, 22 Feb 2021 13:58:38 +0000 (14:58 +0100)]
qa/distro/ubuntu_20.04_podman: Avoid getting asked
... for confic changes interactively
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
0defae4e65dee123ee0b8474bf3cb417ddff7eb1 )
Sage Weil [Fri, 5 Mar 2021 20:35:26 +0000 (14:35 -0600)]
Merge PR #39628 into pacific
* refs/pull/39628/head:
mgr/dashboard: set security headers
Reviewed-by: Nizamudeen A <nia@redhat.com>
Sage Weil [Fri, 5 Mar 2021 20:35:15 +0000 (14:35 -0600)]
Merge PR #39702 into pacific
* refs/pull/39702/head:
mon: simplify fs 'services' view of 'ceph status'
mds: add volumes + status to data: section of 'ceph status'
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 5 Mar 2021 20:35:05 +0000 (14:35 -0600)]
Merge PR #39727 into pacific
* refs/pull/39727/head:
mgr/telemetry: check if 'ident' channel is active
qa/tasks/mgr/dashboard: identify cluster in telemetry test
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
Sage Weil [Fri, 5 Mar 2021 20:34:51 +0000 (14:34 -0600)]
Merge PR #39788 into pacific
* refs/pull/39788/head:
mon/ConfigMonitor: make config changes via KVMonitor's pending set
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sage Weil [Fri, 5 Mar 2021 20:34:28 +0000 (14:34 -0600)]
Merge PR #39805 into pacific
* refs/pull/39805/head:
src/global/signal_handler.h: fix preprocessor logic for alpine
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 5 Mar 2021 20:34:16 +0000 (14:34 -0600)]
Merge PR #39811 into pacific
* refs/pull/39811/head:
doc/rbd: clarify QCOW2 migration support
Reviewed-by: Mykola Golub <mgolub@suse.com>
Yuri Weinstein [Fri, 5 Mar 2021 17:16:46 +0000 (09:16 -0800)]
Merge pull request #39806 from liewegas/pr-39665-pacific
pacific: qa/rados/dashbord use "random" objectore
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Yuri Weinstein [Fri, 5 Mar 2021 17:16:03 +0000 (09:16 -0800)]
Merge pull request #39796 from dzafman/wip-48984-pacific
pacific: osd: Don't clear m_planned_scrub until scrub finishes successfully
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 5 Mar 2021 17:15:32 +0000 (09:15 -0800)]
Merge pull request #39773 from myoungwon/pacific-backport-49482
pacific: osd, test: fix to avoid fail notification when testing manifest refcount
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Yuri Weinstein [Fri, 5 Mar 2021 17:14:46 +0000 (09:14 -0800)]
Merge pull request #39753 from ifed01/wip-ifed-bluefs-zero-read-retry-pac
pacific: os/bluestore: Add option to check BlueFS reads
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Yuri Weinstein [Fri, 5 Mar 2021 17:14:20 +0000 (09:14 -0800)]
Merge pull request #39748 from liewegas/pr-39631-pacific
pacific: mon/OSDMonitor: do not mark newly created OSDs OUT
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 5 Mar 2021 17:13:23 +0000 (09:13 -0800)]
Merge pull request #39688 from ifed01/wip-ifed-fix-huge-bluefs-writes-pac
pacific: os/bluestore: fix huge(>4GB) writes from RocksDB to BlueFS.
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sage Weil [Thu, 4 Mar 2021 18:33:12 +0000 (12:33 -0600)]
qa/suites/rados/cephadm: drop centos/rhel cephadm tests for the moment
...until we sort out the podman problems! :( :(
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e42223c4fc8ca42e03a5721ae5b0bc5362f144ce )
Sage Weil [Thu, 4 Mar 2021 18:32:27 +0000 (12:32 -0600)]
qa/sites/rados/cephadm/thrash: rename 3-tasks.yaml/ -> 3-tasks/
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
5f5472b7daede39a7bf35bf9135fc4fc75ac5a86 )
Sage Weil [Thu, 4 Mar 2021 18:32:00 +0000 (12:32 -0600)]
qa/suites/rados/cephadm: adjust distros
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
93e77ac3c81b5e6fc363786429b7eee0ac8567c3 )
Sage Weil [Wed, 3 Mar 2021 14:23:56 +0000 (08:23 -0600)]
qa/suites/upgrade: use kubic; test all distros
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b378c042296858ec4d1c63a42cd257580ca11c96 )
Sage Weil [Wed, 3 Mar 2021 14:18:19 +0000 (08:18 -0600)]
qa/suites/rados/cephadm/upgrade: use kubic on centos
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
f4de8738ca86b7b31998718b53c8b7659fcdd27f )
Sage Weil [Wed, 3 Mar 2021 14:14:29 +0000 (08:14 -0600)]
qa: new kubic distro files; use kubic podman for centos/rhel
The current centos/rhel version of podman (2.2.1) is broken.
- create new qa/distros/podman/* files that install kubic podman
- include centos/rhel variants
- adjust cephadm jobs to use new yaml files
- remove old qa/distros/all/*_podman.yaml files
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
11beb7287084b56ac7cbd45ac3d28b3d9fa4cc5b )
Sebastian Wagner [Thu, 11 Feb 2021 15:01:57 +0000 (16:01 +0100)]
qa/suites/rados/cephadm: Add 20.04 podman:testing
make sure next podman versions aren't breaking cephadm
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
2216350b567102db4ab80dc42dfff9dced2b9740 )
Ernesto Puerta [Fri, 5 Mar 2021 09:20:43 +0000 (10:20 +0100)]
Merge pull request #39808 from liewegas/pr-39801-pacific
pacific: mgr/dashboard: fix issues related with PyJWT versions >=2.0.0
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Sage Weil [Thu, 4 Mar 2021 21:08:22 +0000 (15:08 -0600)]
Merge PR #39737 into pacific
* refs/pull/39737/head:
mgr/DaemonServer: osd ok-to-stop: return json when there are unknown PGs
doc/man/8/ceph: document --max option
src/test/osd/safe-to-destroy: adjust test
ceph: print command output to stdout even on error
mgr/DaemonServer: include details in 'osd ok-to-stop' output
mgr: add --max <n> to 'osd ok-to-stop' command
mgr: relax osd ok-to-stop condition on degraded pgs
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Ernesto Puerta [Thu, 4 Mar 2021 19:54:58 +0000 (20:54 +0100)]
Merge pull request #39517 from k0ste/wip-49325-pacific
pacific: mgr/dashboard: fix MTU Mismatch alert
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Sage Weil [Thu, 4 Mar 2021 18:49:37 +0000 (12:49 -0600)]
Merge PR #39736 into pacific
* refs/pull/39736/head:
crush/CrushWrapper: rebuild shadow tree on 'osd crush reweight-subtree'
crush/CrushWrapper: update shadow trees on update_item()
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 4 Mar 2021 18:49:12 +0000 (12:49 -0600)]
Merge PR #39734 into pacific
* refs/pull/39734/head:
mon/PGMap: include the per-pool usage breakdown in pg dump
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 4 Mar 2021 18:46:41 +0000 (12:46 -0600)]
Merge PR #39735 into pacific
* refs/pull/39735/head:
mon/OSDMonitor: fix safety/idempotency of {set,rm}-device-class
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Thu, 4 Mar 2021 18:46:18 +0000 (12:46 -0600)]
Merge PR #39597 into pacific
* refs/pull/39597/head:
osd: Don't clear m_planned_scrub until scrub finishes successfully
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Sage Weil [Thu, 4 Mar 2021 13:35:24 +0000 (08:35 -0500)]
mgr/DaemonServer: osd ok-to-stop: return json when there are unknown PGs
In
791952cc01201010f298033003ba52374cc0159f we switched to return JSON
both on success and fail to describe which PGs are affected or are blocking
the ability to stop/restart OSDs. Do the same for the case where
some PG states are unknown (i.e., just after a mgr restart) so that
the cephadm upgrade process can unconditionally expect a JSON result.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
2cce16537c9f9e92bf0a8fce746d0364cbb2d15d )
Ernesto Puerta [Thu, 4 Mar 2021 12:54:36 +0000 (13:54 +0100)]
Merge pull request #39524 from rhcs-dashboard/wip-49326-pacific
pacific: mgr/dashboard: avoid using document.write()
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Thu, 4 Mar 2021 12:53:54 +0000 (13:53 +0100)]
Merge pull request #39647 from rhcs-dashboard/wip-49390-pacific
pacific: mgr/dashboard: fix tooltip for Provisioned/Total Provisioned fields
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Casey Bodley [Wed, 3 Mar 2021 20:59:01 +0000 (15:59 -0500)]
Merge pull request #39816 from cbodley/wip-49585
pacific: valgrind: suppress operator delete[] for tcmalloc
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Casey Bodley [Tue, 2 Mar 2021 14:31:08 +0000 (09:31 -0500)]
valgrind: suppress operator delete[] for tcmalloc
suppresses a mismatched operator delete[] from the librados client's
destructor:
<error>
<unique>0xeef7eb</unique>
<tid>1</tid>
<kind>MismatchedFree</kind>
<what>Mismatched free() / delete / delete []</what>
<stack>
<frame>
<ip>0x4C32EA0</ip>
<obj>/usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so</obj>
<fn>operator delete[](void*, unsigned long)</fn>
<dir>/builddir/build/BUILD/valgrind-3.16.0/coregrind/m_replacemalloc</dir>
<file>vg_replace_malloc.c</file>
<line>660</line>
</frame>
<frame>
<ip>0x5FBEB86</ip>
<obj>/usr/lib64/librados.so.2.0.0</obj>
</frame>
<frame>
<ip>0x5FBEF2C</ip>
<obj>/usr/lib64/librados.so.2.0.0</obj>
</frame>
<frame>
<ip>0x5F7F7C5</ip>
<obj>/usr/lib64/librados.so.2.0.0</obj>
<fn>librados::v14_2_0::Rados::shutdown()</fn>
</frame>
Fixes: https://tracker.ceph.com/issues/49501
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
bf087c3f840216a704600bb2436c643159421ea2 )
Alfonso Martínez [Wed, 3 Mar 2021 14:36:06 +0000 (15:36 +0100)]
mgr/dashboard: fix issues related with PyJWT versions >=2.0.0
Fixes: https://tracker.ceph.com/issues/49574
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
4b96bb51e8f133badd7bc651bcb4dcd755b43d75 )
Jason Dillaman [Tue, 2 Mar 2021 22:29:29 +0000 (17:29 -0500)]
doc/rbd: clarify QCOW2 migration support
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
68fda590cf88e6b232dfb573236fe3ae3949db28 )
Kefu Chai [Wed, 3 Mar 2021 14:07:08 +0000 (22:07 +0800)]
Merge pull request #39568 from tchaikov/pr-39365-pacific
pacific: mgr/devicehaelth: extract and present SSD wear
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>