]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoMerge pull request #36450 from sebastian-philipp/octopus-backport-35374-35667-36225...
Sebastian Wagner [Mon, 10 Aug 2020 01:53:45 +0000 (03:53 +0200)]
Merge pull request #36450 from sebastian-philipp/octopus-backport-35374-35667-36225-35839-36239-36301-36262-36012-36285-36235-36217-3572

octopus: cephadm batch backport August (1)

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #36382 from ceph/fix-rbdmirroring-dropdown-menu
Lenz Grimmer [Fri, 7 Aug 2020 11:50:32 +0000 (13:50 +0200)]
Merge pull request #36382 from ceph/fix-rbdmirroring-dropdown-menu

octopus: mgr/dashboard: fix rbdmirroring dropdown menu

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36340 from smithfarm/wip-46742-octopus
Yuri Weinstein [Thu, 6 Aug 2020 17:59:52 +0000 (10:59 -0700)]
Merge pull request #36340 from smithfarm/wip-46742-octopus

octopus: osd: fix crash in _committed_osd_maps if incremental osdmap crc fails

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36267 from Devp00l/wip-46693-octopus
Yuri Weinstein [Thu, 6 Aug 2020 17:59:08 +0000 (10:59 -0700)]
Merge pull request #36267 from Devp00l/wip-46693-octopus

octopus: mgr/dashboard: Always use fast angular unit tests

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36389 from smithfarm/wip-46798-octopus
Yuri Weinstein [Thu, 6 Aug 2020 15:20:20 +0000 (08:20 -0700)]
Merge pull request #36389 from smithfarm/wip-46798-octopus

octopus: rgw: append obj: prevent tail from being GC'ed

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agooctopus: mgr/dashboard: fix rbdmirroring dropdown menu 36382/head
Avan Thakkar [Thu, 30 Jul 2020 18:07:50 +0000 (23:37 +0530)]
octopus: mgr/dashboard: fix rbdmirroring dropdown menu

Fixes: https://tracker.ceph.com/issues/46566
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
This seems to be the same situation as https://tracker.ceph.com/issues/44458,
but in a different part of the frontend. Since we are not backporting
ngx-bootstrap to octopus, this has to be manually fixed in octopus.

5 years agoMerge pull request #35879 from ceph/wip-octopus-32493
Jan Fajerski [Tue, 4 Aug 2020 14:24:18 +0000 (16:24 +0200)]
Merge pull request #35879 from ceph/wip-octopus-32493

octopus: ceph-volume: don't use container classes in api/lvm.py

5 years agoMerge pull request #36409 from shyukri/wip-46148-octopus
Jan Fajerski [Tue, 4 Aug 2020 14:23:57 +0000 (16:23 +0200)]
Merge pull request #36409 from shyukri/wip-46148-octopus

octopus: ceph-volume: fix lvm functional tests

5 years agoMerge pull request #36410 from shyukri/wip-46112-octopus
Jan Fajerski [Tue, 4 Aug 2020 14:23:43 +0000 (16:23 +0200)]
Merge pull request #36410 from shyukri/wip-46112-octopus

octopus: ceph-volume: report correct rejected reason in inventory if device type is invalid

5 years agomgr/orchestrator: fix placement of '1' activating dry-run bug 36450/head
Daniel-Pivonka [Mon, 3 Aug 2020 19:28:35 +0000 (15:28 -0400)]
mgr/orchestrator: fix placement of '1' activating dry-run bug

when applying a placement of '1' for mon, mgr, rbd-mirror, crash, alertmanager, grafana, node-exporter, prometheus, or mds a dry-run was activated

Fixes: https://tracker.ceph.com/issues/46819
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 9f7c8f71fc19bf0b123dd2e76ea8025ed0b8ccc9)

5 years agocephadm: Fix error bootstraping with '--registry-json'
Ricardo Marques [Thu, 30 Jul 2020 14:48:21 +0000 (15:48 +0100)]
cephadm: Fix error bootstraping with '--registry-json'

We need to force setting registry auth options because
these options are unknown before the mgr first starts
and registers them.

Fixes: https://tracker.ceph.com/issues/46777
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 6f8aa25f645cdec1514daecc9b36264fa572234a)

5 years agomgr/cephadm: skip Dashboard configuration if Dashboard is disabled
Kiefer Chang [Fri, 31 Jul 2020 02:59:29 +0000 (10:59 +0800)]
mgr/cephadm: skip Dashboard configuration if Dashboard is disabled

Fixes: https://tracker.ceph.com/issues/46045
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 95a66fed20ed71b31fa5548f50566f9ec780f298)

5 years agomgr/orch: disallow unimplemented format types
Michael Fritch [Wed, 29 Jul 2020 20:14:27 +0000 (14:14 -0600)]
mgr/orch: disallow unimplemented format types

unimplemented format types can cause the mgr to hang:
$ ceph orch ls --format xml

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit b7eaefa2ee1b415c60744802c75cd34adc093ccc)

5 years agomgr/cephadm: track dependency in tox.ini
Kefu Chai [Sun, 2 Aug 2020 01:31:01 +0000 (09:31 +0800)]
mgr/cephadm: track dependency in tox.ini

* track dependency for running tox tests with tox.ini. the fix
  test is not performed by "make check", so `install-deps.sh`
  is not responsible for preparing the autopep8 wheels. hence
  we can just put it in tox.ini
* remove "python_version >= '3'" as we do not support python2

this change addresses a regression introduced by
7d8a3b60321da10af6f4557a9d69eda09ca2c620, which fails the rpmbuild like:

RPM build errors:
    Installed (but unpackaged) file(s) found:
   /usr/share/ceph/mgr/requirements-fix.txt

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a196672b77bf5f1806e0c1c8b906052cf45a6afe)

5 years agomgr/cephadm: Introduce tox and autopep8
Volker Theile [Wed, 29 Jul 2020 10:13:01 +0000 (12:13 +0200)]
mgr/cephadm: Introduce tox and autopep8

This PR introduces tox and autopep8 to format the Python code according to PEP8. It does NOT include any lint related things.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 7d8a3b60321da10af6f4557a9d69eda09ca2c620)

Conflicts:
src/pybind/mgr/tox.ini

5 years agocephadm: Deploying alertmanager image is broken
Volker Theile [Mon, 3 Aug 2020 14:53:31 +0000 (16:53 +0200)]
cephadm: Deploying alertmanager image is broken

Fixes: https://tracker.ceph.com/issues/46814
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit e401946531d6b151cd696c3ea74fa75dcd209f43)

5 years agomgr/cephadm: correct to_json output from str->dict
Joshua Schmid [Fri, 31 Jul 2020 11:33:24 +0000 (13:33 +0200)]
mgr/cephadm: correct to_json output from str->dict

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 4b8384f0638b6138abed5264e3c9688350fa9987)

5 years agocephadm: add unwrap_ipv6 helper method
Matthew Oliver [Thu, 30 Jul 2020 03:18:48 +0000 (13:18 +1000)]
cephadm: add unwrap_ipv6 helper method

When we pass in a mon-ip that is ipv6 we want it wrapped, this is so it
can be properly inserted into the mon_addrv address.
But there are times we need to unwrap it to test it's a valid ipv6
address.

This patch adds a helper method `unwrap_ipv6` which takes a string and
returns it either unwrapped or as it is, so it's harmless to other types
of ips.

This allows us to check a wrapped ipv6 base_ip with the networks on the
host.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 13d3bad01954a25dd49b7a7d71bd74dd931f09c5)

5 years agobuild/debian: remove osd_support
Joshua Schmid [Tue, 28 Jul 2020 11:43:11 +0000 (13:43 +0200)]
build/debian: remove osd_support

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 8ff2824beb78dfd03710e94302f038ea70fb4561)

5 years agodoc/cephadm: adjust osd removal docs
Joshua Schmid [Tue, 28 Jul 2020 07:35:56 +0000 (09:35 +0200)]
doc/cephadm: adjust osd removal docs

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 9606f4d6023d2663469b0857ce879ea1ae41c166)

5 years agomgr/cephadm: add tests for new remove/replace logic
Joshua Schmid [Fri, 24 Jul 2020 13:25:31 +0000 (15:25 +0200)]
mgr/cephadm: add tests for new remove/replace logic

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit e78f5c8faeedf014aa8590ff47ebbd517a77204a)

5 years agomgr/cephadm: implement osd remove/replace logic in cephadm
Joshua Schmid [Fri, 24 Jul 2020 13:24:38 +0000 (15:24 +0200)]
mgr/cephadm: implement osd remove/replace logic in cephadm

Fixes: https://tracker.ceph.com/issues/44548
Fixes: https://tracker.ceph.com/issues/45594
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit a0f68c488f74c13534b1b6452a8018f4bb2802d1)

5 years agomgr/osd_support: remove module and all traces
Joshua Schmid [Fri, 24 Jul 2020 13:23:52 +0000 (15:23 +0200)]
mgr/osd_support: remove module and all traces

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit a55c1dd0fac826978edf22e448c3456e7634cbc3)

Conflicts:
src/mon/MgrMonitor.cc

5 years agomgr/cephadm: add qa tests for daemon restart
Paul Cuzner [Wed, 29 Jul 2020 21:02:04 +0000 (09:02 +1200)]
mgr/cephadm: add qa tests for daemon restart

Added tests to cove daemon stop/start and restart

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 5ff0a1d2daa7d36c9c3284523269c4a1a7daa437)

5 years agomgr/cephadm: fix call to cephadm for daemon restarts etc
Paul Cuzner [Wed, 29 Jul 2020 04:00:37 +0000 (16:00 +1200)]
mgr/cephadm: fix call to cephadm for daemon restarts etc

The call currently passes the daemon_type as the first
parameter - but the function expects the hostname. This
results in failures when attempting daemon restarts through the ceph orch daemon <action> <daemon_id>
command.

Fixes: https://tracker.ceph.com/issues/46740
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 94e418581c9126dc199def6078d6a8449bdec8df)

5 years agomgr/cephadm: Add migration to keep the service names consistent
Sebastian Wagner [Fri, 24 Jul 2020 14:20:22 +0000 (16:20 +0200)]
mgr/cephadm: Add migration to keep the service names consistent

After 15.2.4, we unified some service IDs: MONs, MGRs etc no longer have a service id.
Which means, the service names changed:

mon.foo -> mon
mgr.foo -> mgr

This fixes the data structure consistency

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f2c0b2efae730c972f088a9d25247375c229499f)

5 years agomgr/cephadm: minor cleanup in test_migration
Sebastian Wagner [Fri, 24 Jul 2020 14:17:45 +0000 (16:17 +0200)]
mgr/cephadm: minor cleanup in test_migration

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 775d5bedad2703014878d7744d23a25d13bd9bde)

5 years agodoc/mgr/orchestrator: Fix formatting and examples in create OSDs
Varsha Rao [Thu, 30 Jul 2020 13:28:47 +0000 (15:28 +0200)]
doc/mgr/orchestrator: Fix formatting and examples in create OSDs

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 195f28a6148c41c7502027b96e8f154a99342acf)

5 years agomgr/orchestrator: For OSDs, the service_id is the osdspec_affinity
Sebastian Wagner [Fri, 31 Jul 2020 09:09:04 +0000 (11:09 +0200)]
mgr/orchestrator: For OSDs, the service_id is the osdspec_affinity

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d04bfb846b78a0a53777a32526eae935e318a606)

5 years agomgr/cephadm: get_daemons_by_service should use dd.service_name
Sebastian Wagner [Fri, 31 Jul 2020 09:06:35 +0000 (11:06 +0200)]
mgr/cephadm: get_daemons_by_service should use dd.service_name

daemon_name does not necessarily starts with the service_name.

Especially not for OSDs.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 051361e22246120331795b70513beaaff29ceb51)

5 years agopython-common: don't assert when building rados url
Michael Fritch [Thu, 30 Jul 2020 17:34:33 +0000 (11:34 -0600)]
python-common: don't assert when building rados url

breaks the `orch ls --format yaml` command

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 26aa14820196143c25d57b4d5517adf6500b19f9)

5 years agomgr/cephadm: revamp ceph.conf distribution scheduling
Sebastian Wagner [Mon, 27 Jul 2020 12:27:12 +0000 (14:27 +0200)]
mgr/cephadm: revamp ceph.conf distribution scheduling

Having an in-memeory list doesn't work properly: Especially
when loading the mgr module, we didn't knwo if we should
deploy confs or not.

Now we only distribute ceph.confs, if there is a new mon_map.
We also store that info now in the config store

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit aa4c3b2a4e9a37f0f92f50d3bafbbd63dfb6fefa)

5 years agomgr/cephadm: Add test verifying the initializaiton order
Sebastian Wagner [Mon, 27 Jul 2020 10:09:30 +0000 (12:09 +0200)]
mgr/cephadm: Add test verifying the initializaiton order

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 537412cc96be40bc4ab920eb5625f7d1338f4569)

5 years agovstart: infer the mon public_network
Michael Fritch [Tue, 28 Jul 2020 17:24:21 +0000 (11:24 -0600)]
vstart: infer the mon public_network

set the mon public_network when deploying with the cephadm flag

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6442662bbe45af2591427e9522eef45604cebbfa)

5 years agomgr/orch: allow for multiline OrchestratorEvent message
Michael Fritch [Tue, 28 Jul 2020 19:57:17 +0000 (13:57 -0600)]
mgr/orch: allow for multiline OrchestratorEvent message

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a10861255087b1122f69b6a863d5374ec113bb58)

5 years agomgr/cephadm: streamline rgw deployment
Daniel-Pivonka [Thu, 16 Jul 2020 12:24:47 +0000 (08:24 -0400)]
mgr/cephadm: streamline rgw deployment

cephadm will create realm, zonegroup, and zone if needed before creating rgw service

fixes: https://tracker.ceph.com/issues/43681
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 131001c453dc3c5d14c56691cdf25353e0127882)

5 years agomgr/cephadm: add `orch host ok-to-stop` command
Michael Fritch [Tue, 21 Jul 2020 21:06:19 +0000 (15:06 -0600)]
mgr/cephadm: add `orch host ok-to-stop` command

$ ceph orch host ok-to-stop host1
It is presumed safe to stop host host1

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d6fa2e23015c405775c89c2f1bd55d10c0d8a710)

5 years agomgr/cephadm: return HandleCommandResult from ok_to_stop
Michael Fritch [Tue, 21 Jul 2020 21:26:43 +0000 (15:26 -0600)]
mgr/cephadm: return HandleCommandResult from ok_to_stop

- return output from the result of the ok_to_stop command
- log ok-to-stop result during all invocations

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2521a7cef1a5ac0d42f26aabe597a89926814152)

5 years agomgr/orch: add errno to OrchestratorError
Michael Fritch [Wed, 22 Jul 2020 23:43:05 +0000 (17:43 -0600)]
mgr/orch: add errno to OrchestratorError

add errno to OrchestratorError and ServiceSpecValidationError exceptions

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 60b99dcdc767d5520f4dddafe124de4404ee7459)

5 years agocephadm: use src/mypy.ini instead
Sebastian Wagner [Mon, 20 Jul 2020 11:55:09 +0000 (13:55 +0200)]
cephadm: use src/mypy.ini instead

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 148ca82f7483f6564d23472f25733fc1eb743c5e)

Conflicts:
src/cephadm/tox.ini

5 years agocephadm: Add tcmu-runner container when deploying ceph-iscsi
Matthew Oliver [Wed, 22 Jul 2020 07:09:12 +0000 (17:09 +1000)]
cephadm: Add tcmu-runner container when deploying ceph-iscsi

Currently when we deploy ceph-iscsi via cephadm it doesn't include a
running tcmu-runner. Which means initiators will be able to login but
you wont see the LUNS on the initiator.

This patch deploys an additional tcmu-runner container along side the
ceph-iscsi container that just runs the tcmu-runner service.

Fixes: https://tracker.ceph.com/issues/46540
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit eb604d3338b32a7a11e36e05df6556dbd95ac4a0)

5 years agomgr/orch: Add some more type annotations
Sebastian Wagner [Fri, 24 Jul 2020 15:29:28 +0000 (17:29 +0200)]
mgr/orch: Add some more type annotations

Made `orch.Completion` a generic type

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 2310d7fbd092dc28e053f18e354ed01514061610)

5 years agomgr/cephadm: allow use of authenticated registry
Adam King [Fri, 10 Jul 2020 12:09:39 +0000 (08:09 -0400)]
mgr/cephadm: allow use of authenticated registry

Add option to use custom authenticated registry during
bootstrap as well as a registry-login command in order
to let user change authenticated registry login info

Fixes: https://tracker.ceph.com/issues/44886
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit a63b030ded2f3ea885883530eb06549356655955)

5 years agomgr/cephadm: re-add `apply_drivegroups()`
Sebastian Wagner [Thu, 23 Jul 2020 08:43:17 +0000 (10:43 +0200)]
mgr/cephadm: re-add `apply_drivegroups()`

Fixes: d348d7bf8d3663140c089937b62a0b316b69176b
Fixes: https://tracker.ceph.com/issues/46681
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 6e8f40e4a413e5de291a32185196e31fbef49c90)

5 years agodoc/cephadm: `status` doesn't show a progress
Sebastian Wagner [Mon, 27 Jul 2020 14:50:01 +0000 (16:50 +0200)]
doc/cephadm: `status` doesn't show a progress

Fixes: https://tracker.ceph.com/issues/45858
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1125a805bd7c4c4663c7805d3f713d6dd143dcce)

5 years agomgr/cephadm: create OSDs in parallel
Sebastian Wagner [Wed, 22 Jul 2020 12:45:09 +0000 (14:45 +0200)]
mgr/cephadm: create OSDs in parallel

Should speedup day 1 OSD creation by something like factor 10

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit bd356bae1474884726ff295b23a3a02951a9aedc)

5 years agomgr/cephadm: move `forall_hosts()` to utils module
Sebastian Wagner [Wed, 22 Jul 2020 12:39:26 +0000 (14:39 +0200)]
mgr/cephadm: move `forall_hosts()` to utils module

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 031365d357f02cdc5a0743c31672cbc392df8816)

5 years agodoc/mgr/orchestrator: add missing OSD service_id
Michael Fritch [Wed, 22 Jul 2020 22:35:32 +0000 (16:35 -0600)]
doc/mgr/orchestrator: add missing OSD service_id

example for deploying multiple specs via yaml was missing the service_id

Fixes: https://tracker.ceph.com/issues/46377
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 7906460483c473b639f19d7452e899635552fd82)

5 years agopython-common: clean-up ServiceSpec.service_id handling
Michael Fritch [Tue, 30 Jun 2020 22:06:20 +0000 (16:06 -0600)]
python-common: clean-up ServiceSpec.service_id handling

service_id is required for iscsi, mds, nfs, osd, rgw.

any other service_type (mon, mgr, etc.) should not contain a service_id

Fixes: https://tracker.ceph.com/issues/46175
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit eecc8fcbcc2ee88e4c873579c69f2012dac8c652)

5 years agodoc/cephadm: Fix typos in 'Cephadm Concepts' document.
Volker Theile [Wed, 22 Jul 2020 08:00:18 +0000 (10:00 +0200)]
doc/cephadm: Fix typos in 'Cephadm Concepts' document.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 7f5244f6ec44339f0bea8c201ff86dec1b9bb5b5)

5 years agodoc: add notes about --dry-run
Joshua Schmid [Mon, 6 Jul 2020 09:59:49 +0000 (11:59 +0200)]
doc: add notes about --dry-run

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit a8e21a114bb25bec9b666db61412b2c1768680dc)

5 years agomgr/cephadm: rework --dry-run/previews
Joshua Schmid [Wed, 10 Jun 2020 08:33:36 +0000 (10:33 +0200)]
mgr/cephadm: rework --dry-run/previews

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit d348d7bf8d3663140c089937b62a0b316b69176b)

Conflicts:
src/pybind/mgr/orchestrator/module.py

5 years agomgr/cephadm: adapt tests to have OSDSPEC_AFFINITY
Joshua Schmid [Thu, 4 Jun 2020 07:53:32 +0000 (09:53 +0200)]
mgr/cephadm: adapt tests to have OSDSPEC_AFFINITY

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 917e043c7c7b94a40e6867bb6fd25ff005be76b3)

5 years agomgr/cephadm: re-enable osdspec affinity passing
Joshua Schmid [Thu, 4 Jun 2020 06:52:38 +0000 (08:52 +0200)]
mgr/cephadm: re-enable osdspec affinity passing

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit edbb4f2db4834800eb3d005e92ad9497d3451668)

5 years agoMerge pull request #36332 from yuriw/wip-yuriw-octopus-p2p-octopus
Yuri Weinstein [Mon, 3 Aug 2020 18:21:47 +0000 (11:21 -0700)]
Merge pull request #36332 from yuriw/wip-yuriw-octopus-p2p-octopus

qa/tests: changed rbd/test_librbd_python.sh to run on v15.2.4

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36143 from rhcs-dashboard/wip-46576-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:14:24 +0000 (17:14 +0200)]
Merge pull request #36143 from rhcs-dashboard/wip-46576-octopus

octopus: mgr/dashboard: add API team to CODEOWNERS

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36226 from bk201/wip-46351-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:11:29 +0000 (17:11 +0200)]
Merge pull request #36226 from bk201/wip-46351-octopus

octopus: mgr/dashboard: Re-enable OSD's table autoReload

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #36277 from s0nea/wip-46590-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:08:01 +0000 (17:08 +0200)]
Merge pull request #36277 from s0nea/wip-46590-octopus

octopus: mgr/dashboard: Use same required field message accross the UI

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36322 from rhcs-dashboard/wip-46736-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:05:52 +0000 (17:05 +0200)]
Merge pull request #36322 from rhcs-dashboard/wip-46736-octopus

octopus: mgr/dashboard: cpu stats incorrectly displayed

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36369 from bk201/wip-44458
Lenz Grimmer [Mon, 3 Aug 2020 15:02:46 +0000 (17:02 +0200)]
Merge pull request #36369 from bk201/wip-44458

octopus: mgr/dashboard: right-align dropdown menu of column filters

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoceph-volume: cleanup code 36410/head
Satoru Takeuchi [Fri, 22 May 2020 01:07:17 +0000 (01:07 +0000)]
ceph-volume: cleanup code

Simplify the logic and fix a typo.

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 0169b72fff48134ef01802ade38c55281b9f4510)

Conflicts:
src/ceph-volume/ceph_volume/util/device.py
Accept incoming change on octopus

5 years agoceph-volume: fix lvm functional tests 36409/head
Jan Fajerski [Tue, 16 Jun 2020 11:47:16 +0000 (13:47 +0200)]
ceph-volume: fix lvm functional tests

This is related to https://github.com/ceph/ceph-ansible/pull/5413 and
adjusts the tests to work with the related ansible fix.

Fixes: https://tracker.ceph.com/issues/46131
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit a0134bb06508738e83456af7e440f418153053b0)

5 years agorgw: append obj: prevent tail from being GC'ed 36389/head
Abhishek Lekshmanan [Mon, 24 Feb 2020 14:32:01 +0000 (15:32 +0100)]
rgw: append obj: prevent tail from being GC'ed

append object tail gets GC'ed otherwise as the state has a manifest similar to
atomic obj processor, but if the manifest exists and the position is correct, it
is not an overwrite and shouldn't be GC'ed

Fixes: https://tracker.ceph.com/issues/42670
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 2dad52a18f889cca4309e78a88c6c5c2c04d4947)

5 years agoMerge pull request #36247 from dillaman/wip-46674
Yuri Weinstein [Thu, 30 Jul 2020 16:06:07 +0000 (09:06 -0700)]
Merge pull request #36247 from dillaman/wip-46674

octopus: librbd: new 'write_zeroes' API methods to suppliment the `discard` APIs

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agomgr/dashboard: right-align dropdown menu of column filters 36369/head
Kiefer Chang [Thu, 30 Jul 2020 09:34:42 +0000 (17:34 +0800)]
mgr/dashboard: right-align dropdown menu of column filters

When the value of a filter is too long, the text of value will run out
of the viewport. Right-aligning the menu makes the text visible.

NOTE: This change can't be backported from master because in master we had
switched the bootstrap library to ng-bootstrap and the menu is already
right-aligned in the master.

Fixes: https://tracker.ceph.com/issues/44458
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agomgr/dashboard: Updates jest to fix cache failure 36267/head
Stephan Müller [Thu, 14 May 2020 14:37:48 +0000 (16:37 +0200)]
mgr/dashboard: Updates jest to fix cache failure

Fixes: https://tracker.ceph.com/issues/45545
Signed-off-by: Stephan Müller <smueller@suse.com>
 Conflicts:
src/pybind/mgr/dashboard/frontend/package-lock.json
- Changed through package change
src/pybind/mgr/dashboard/frontend/package.json
- Conflict because the jest version was even older than what the PR in
master was replacing

5 years agomgr/dashboard: Always use fast angular unit tests
Stephan Müller [Thu, 7 May 2020 15:13:57 +0000 (17:13 +0200)]
mgr/dashboard: Always use fast angular unit tests

This will replace the current approach having a fast testing workaround
that didn't fully work on every test. Now using ng-bullet's optimization
works with every test, therefore there is no need to keep the old
configuration files and use the slow testing on Jenkins.

Fixes: https://tracker.ceph.com/issues/45433
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 46e20a5e855beb1e9ff822b0c211a3af3a928d0c)

5 years agoqa/suites/rados/thrash/crc-failures: randomly inject bad incremental osdmap crc 36340/head
Neha Ojha [Tue, 28 Jul 2020 17:36:09 +0000 (10:36 -0700)]
qa/suites/rados/thrash/crc-failures: randomly inject bad incremental osdmap crc

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit f9399b508c6584e539e323da858372fa7115be3b)

5 years agoosd: don't write transaction when inc crc failed
Dan van der Ster [Mon, 27 Jul 2020 15:40:27 +0000 (17:40 +0200)]
osd: don't write transaction when inc crc failed

80da5f9a987c6a48b93f25228fdac85890013520 exposed a flaw in how
handle_osd_map falls back to a full osdmap if the crc of an incremental
failed.

If the first message in a map message had a crc error, then the
loop would exit with last < start, which would then cause a null
dereference in _committed_osd_maps.

Fixes: https://tracker.ceph.com/issues/46443
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 99463cb523949289384a6210ea250114fbe852f4)

5 years agoqa/standalone/osd: add bad-inc-map.sh
Dan van der Ster [Mon, 27 Jul 2020 12:23:54 +0000 (14:23 +0200)]
qa/standalone/osd: add bad-inc-map.sh

Test that the osd doesn't crash when it gets a bad incremental osdmap.

Related-to: https://tracker.ceph.com/issues/46443
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit b550112dba23528655ec150cf9d6d093318abb8c)

5 years agoqa/tests: changed rbd/test_librbd_python.sh to run on v15.2.4 36332/head
Yuri Weinstein [Tue, 28 Jul 2020 19:40:32 +0000 (12:40 -0700)]
qa/tests: changed rbd/test_librbd_python.sh to run on v15.2.4

Fixes https://tracker.ceph.com/issues/46077
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #35995 from tchaikov/octopus-46408
Yuri Weinstein [Tue, 28 Jul 2020 14:59:52 +0000 (07:59 -0700)]
Merge pull request #35995 from tchaikov/octopus-46408

octopus: mgr: avoid false alarm of MGR_MODULE_ERROR

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #35957 from smithfarm/wip-46372-octopus
Yuri Weinstein [Tue, 28 Jul 2020 14:59:17 +0000 (07:59 -0700)]
Merge pull request #35957 from smithfarm/wip-46372-octopus

octopus: osd: expose osdspec_affinity to osd_metadata

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #35893 from callithea/wip-46214-octopus
Yuri Weinstein [Tue, 28 Jul 2020 14:56:21 +0000 (07:56 -0700)]
Merge pull request #35893 from callithea/wip-46214-octopus

octopus: mgr/dashboard: Add host labels in UI

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agomgr/dashboard: cpu stats incorrectly displayed 36322/head
Avan Thakkar [Thu, 23 Jul 2020 06:27:32 +0000 (11:57 +0530)]
mgr/dashboard: cpu stats incorrectly displayed

Fixes: https://tracker.ceph.com/issues/46683
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit f039e5585d552c553e37a5f68713cfe2b109b97f)

5 years agoceph-volume: filter by osd-id or osd-fsid when zapping 35879/head
Guillaume Abrioux [Mon, 20 Jul 2020 13:43:38 +0000 (15:43 +0200)]
ceph-volume: filter by osd-id or osd-fsid when zapping

2f5c10c12c37e6865ce54bb4940d3779353cba4f introduced a bug:

`ceph-volume lvm zap` command fails under certain conditions.

when passing `--osd-id` or `--osd-fsid` to `ceph-volume lvm zap` command
it tries to zap additionnal devices that have nothing to do with the osd
being zapped.

When calling `api.get_lvs()` in `ensure_associated_lvs()` we have to
pass the osd-id/osd-fsid information so only related devices are
returned by `get_lvs()` method

Closes: https://tracker.ceph.com/issues/46627
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e94aef6f96189648d0f204d8118501577dde5f52)

5 years agoMerge PR #36224 into octopus
Patrick Donnelly [Fri, 24 Jul 2020 18:23:41 +0000 (11:23 -0700)]
Merge PR #36224 into octopus

* refs/pull/36224/head:
mgr/nfs: Remove NParts and Cache_Size from MDCACHE block
doc/cephfs/nfs: Update about deploying nfs-ganesha with cephadm in vstart

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36265 from sebastian-philipp/octopus-backport-35955-35709-35744...
Sebastian Wagner [Fri, 24 Jul 2020 13:17:56 +0000 (15:17 +0200)]
Merge pull request #36265 from sebastian-philipp/octopus-backport-35955-35709-35744-35991-35838-35471-35862-35901-35456-35846-36152-3599

octopus: cephadm batch backport July (3)

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #36160 from rhcs-dashboard/wip-46602-octopus
Laura Paduano [Fri, 24 Jul 2020 08:35:31 +0000 (10:35 +0200)]
Merge pull request #36160 from rhcs-dashboard/wip-46602-octopus

octopus: mgr/dashboard: fix ui api endpoints

Reviewed-by: Fabrizio D'Angelo <fdangelo@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agomgr/dashboard: Use same required field message accross the UI 36277/head
Volker Theile [Tue, 7 Jul 2020 11:48:50 +0000 (13:48 +0200)]
mgr/dashboard: Use same required field message accross the UI

Some pages use the message 'Required field', but 99% use 'This field is required'. Use the latter everywhere.

Fixes: https://tracker.ceph.com/issues/46395
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit c70e5706652fb14cef078727749d4699aacc20fd)

5 years agocephadm: fix UnboundLocalError: `container_path` 36265/head
Sebastian Wagner [Mon, 20 Jul 2020 11:51:14 +0000 (13:51 +0200)]
cephadm: fix UnboundLocalError: `container_path`

Fixes: https://tracker.ceph.com/issues/46098
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 8532f5331111e2fd5a75df3e19ffb7d6b74c8498)

5 years agocephadm: remove ktdreyer's copr repository
Dimitri Savineau [Fri, 17 Jul 2020 17:38:14 +0000 (13:38 -0400)]
cephadm: remove ktdreyer's copr repository

This was needed as a temporary solution until all missing EL8 packages
are built on EPEL 8.
Because we now have all dependencies on EPEL 8 then we can remove that
repository.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 4cf99eb68e5c5e7e2423905dd83684b03e80b99b)

5 years agocephadm: Fix ipv6 network regex to support routes with expiry
Matthew Oliver [Thu, 16 Jul 2020 06:38:29 +0000 (06:38 +0000)]
cephadm: Fix ipv6 network regex to support routes with expiry

The regex I previously added didn't take into account ipv6 networks that
had an expiry, this patch updates the regex and includes an ipv6 route
version in the test.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit f4a986cbffccbf00b499d2d0546ac4623c12ddad)

5 years agomgr/osd_support: add unittests
Joshua Schmid [Thu, 9 Jul 2020 09:40:54 +0000 (11:40 +0200)]
mgr/osd_support: add unittests

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 0fcfc5455dde176bc1bc82fb3176c8be4788c15d)

5 years agoceph: Fix `tell` for cephadm
Sebastian Wagner [Fri, 17 Jul 2020 10:50:07 +0000 (12:50 +0200)]
ceph: Fix `tell` for cephadm

The tell target might contain dots now. Like
`mds.myfs.myhost.rnusmq` is now a valid
target.

Fixes: https://tracker.ceph.com/issues/46560
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d5b8e3d61cd42d23857d7066660e03aecc89d9ce)

5 years agocephadm: also retry on digest mismatch
Sebastian Wagner [Tue, 14 Jul 2020 13:11:46 +0000 (15:11 +0200)]
cephadm: also retry on digest mismatch

Fixes: https://tracker.ceph.com/issues/46534
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ea080e669a83bc2f7478587ef5f4c6a658738a62)

5 years agocephadm: Retry pull on transient error
Sebastian Wagner [Tue, 30 Jun 2020 09:26:58 +0000 (11:26 +0200)]
cephadm: Retry pull on transient error

Fixes: https://tracker.ceph.com/issues/46271
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f3e770f3541c716b4f568cf73255f25243c655e5)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Fri, 17 Jul 2020 15:26:52 +0000 (09:26 -0600)]
mgr/cephadm: clean-up service module type checking

mypy cast to avoid:

cephadm/module.py: note: In member "_config_fn" of class "CephadmOrchestrator":
cephadm/module.py:1797: error: Incompatible return value type (got "Optional[function]", expected "Optional[Callable[[ServiceSpec], None]]")

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 502c574c36f49947cb7a501cafd5530455451773)

5 years agomgr/cephadm: assert the service_type during config/create
Michael Fritch [Wed, 15 Jul 2020 22:23:59 +0000 (16:23 -0600)]
mgr/cephadm: assert the service_type during config/create

ensure the passed ServiceSpec type matches the CephadmService type

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f8186bd72f807df3c8a31b8c515d2a9e4bb69d09)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Mon, 13 Jul 2020 22:22:59 +0000 (16:22 -0600)]
mgr/cephadm: clean-up service module type checking

- convert to py3 style type checks
- other misc type checking fixups

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2bcdcef8ecc256cd86bc7744d392cda875341cb3)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Tue, 14 Jul 2020 13:18:48 +0000 (07:18 -0600)]
mgr/cephadm: clean-up service module type checking

- add return type to `config` func
- add missing `NFSServiceSpec` annotation to `config` func

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 414e5507034f6380edac78de86419cd98dc59295)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Mon, 13 Jul 2020 20:41:57 +0000 (14:41 -0600)]
mgr/cephadm: clean-up service module type checking

- add missing return type to `create` func

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6c020b697e400461760ef41f246e94913923f9df)

5 years agocephadm: fix indentation
Patrick Seidensal [Tue, 7 Jul 2020 12:29:49 +0000 (14:29 +0200)]
cephadm: fix indentation

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 8844ff41b6547d82c6f900493e830de8686660bc)

5 years agocephadm: remove unused/commented out code
Patrick Seidensal [Tue, 7 Jul 2020 12:29:12 +0000 (14:29 +0200)]
cephadm: remove unused/commented out code

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 6aa87f7b0dfd516439a6c75681e20d7dffacaf4d)

5 years agocephadm: fix creating custom Prometheus image
Patrick Seidensal [Tue, 7 Jul 2020 11:58:27 +0000 (13:58 +0200)]
cephadm: fix creating custom Prometheus image

Fix the code by improving a condition where a zero as uid or gid leads
to an additional attempt to extract the uid/gid instead of uid/gid
simply being used correctly.

Fixes: https://tracker.ceph.com/issues/46398
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 3c98f1553fe3b91777ee81d887d02462132475fb)

5 years agomgr/cephadm: Add CEPHADM_PAUSED to test_cli
Sebastian Wagner [Tue, 30 Jun 2020 13:13:51 +0000 (15:13 +0200)]
mgr/cephadm: Add CEPHADM_PAUSED to test_cli

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit aee1aed64131e615bbf5b9453f52fec5eef36bf9)

5 years agomgr/cephadm: Set exception context to populate orch events.
Sebastian Wagner [Sat, 6 Jun 2020 23:25:21 +0000 (01:25 +0200)]
mgr/cephadm: Set exception context to populate orch events.

Like when if daemon deployment fails

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1dd2c5c4fbce49495736c12c3aea2c96f6ad4696)

5 years agomgr/cephadm: Add event when deploying a daemon
Sebastian Wagner [Sat, 6 Jun 2020 22:54:35 +0000 (00:54 +0200)]
mgr/cephadm: Add event when deploying a daemon

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 960f6bfac0d18eb92a017ea21ca97efa1a12b7cf)

5 years agomgr/cephadm: Add an event when creating a service
Sebastian Wagner [Sat, 6 Jun 2020 22:53:34 +0000 (00:53 +0200)]
mgr/cephadm: Add an event when creating a service

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 05ade49a0900ae0714a8bfe53a8b993d46d5be50)

5 years agomgr/cephadm: Add inventory.EventStore
Sebastian Wagner [Sat, 6 Jun 2020 22:51:38 +0000 (00:51 +0200)]
mgr/cephadm: Add inventory.EventStore

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f5b0155e04ab23beecea5d832a59d4e14cd4e898)