]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/cephadm: Add comments to secondary contaieners 36975/head
Sebastian Wagner [Wed, 2 Sep 2020 07:37:24 +0000 (09:37 +0200)]
mgr/cephadm: Add comments to secondary contaieners

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Co-authored-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 98c0119833b9fc9648d667f002d84b1ccb75f334)

4 years agocephadm: properly remove `osd-activate` container
Sebastian Wagner [Fri, 28 Aug 2020 09:58:12 +0000 (11:58 +0200)]
cephadm: properly remove `osd-activate` container

Othwerise we end up with being unable to create
new containers, due to the name being already used

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

4 years agomgr/cephadm: customize blink_device_light cmd via j2
Sebastian Wagner [Mon, 31 Aug 2020 13:41:39 +0000 (15:41 +0200)]
mgr/cephadm: customize blink_device_light cmd via j2

Customized blink a device light. By default running something like:

    lsmcli local-disk-ident-led-on --path $path

If you must, you can customize this via:

    ceph config-key set mgr/cephadm/lsmcli_blink_lights_cmd '<my jinja2 template>'

where my jinja2 template is something like:

    lsmcli local-disk-{{ ident_fault }}-led-{{'on' if on else 'off'}} --path '{{ path or dev }}'

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

4 years agomgr/cephadm: Add extensive test for blink_device_light
Sebastian Wagner [Mon, 31 Aug 2020 13:11:24 +0000 (15:11 +0200)]
mgr/cephadm: Add extensive test for blink_device_light

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

4 years agomgr/cephadm: PEP8tify test_migration.py
Sebastian Wagner [Mon, 31 Aug 2020 09:48:14 +0000 (11:48 +0200)]
mgr/cephadm: PEP8tify test_migration.py

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

4 years agocephadm: auto wrap and unwrap ipv6 addresses
Matthew Oliver [Mon, 17 Aug 2020 01:08:56 +0000 (11:08 +1000)]
cephadm: auto wrap and unwrap ipv6 addresses

This patch attempts to simplify IPv6 support in cephadm by automatically
wrapping and unwrapping IPv6 addresses when required.

There are some asumptions though, if you are supplyings an IPv6 addrv
then it needs to be wrapped. But because you are specifiying, you should
know what your doing.

But in general, it means in bootstrap you should be able to supply ipv6
addresses wrapped or not so long as there isn't a post appended.

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

Conflicts:
src/pybind/mgr/dashboard/tools.py
src/python-common/ceph/deployment/service_spec.py

4 years agomgr/cephadm: PEP8tify module.py
Sebastian Wagner [Sat, 29 Aug 2020 18:41:20 +0000 (20:41 +0200)]
mgr/cephadm: PEP8tify module.py

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

4 years agomgr/cephadm: Verify non-empty list in get_active_daemon functions
Adam King [Thu, 27 Aug 2020 16:22:49 +0000 (12:22 -0400)]
mgr/cephadm: Verify non-empty list in get_active_daemon functions

The get_active_daemon functions for monitoring stack daemons
were just returning the first or last daemon in the given list
without checking the list actually contained any daemons

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

4 years agomgr/cephadm: kick serve loop to trigger ceph.conf deployment
Sebastian Wagner [Thu, 27 Aug 2020 09:33:31 +0000 (11:33 +0200)]
mgr/cephadm: kick serve loop to trigger ceph.conf deployment

Otherwise we'll wait 600s.

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

4 years agomgr/cephadm: add test_daemon_check
Sebastian Wagner [Fri, 21 Aug 2020 15:38:33 +0000 (17:38 +0200)]
mgr/cephadm: add test_daemon_check

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

4 years agomgr/cephadm: Make daemon actions asynchronous
Sebastian Wagner [Fri, 21 Aug 2020 14:25:31 +0000 (16:25 +0200)]
mgr/cephadm: Make daemon actions asynchronous

Fixes broken `ceph orch redeploy <current active mgr>`

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

4 years agomgr/cephadm: add scheduled_daemon_actions to HostCache
Sebastian Wagner [Fri, 21 Aug 2020 09:44:15 +0000 (11:44 +0200)]
mgr/cephadm: add scheduled_daemon_actions to HostCache

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

4 years agomgr/cephadm: move fail_over from upgrade.py to MgrService
Sebastian Wagner [Wed, 19 Aug 2020 10:39:39 +0000 (12:39 +0200)]
mgr/cephadm: move fail_over from upgrade.py to MgrService

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

4 years agomgr/cephadm: _wait_for_ok_to_stop: add missing f-prefix
Sebastian Wagner [Wed, 19 Aug 2020 10:25:18 +0000 (12:25 +0200)]
mgr/cephadm: _wait_for_ok_to_stop: add missing f-prefix

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

4 years agomgr/cephadm: _create_daemon: remove usused parameter
Sebastian Wagner [Wed, 19 Aug 2020 10:12:00 +0000 (12:12 +0200)]
mgr/cephadm: _create_daemon: remove usused parameter

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

4 years agomgr/orch: daemon redeploy: Fix missing default value
Sebastian Wagner [Wed, 19 Aug 2020 10:10:04 +0000 (12:10 +0200)]
mgr/orch: daemon redeploy: Fix missing default value

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

4 years agomgr/cephadm: PEP8tify inventory.py
Sebastian Wagner [Tue, 25 Aug 2020 13:29:36 +0000 (15:29 +0200)]
mgr/cephadm: PEP8tify inventory.py

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

4 years agomgr/cephadm: disable autopep8 for test_{spec,scheduling}.py
Sebastian Wagner [Thu, 27 Aug 2020 08:20:34 +0000 (10:20 +0200)]
mgr/cephadm: disable autopep8 for test_{spec,scheduling}.py

The signal to noise ratio is just too bad.

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

4 years agodoc/mgr: Clean up orchestrator.rst (spell/punct, awkward wording)
Dan Mick [Sat, 8 Aug 2020 03:14:26 +0000 (03:14 +0000)]
doc/mgr: Clean up orchestrator.rst (spell/punct, awkward wording)

Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit a2a90542021005622e6a763c4593d2994177f4bd)

4 years agomgr/cephadm: PEP8tify services/osd.py
Sebastian Wagner [Wed, 26 Aug 2020 09:41:58 +0000 (11:41 +0200)]
mgr/cephadm: PEP8tify services/osd.py

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

4 years agocephadm: Give better access to the /dev in the iscsi container
Matthew Oliver [Thu, 27 Aug 2020 02:44:40 +0000 (12:44 +1000)]
cephadm: Give better access to the /dev in the iscsi container

In testing it seems the main iscsi container's /dev related volume mount to just
/dev/log is too narrow. And in certain circumstances it needs to access
to see /dev/rbd* devices. Like if using krdb.

This patch volume mounts /dev rather then /dev/log in the main
container, but since this aligns with what we need in the tcmu-runner
container it actaully ends up simplifying the code as well.

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

4 years agomgr/orchestrator: PEP8tify
Sebastian Wagner [Wed, 26 Aug 2020 09:48:17 +0000 (11:48 +0200)]
mgr/orchestrator: PEP8tify

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

4 years agomgr/cephadm: use `check_mon_command` during iscsi config
Michael Fritch [Tue, 25 Aug 2020 17:19:03 +0000 (11:19 -0600)]
mgr/cephadm: use `check_mon_command` during iscsi config

ensure the mon commands actually succeed

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

4 years agocephadm: infer latest image with a valid tag
Michael Fritch [Tue, 25 Aug 2020 13:55:08 +0000 (07:55 -0600)]
cephadm: infer latest image with a valid tag

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

4 years agomgr/cephadm: use `check_mon_command` util
Michael Fritch [Tue, 25 Aug 2020 15:26:51 +0000 (09:26 -0600)]
mgr/cephadm: use `check_mon_command` util

rather then checking the retval explicitly

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

4 years agomgr/cephadm: merge NFSGanesha into NFSService class
Michael Fritch [Fri, 21 Aug 2020 00:52:33 +0000 (18:52 -0600)]
mgr/cephadm: merge NFSGanesha into NFSService class

these two classes really preform the same function

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

4 years agomgr/cephadm: use supplied `CephadmDaemonSpec`
Michael Fritch [Thu, 20 Aug 2020 20:10:11 +0000 (14:10 -0600)]
mgr/cephadm: use supplied `CephadmDaemonSpec`

69ed3d9cffd refactored `_create_daemon()` which obsoleted any need to
search for the NFSServiceSpec in the SpecStore

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

4 years agomgr/cephadm: move NFS config/create func
Michael Fritch [Thu, 20 Aug 2020 20:06:15 +0000 (14:06 -0600)]
mgr/cephadm: move NFS config/create func

preserve func order seen in the impl. for the other services

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

4 years agocephadm: Update error message on host failure
Stephan Müller [Tue, 28 Jul 2020 18:36:30 +0000 (20:36 +0200)]
cephadm: Update error message on host failure

Now the error message explains how to add the ssh key to the not
reachable host

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

4 years agomgr/cephadm: PEP8tify some tests
Sebastian Wagner [Wed, 26 Aug 2020 09:45:56 +0000 (11:45 +0200)]
mgr/cephadm: PEP8tify some tests

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

4 years agocephadm: deploying of monitoring images partially broken
Patrick Seidensal [Tue, 28 Jul 2020 08:23:57 +0000 (10:23 +0200)]
cephadm: deploying of monitoring images partially broken

Deployment of monitoring images has been broken in the context of
ceph-salt. Due to the removal of the registries in
/etc/containers/registries.conf, all images need to be provided
qualified.

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

4 years agocephadm: remove py2 from tox tests
Paul Cuzner [Tue, 11 Aug 2020 21:22:27 +0000 (09:22 +1200)]
cephadm: remove py2 from tox tests

cephadm is dependent on py3, and the presence of py2 in
tox is just going to throw more errors over time as py3
idioms are adopted. py2 is EOL, and older hosts should
have py3 available as an installation option anyway.

This patch just removes py2 from the tox test.

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

4 years agomgr/cephadm: PEP8tify cephadmservice.py
Sebastian Wagner [Tue, 25 Aug 2020 13:33:06 +0000 (15:33 +0200)]
mgr/cephadm: PEP8tify cephadmservice.py

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

4 years agocephadm: remove py2 from test_adoption
Paul Cuzner [Mon, 24 Aug 2020 22:51:26 +0000 (10:51 +1200)]
cephadm: remove py2 from test_adoption

Since cephadm is py3 based, and py2 is EOL this patch
removes the py2 test iteration from test_adoption.sh

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

4 years agocephadm: remove py2 from test stream
Paul Cuzner [Wed, 19 Aug 2020 23:58:34 +0000 (11:58 +1200)]
cephadm: remove py2 from test stream

Since py2 is EOL, and cephadm requires py3 anyway this
patch removes the py2 test iteration from the functional
testing suite.

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

4 years agocephadm: make devices lists more granular in gather-facts
Paul Cuzner [Wed, 19 Aug 2020 23:12:09 +0000 (11:12 +1200)]
cephadm: make devices lists more granular in gather-facts

The gather-facts commands returns a list of hdd and flash
devices. This patch changes the list content from being
simple strings representing the disks to a dict, making it
easier to extend in the future.

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

4 years agocephadm: add gather-facts to the qa test
Paul Cuzner [Wed, 12 Aug 2020 00:01:48 +0000 (12:01 +1200)]
cephadm: add gather-facts to the qa test

Adds a gather-facts invocatio after check-host is run.

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

4 years agocephadm: enhance memory and cpu data
Paul Cuzner [Mon, 10 Aug 2020 21:53:12 +0000 (09:53 +1200)]
cephadm: enhance memory and cpu data

Added free/available memory state, and cpu loadavg info

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

4 years agocephadm: fixes to address PR requirements
Paul Cuzner [Mon, 10 Aug 2020 06:03:41 +0000 (18:03 +1200)]
cephadm: fixes to address PR requirements

Minor changes to address issues raised in the PR;
- formatting of ipv6 addresses
- missing docstrings
- NIC mtu and speed now int instead of string
- added NIC driver name
- removed discrete JSON method making gather-facts JSON only
- added upper/lower device lists to show NIC relationships
- added hostname to the JSON!
- added selinux/apparmor status
- added timestamp (epoch) for the gather-facts run
- added system uptime (secs)

Closes:

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

4 years agocephadm: add gather_facts command
Paul Cuzner [Fri, 7 Aug 2020 04:28:30 +0000 (16:28 +1200)]
cephadm: add gather_facts command

The gather_facts command is intended to provide host
level metadata to the caller, which could then be used
in a number of places: orchestrator inventory, displayed
in the UI etc

Data is extracted mainly from sysfs and /proc

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

4 years agomgr/cephadm: PEP8tify schedule.py
Sebastian Wagner [Tue, 25 Aug 2020 13:30:51 +0000 (15:30 +0200)]
mgr/cephadm: PEP8tify schedule.py

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

4 years agomgr/cephadm: use raw string during `re.search`
Michael Fritch [Fri, 21 Aug 2020 16:03:05 +0000 (10:03 -0600)]
mgr/cephadm: use raw string during `re.search`

cephadmservice.py:348: DeprecationWarning: invalid escape sequence \:
    port = re.search('\:\d+\/', end_point)

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

4 years agoqa/tasks/cephadm.py: add ceph logs directory in job's info.yaml
Shraddha Agrawal [Wed, 19 Aug 2020 10:54:18 +0000 (16:24 +0530)]
qa/tasks/cephadm.py: add ceph logs directory in job's info.yaml

This commit adds the file path of ceph log directories to the job's
info.yaml log file. The motivation behind this is, in case of job
timeout, the logs would still be tranferred to teuthology host
before nuking test machines using these ceph log directory paths in
job's info.yaml log file.

Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
(cherry picked from commit d2ff5c5eb609eba02e6c966015bb7e1d9b349be4)

Conflicts:
qa/tasks/cephadm.py

4 years agoCODEOWNERS: Add cephadm man page to @ceph/orchestrators
Sebastian Wagner [Mon, 24 Aug 2020 08:30:12 +0000 (10:30 +0200)]
CODEOWNERS: Add cephadm man page to @ceph/orchestrators

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

4 years agodoc/man/cephadm: Add missing parameters for `ls`
Sebastian Wagner [Mon, 24 Aug 2020 08:28:07 +0000 (10:28 +0200)]
doc/man/cephadm: Add missing parameters for `ls`

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

4 years agoMerge pull request #36981 from neha-ojha/wip-47297-octopus
Yuri Weinstein [Fri, 4 Sep 2020 23:07:22 +0000 (16:07 -0700)]
Merge pull request #36981 from neha-ojha/wip-47297-octopus

octopus: mon/OSDMonitor: only take in osd into consideration when trimming osd…

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
4 years agomon/OSDMonitor: only take in osd into consideration when trimming osdmaps 36981/head
Kefu Chai [Thu, 3 Sep 2020 15:02:58 +0000 (23:02 +0800)]
mon/OSDMonitor: only take in osd into consideration when trimming osdmaps

we should not take down osd into consideration when trimming osdmap. in
e62269c892, we decrease the upper bound of range of osdmaps to be trimmed
if the given osd is out. but we should have to decrease it only if the
osd in question is still *in*.

so, in this change, the min_lec is decreased only if the osd in question
is *in*.

Fixes: https://tracker.ceph.com/issues/47290
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 79175740cf2394bba74163ca8a5131419b9641ed)

 Conflicts:
src/mon/OSDMonitor.cc - trivial resolution

4 years agoMerge pull request #36973 from sebastian-philipp/octopus-mgr-re-add_osd_support
Yuri Weinstein [Thu, 3 Sep 2020 22:34:02 +0000 (15:34 -0700)]
Merge pull request #36973 from sebastian-philipp/octopus-mgr-re-add_osd_support

octopus: Revert "mgr/osd_support: remove module and all traces"

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoRevert "mgr/osd_support: remove module and all traces" 36973/head
Sebastian Wagner [Wed, 2 Sep 2020 14:05:25 +0000 (16:05 +0200)]
Revert "mgr/osd_support: remove module and all traces"

This reverts commit a55c1dd0fac826978edf22e448c3456e7634cbc3.

Kept to keep upgrades from older point releases working.
This module can be removed as soon as we no longer
support upgrades from old octopus point releases.

Revert "build/debian: remove osd_support"

This reverts commit 8ff2824beb78dfd03710e94302f038ea70fb4561.

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

4 years agoMerge pull request #36786 from callithea/wip-46936-octopus
Yuri Weinstein [Thu, 27 Aug 2020 19:21:19 +0000 (12:21 -0700)]
Merge pull request #36786 from callithea/wip-46936-octopus

octopus: mgr: Add missing states to PG_STATES in mgr_module.py.

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36795 from ifed01/wip-ifed-simplify-pin-octopus
Yuri Weinstein [Thu, 27 Aug 2020 17:21:25 +0000 (10:21 -0700)]
Merge pull request #36795 from ifed01/wip-ifed-simplify-pin-octopus

octopus: os/bluestore: simplify Onode pin/unpin logic

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36644 from smithfarm/wip-46471-octopus
Yuri Weinstein [Thu, 27 Aug 2020 16:53:08 +0000 (09:53 -0700)]
Merge pull request #36644 from smithfarm/wip-46471-octopus

octopus: rgw: stop realm reloader before store shutdown

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #36689 from rhcs-dashboard/wip-46993-octopus
Lenz Grimmer [Thu, 27 Aug 2020 11:27:35 +0000 (13:27 +0200)]
Merge pull request #36689 from rhcs-dashboard/wip-46993-octopus

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #36587 from tspmelo/wip-46907-octopus
Lenz Grimmer [Thu, 27 Aug 2020 10:08:30 +0000 (12:08 +0200)]
Merge pull request #36587 from tspmelo/wip-46907-octopus

octopus: mgr/dashboard: Extract documentation link to a component

Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #36614 from rishabh-d-dave/cv-add-tests-for-new-lvm-functions-o
Jan Fajerski [Thu, 27 Aug 2020 09:38:57 +0000 (11:38 +0200)]
Merge pull request #36614 from rishabh-d-dave/cv-add-tests-for-new-lvm-functions-o

octopus: ceph-volume: add tests for new functions that run LVM commands

4 years agoMerge pull request #36608 from rishabh-d-dave/cv-rm-container-classes-o
Jan Fajerski [Thu, 27 Aug 2020 09:38:44 +0000 (11:38 +0200)]
Merge pull request #36608 from rishabh-d-dave/cv-rm-container-classes-o

octopus: ceph-volume: remove container classes from api/lvm.py

4 years agoMerge pull request #36782 from callithea/wip-46974-octopus
Lenz Grimmer [Thu, 27 Aug 2020 08:40:10 +0000 (10:40 +0200)]
Merge pull request #36782 from callithea/wip-46974-octopus

octopus: mgr/dashboard: Strange iSCSI discovery auth behavior

Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #36831 from rhcs-dashboard/wip-47155-octopus
Lenz Grimmer [Thu, 27 Aug 2020 08:38:19 +0000 (10:38 +0200)]
Merge pull request #36831 from rhcs-dashboard/wip-47155-octopus

octopus: mgr/dashboard: redirect to original URL after successful login

Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #36661 from smithfarm/wip-46586-octopus
Neha Ojha [Wed, 26 Aug 2020 22:17:43 +0000 (15:17 -0700)]
Merge pull request #36661 from smithfarm/wip-46586-octopus

octopus: doc/rados: Fix osd_scrub_during_recovery default value

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36690 from smithfarm/wip-46996-octopus
Neha Ojha [Wed, 26 Aug 2020 21:59:29 +0000 (14:59 -0700)]
Merge pull request #36690 from smithfarm/wip-46996-octopus

octopus: doc/mgr/crash: Add missing command in rm example

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agomgr/dashboard: redirect to original URL after successful login 36831/head
Avan Thakkar [Wed, 12 Aug 2020 09:22:22 +0000 (14:52 +0530)]
mgr/dashboard: redirect to original URL after successful login

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

4 years agoMerge pull request #36693 from epuertat/wip-47001-octopus
Lenz Grimmer [Wed, 26 Aug 2020 07:11:44 +0000 (09:11 +0200)]
Merge pull request #36693 from epuertat/wip-47001-octopus

octopus: mgr/dashboard/api: reduce amount of daemon logs

Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #35975 from callithea/wip-46418-octopus
Lenz Grimmer [Wed, 26 Aug 2020 07:09:29 +0000 (09:09 +0200)]
Merge pull request #35975 from callithea/wip-46418-octopus

octopus: mgr/dashboard: Hide password notification when expiration date is far

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #36789 from rhcs-dashboard/wip-47121-octopus
Lenz Grimmer [Wed, 26 Aug 2020 07:07:07 +0000 (09:07 +0200)]
Merge pull request #36789 from rhcs-dashboard/wip-47121-octopus

octopus: mgr/dashboard: remove "This week/month/year" and "Today" time stamps

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #36635 from smithfarm/wip-46957-octopus
Yuri Weinstein [Tue, 25 Aug 2020 22:10:37 +0000 (15:10 -0700)]
Merge pull request #36635 from smithfarm/wip-46957-octopus

octopus: mgr/volumes/nfs: Add interface for adding user defined configuration

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #36403 from ShyamsundarR/wip-46795-octopus
Yuri Weinstein [Tue, 25 Aug 2020 22:09:45 +0000 (15:09 -0700)]
Merge pull request #36403 from ShyamsundarR/wip-46795-octopus

octopus: client: expose ceph.quota.max_bytes xattr within snapshots

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36197 from smithfarm/wip-mds-fix-typo-octopus
Yuri Weinstein [Tue, 25 Aug 2020 22:09:24 +0000 (15:09 -0700)]
Merge pull request #36197 from smithfarm/wip-mds-fix-typo-octopus

octopus: mds/MDSRank: fix typo in "unrecognized"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36195 from smithfarm/wip-46591-octopus
Yuri Weinstein [Tue, 25 Aug 2020 22:09:03 +0000 (15:09 -0700)]
Merge pull request #36195 from smithfarm/wip-46591-octopus

octopus: common:  ignore SIGHUP prior to fork

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36126 from ShyamsundarR/wip-46528-octopus
Yuri Weinstein [Tue, 25 Aug 2020 22:08:20 +0000 (15:08 -0700)]
Merge pull request #36126 from ShyamsundarR/wip-46528-octopus

octopus: mgr/volumes: Deprecate protect/unprotect CLI calls for subvolume snapshots

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36100 from smithfarm/wip-46536-octopus
Yuri Weinstein [Tue, 25 Aug 2020 22:07:47 +0000 (15:07 -0700)]
Merge pull request #36100 from smithfarm/wip-46536-octopus

octopus: pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #35962 from smithfarm/wip-46389-octopus
Yuri Weinstein [Tue, 25 Aug 2020 22:06:56 +0000 (15:06 -0700)]
Merge pull request #35962 from smithfarm/wip-46389-octopus

octopus: client: introduce timeout for client shutdown

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36621 from smithfarm/wip-46193-octopus
Yuri Weinstein [Tue, 25 Aug 2020 18:55:01 +0000 (11:55 -0700)]
Merge pull request #36621 from smithfarm/wip-46193-octopus

octopus: os/bluestore: fix bluefs log growth

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agomgr/dashboard: remove "This week/month/year" and "Today" time stamps of Grafana in... 36789/head
Avan Thakkar [Thu, 20 Aug 2020 09:32:33 +0000 (15:02 +0530)]
mgr/dashboard: remove "This week/month/year" and "Today" time stamps of Grafana in dashboard

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

4 years agomgr: Add missing states to PG_STATES in mgr_module.py. 36786/head
Harley Gorrell [Fri, 31 Jul 2020 23:21:47 +0000 (17:21 -0600)]
mgr: Add missing states to PG_STATES in mgr_module.py.

Fixes: https://tracker.ceph.com/issues/46808
Signed-off-by: Harley Gorrell <harley@panix.com>
(cherry picked from commit 5cdadf17d634e1cbd8d2b0be8c9439bc20bdbd13)

4 years agomgr/dashboard: Strange iSCSI discovery auth behavior 36782/head
Volker Theile [Tue, 11 Aug 2020 12:53:56 +0000 (14:53 +0200)]
mgr/dashboard: Strange iSCSI discovery auth behavior

Disable 'autocomplete' for the user and password form fields.

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

4 years agotest/store_test: add missing collection reopen 36795/head
Igor Fedotov [Wed, 8 Jul 2020 13:56:11 +0000 (16:56 +0300)]
test/store_test: add missing collection reopen

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit aede2d557ab06e21fcb5b56a75cb8fbacd35a4e0)

4 years agoos/bluestore: modify cache shutdown
Igor Fedotov [Wed, 8 Jul 2020 13:54:33 +0000 (16:54 +0300)]
os/bluestore: modify cache shutdown

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit fafaa0809d4c213923659aacc6f1b6b493157e73)

 Conflicts:
 trivial - src/os/bluestore/BlueStore.h

4 years agoos/bluestore: fix onode count tracking in cache.
Igor Fedotov [Mon, 6 Jul 2020 20:08:47 +0000 (23:08 +0300)]
os/bluestore: fix onode count tracking in cache.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 6a28e7cba2886ff1e1b32c4713ecc472622b9835)

4 years agoos/bluestore: fix pinned/cached setting in Onode::put/get
Igor Fedotov [Mon, 27 Jan 2020 14:15:33 +0000 (17:15 +0300)]
os/bluestore: fix pinned/cached setting in Onode::put/get

This to be squashed with HEAD~2 later, left standalone to ease
reviewing for now.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 0ef5ebcd5df38dab5cf0498ca35ed061a47b07ba)

4 years agoos/bluestore: get rid off OnodeShardCache::_touch.
Igor Fedotov [Fri, 24 Jan 2020 23:00:29 +0000 (02:00 +0300)]
os/bluestore: get rid off OnodeShardCache::_touch.

Onode pinning does the same for us.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 45b1db15f677b36d971909b406fc2f210a3dca7d)

4 years agoos/bluestore: simplify Onode pin/unpin logic.
Igor Fedotov [Fri, 24 Jan 2020 22:18:47 +0000 (01:18 +0300)]
os/bluestore: simplify Onode pin/unpin logic.

This patch makes in/unpin logic more straightforward and
hopefully safe in multi-threading.

Also it eliminates Onode's pin_list as one doesn't need it to track
pinned Onodes.

OnodeCacheShard reference has been removed from onode too.

cached/pinned flags have been introduced. They're accessed under cache lock
hence original race has been totally addressed.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 3a938749f352ce8e220314da9b6e344e67eaf1fd)

 Conflicts:
 trivial - src/os/bluestore/BlueStore.h

4 years agomgr/dashboard: Extract documentation link to a component 36587/head
Tiago Melo [Thu, 30 Jul 2020 20:31:13 +0000 (20:31 +0000)]
mgr/dashboard: Extract documentation link to a component

Fixes: https://tracker.ceph.com/issues/36565
Fixes: https://tracker.ceph.com/issues/43375
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit e12702a6c71d2050fe3f3991173a60332c5d583a)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-list-helper.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-501/nfs-501.component.ts
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.html
        src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/shared/services/doc.service.spec.ts

4 years agorgw: hold reloader using unique_ptr 36644/head
Kefu Chai [Fri, 7 Aug 2020 16:26:21 +0000 (00:26 +0800)]
rgw: hold reloader using unique_ptr

instead of using optional<> for holding reloader, use unique_ptr<>.
as `RGWRealmReloader` is neither
trivially_copy_{assignable,constructible} nor
is_trivially_move_{assignable, constructible}, because of the `Cond`
member variable. but Clang++ and libc++ still tries to rely on a
delgating copy constructor for constructing the
optional<RGWRealmReloader> instance even the optional object is
created `in_place`.

in this change, to workaround this issue, reloader is instead
constructed using make_unique<>

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

4 years agorgw: stop realm reloader before store shutdown
Casey Bodley [Wed, 10 Jun 2020 14:53:55 +0000 (10:53 -0400)]
rgw: stop realm reloader before store shutdown

otherwise the two could race to destroy the store

Fixes: https://tracker.ceph.com/issues/45969
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7787dfb4926dcc2baa7530b620ae8cfccf90bc30)

4 years agoMerge pull request #36748 from sebastian-philipp/octopus-backport-36371-36446-36349...
Sebastian Wagner [Mon, 24 Aug 2020 11:47:53 +0000 (13:47 +0200)]
Merge pull request #36748 from sebastian-philipp/octopus-backport-36371-36446-36349-36463-36444-36426-36447-36373-36492-36497-36538-3645

octopus: cephadm batch backport August (2)

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #36668 from smithfarm/wip-46629-octopus
Yuri Weinstein [Sat, 22 Aug 2020 18:10:24 +0000 (11:10 -0700)]
Merge pull request #36668 from smithfarm/wip-46629-octopus

octopus: bluestore: blk:BlockDevice.cc: use pending_aios instead of iovec size as ios num

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36667 from smithfarm/wip-46964-octopus
Yuri Weinstein [Sat, 22 Aug 2020 18:09:16 +0000 (11:09 -0700)]
Merge pull request #36667 from smithfarm/wip-46964-octopus

octopus: mgr: decrease pool stats if pg was removed

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agoMerge pull request #36666 from smithfarm/wip-46934-octopus
Yuri Weinstein [Sat, 22 Aug 2020 18:08:23 +0000 (11:08 -0700)]
Merge pull request #36666 from smithfarm/wip-46934-octopus

octopus: tools/rados: Set locator key when exporting or importing a pool

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36665 from smithfarm/wip-46739-octopus
Yuri Weinstein [Sat, 22 Aug 2020 18:06:57 +0000 (11:06 -0700)]
Merge pull request #36665 from smithfarm/wip-46739-octopus

octopus: mon: fix the 'Error ERANGE' message when conf "osd_objectstore" is filestore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36664 from smithfarm/wip-46722-octopus
Yuri Weinstein [Sat, 22 Aug 2020 18:06:06 +0000 (11:06 -0700)]
Merge pull request #36664 from smithfarm/wip-46722-octopus

octopus: osd/OSD.cc: remove osd_lock for bench

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #36663 from smithfarm/wip-46709-octopus
Yuri Weinstein [Sat, 22 Aug 2020 18:04:59 +0000 (11:04 -0700)]
Merge pull request #36663 from smithfarm/wip-46709-octopus

octopus: osd/PeeringState: prevent peer's num_objects going negative

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #36633 from smithfarm/wip-46951-octopus
Yuri Weinstein [Fri, 21 Aug 2020 19:47:31 +0000 (12:47 -0700)]
Merge pull request #36633 from smithfarm/wip-46951-octopus

octopus: monclient: schedule first tick using mon_client_hunt_interval

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #36643 from smithfarm/wip-46931-octopus
Yuri Weinstein [Fri, 21 Aug 2020 18:30:07 +0000 (11:30 -0700)]
Merge pull request #36643 from smithfarm/wip-46931-octopus

octopus: librados: add LIBRADOS_SUPPORTS_GETADDRS support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #36630 from smithfarm/wip-46958-octopus
Yuri Weinstein [Fri, 21 Aug 2020 18:28:48 +0000 (11:28 -0700)]
Merge pull request #36630 from smithfarm/wip-46958-octopus

octopus: mgr/status: metadata is fetched async

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
4 years agoMerge pull request #36611 from tspmelo/wip-46924-octopus
Yuri Weinstein [Fri, 21 Aug 2020 18:26:15 +0000 (11:26 -0700)]
Merge pull request #36611 from tspmelo/wip-46924-octopus

octopus: mgr/dashboard: Unable to edit iSCSI logged-in client

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #36577 from callithea/wip-46715-octopus
Yuri Weinstein [Fri, 21 Aug 2020 18:25:25 +0000 (11:25 -0700)]
Merge pull request #36577 from callithea/wip-46715-octopus

octopus: mgr/diskprediction_local: Fix array size error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #36717 from smithfarm/wip-47022-octopus
Yuri Weinstein [Fri, 21 Aug 2020 14:08:01 +0000 (07:08 -0700)]
Merge pull request #36717 from smithfarm/wip-47022-octopus

octopus: rbd: librbd: Align rbd_write_zeroes declarations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #36678 from bk201/wip-46944-octopus
Yuri Weinstein [Fri, 21 Aug 2020 14:07:25 +0000 (07:07 -0700)]
Merge pull request #36678 from bk201/wip-46944-octopus

octopus: mgr/dashboard: Fix host attributes like labels are not returned

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #36581 from callithea/wip-46717-octopus
Yuri Weinstein [Fri, 21 Aug 2020 14:06:12 +0000 (07:06 -0700)]
Merge pull request #36581 from callithea/wip-46717-octopus

octopus: mgr/prometheus: log time it takes to collect metrics

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
4 years agoMerge pull request #36302 from dillaman/wip-46724-octopus
Yuri Weinstein [Fri, 21 Aug 2020 14:05:16 +0000 (07:05 -0700)]
Merge pull request #36302 from dillaman/wip-46724-octopus

octopus: ceph-iscsi: selinux fixes

Reviewed-by: Nathan Cutler <ncutler@suse.com>