]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Wed, 18 Mar 2020 15:12:59 +0000 (10:12 -0500)]
qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
We are deploying containers manually. Mark them unmanaged so that we
do not fight against mgr/cephadm cleaning up orphan daemons.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 Mar 2020 15:09:00 +0000 (10:09 -0500)]
mgr/cephadm: do not reconfig unmanaged services
Fixes: https://tracker.ceph.com/issues/44615
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 Mar 2020 13:44:10 +0000 (08:44 -0500)]
qa/workunits/cephadm/test_cephadm: output file for pub key
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 Mar 2020 13:14:19 +0000 (08:14 -0500)]
Merge PR #33866 into octopus
* refs/pull/33866/head:
mgr/cephadm: limit number of times check host is performed in the serve loop
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Wed, 18 Mar 2020 13:14:06 +0000 (08:14 -0500)]
Merge PR #34005 into octopus
* refs/pull/34005/head:
python-common: reduce output of ServiceSpec.to_json()
python-common,mgr/cephadm: move assert_valid_host to service_spec
mgr/cephadm: add HostAssignment.validate()
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 Mar 2020 13:13:56 +0000 (08:13 -0500)]
Merge PR #34013 into octopus
* refs/pull/34013/head:
qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack
Reviewed-by: Michael Fritch <mfritch@suse.com>
Mykola Golub [Wed, 18 Mar 2020 08:08:25 +0000 (10:08 +0200)]
Merge pull request #33994 from dillaman/wip-librbd-poll-event-race
librbd: defer event socket completion until after callback issued
Reviewed-by: Dehao Shang <dehao.shang@intel.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Sage Weil [Tue, 17 Mar 2020 19:53:58 +0000 (14:53 -0500)]
qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack
We're deploying these things manually later, and they use fixed ports.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 17 Mar 2020 19:52:28 +0000 (14:52 -0500)]
Merge PR #33974 into octopus
* refs/pull/33974/head:
use quay octopus tip until 15.2 tag is available
update default container images
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Tue, 17 Mar 2020 17:05:46 +0000 (12:05 -0500)]
Merge PR #33442 into octopus
* refs/pull/33442/head:
cephadm: add allow_ptrace option to enable SYS_PTRACE
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Tue, 17 Mar 2020 17:05:12 +0000 (12:05 -0500)]
Merge PR #33997 into octopus
* refs/pull/33997/head:
mon/MgrMonitor: make 'mgr fail' work with no arguments
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 17 Mar 2020 17:05:00 +0000 (12:05 -0500)]
Merge PR #34000 into octopus
* refs/pull/34000/head:
mgr/dashboard: adapt create_osds interface change
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Sage Weil [Tue, 17 Mar 2020 15:05:17 +0000 (10:05 -0500)]
use quay octopus tip until 15.2 tag is available
Signed-off-by: Sage Weil <sage@redhat.com>
Sebastian Wagner [Tue, 17 Mar 2020 14:23:14 +0000 (15:23 +0100)]
python-common: reduce output of ServiceSpec.to_json()
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 17 Mar 2020 14:08:50 +0000 (15:08 +0100)]
python-common,mgr/cephadm: move assert_valid_host to service_spec
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 17 Mar 2020 14:00:12 +0000 (15:00 +0100)]
mgr/cephadm: add HostAssignment.validate()
Fixes: https://tracker.ceph.com/issues/44607
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Kiefer Chang [Tue, 17 Mar 2020 08:07:45 +0000 (16:07 +0800)]
mgr/dashboard: adapt create_osds interface change
Support the parameter change of create_osds since
https://github.com/ceph/ceph/pull/33922.
Fixes: https://tracker.ceph.com/issues/44632
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
Sage Weil [Tue, 17 Mar 2020 02:05:21 +0000 (21:05 -0500)]
mon/MgrMonitor: make 'mgr fail' work with no arguments
Fail the active mgr so you don't have to check ceph -s and cut&paste it or
do some jq shenanigans with 'mgr dump'.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Mar 2020 16:06:08 +0000 (11:06 -0500)]
cephadm: add allow_ptrace option to enable SYS_PTRACE
In any environments it is helpful to have SYS_PTRACE so that you can
gdb attach or strace a daemon.
Leave this off by default so that the container is more secure.
Enable this in teuthology and vstart.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 21:35:07 +0000 (16:35 -0500)]
update default container images
- For tests, use bleeding-edge octopus branch
- For production defaults, use ceph/ceph:v15.2 tag
- For bootstrap, grab cephadm script from latest octopus branch
Signed-off-by: Sage Weil <sage@redhat.com>
Daniel-Pivonka [Thu, 5 Mar 2020 18:42:25 +0000 (13:42 -0500)]
mgr/cephadm: limit number of times check host is performed in the serve loop
we only need this to happen every 10 min on hosts
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
Sage Weil [Mon, 16 Mar 2020 22:37:13 +0000 (17:37 -0500)]
Merge PR #33961 into octopus
* refs/pull/33961/head:
cephadm: add-repo: add --version
cephadm: rename distro args in repo methods
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Mon, 16 Mar 2020 22:36:43 +0000 (17:36 -0500)]
Merge PR #33952 into octopus
* refs/pull/33952/head:
qa/workunits/cephadm: --skip-mon-network when using 127.0.0.1
cephadm: add tests
qa/tasks/cephadm: pass -v to bootstrap
mgr/cephadm: only try to place mons on hosts matching public_network
mgr/cephadm: keep track of host networks, ips
cephadm: automatically infer mon public_network, if we can
cephadm: add list-networks command
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Mon, 16 Mar 2020 22:36:33 +0000 (17:36 -0500)]
Merge PR #33990 into octopus
* refs/pull/33990/head:
mgr/orch: add --all-available-devices to 'orch apply osd'
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Mon, 16 Mar 2020 22:36:17 +0000 (17:36 -0500)]
Merge PR #33955 into octopus
* refs/pull/33955/head:
mgr/cephadm: respect 'unmanaged' flag in spec
mgr/orch: orch ls: show <no spec> or <unmanaged> as appropriate
mgr/orch: orch ls: rename SPEC -> PLACEMENT
mgr/orch: add 'unmanaged' property to ServiceSpec
mgr/orch: combine 'orch daemon add <type> ...' into one command
mgr/orch: combine 'orch apply <type> [<placement>]' into one command
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Mon, 16 Mar 2020 20:17:48 +0000 (15:17 -0500)]
Merge PR #33936 into octopus
* refs/pull/33936/head:
cephadm: bootstrap: deploy monitoring stack by default
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Sage Weil [Mon, 16 Mar 2020 14:13:11 +0000 (09:13 -0500)]
mgr/orch: add --all-available-devices to 'orch apply osd'
Provide a super-simple "use any avaialable device" command for
'orch apply osd'. This will work for many (maybe even most?) users.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Mar 2020 19:38:15 +0000 (14:38 -0500)]
qa/workunits/cephadm: --skip-mon-network when using 127.0.0.1
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Mar 2020 19:37:54 +0000 (14:37 -0500)]
cephadm: add tests
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 13:30:43 +0000 (08:30 -0500)]
qa/tasks/cephadm: pass -v to bootstrap
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 14:11:31 +0000 (09:11 -0500)]
mgr/cephadm: only try to place mons on hosts matching public_network
Only try to schedule new mons on hosts that match the configured
public_network, if any. If we do not have one configured, then don't
try to place new mons at all.
Note that there are other restrictions that ceph-mon supports that we
aren't considering, here: public_network_interface in particular, which
might further limit which IPs we consider binding to.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 14:09:54 +0000 (09:09 -0500)]
mgr/cephadm: keep track of host networks, ips
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 12:31:13 +0000 (07:31 -0500)]
cephadm: automatically infer mon public_network, if we can
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 12:38:46 +0000 (07:38 -0500)]
cephadm: add list-networks command
Summarize CIDR networks and our IPs in them. Result looks like this:
{
"10.3.64.0/24": [
"10.3.64.23",
"10.3.64.27"
],
"10.88.0.0/16": [
"10.88.0.1"
],
"192.168.122.0/24": [
"192.168.122.1"
]
}
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 12 Mar 2020 23:33:53 +0000 (18:33 -0500)]
cephadm: bootstrap: deploy monitoring stack by default
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Mar 2020 17:34:16 +0000 (12:34 -0500)]
Merge PR #33979 into octopus
* refs/pull/33979/head:
cephadm: implement 'install' command
Reviewed-by: Michael Fritch <mfritch@suse.com>
Jason Dillaman [Mon, 16 Mar 2020 17:17:17 +0000 (13:17 -0400)]
librbd: defer event socket completion until after callback issued
A change post-Nautilus fixed an issue where multiple threads could
concurrently invoke callbacks to librbd clients. However, it also
introduced the potential that a callback hasn't yet fired by the
time the event socket is completed. This resulted in a crash of
fio under high-throughput testing since it expected both a callback
and the event socket completion, in that order.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Mykola Golub [Mon, 16 Mar 2020 17:18:35 +0000 (19:18 +0200)]
Merge pull request #33988 from dillaman/wip-44391
rbd-mirror: hold lock while updating local image name
Reviewed-by: Mykola Golub <mgolub@suse.com>
Sage Weil [Fri, 13 Mar 2020 22:49:25 +0000 (17:49 -0500)]
cephadm: add-repo: add --version
Instead of --release octopus, which would get the latest octopus
version (whatever it might be), or possibly a repo with many build versions
inside, you can instead do --version 15.2.1 to get a repo with a
specific version and that version only.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 18:58:01 +0000 (13:58 -0500)]
mgr/cephadm: respect 'unmanaged' flag in spec
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 18:52:50 +0000 (13:52 -0500)]
mgr/orch: orch ls: show <no spec> or <unmanaged> as appropriate
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 15:14:04 +0000 (10:14 -0500)]
mgr/orch: orch ls: rename SPEC -> PLACEMENT
More accurate, I think. We only ever show placement here.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 18:49:51 +0000 (13:49 -0500)]
mgr/orch: add 'unmanaged' property to ServiceSpec
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 15 Mar 2020 13:51:51 +0000 (08:51 -0500)]
cephadm: implement 'install' command
This was present, but a no-op.
By default, install cephadm.
Optionally take a list of packages to install instead (e.g., ceph-common).
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Mon, 16 Mar 2020 13:13:56 +0000 (09:13 -0400)]
rbd-mirror: hold lock while updating local image name
There is a potential for an independently scheduled status update to
request the local image name from the bootstrap state machine during its
initialization.
Fixes: https://tracker.ceph.com/issues/44391
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Mon, 16 Mar 2020 13:04:41 +0000 (21:04 +0800)]
Merge pull request #33987 from tchaikov/wip-octopus-formatting
doc/releases/octopus.rst: formatting tweaks
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Mar 2020 12:44:59 +0000 (07:44 -0500)]
Merge PR #33980 into octopus
* refs/pull/33980/head:
cephadm: bootstrap: allow --output-dir
cephadm: do not infer image for bootstrap
cephadm: write output files to /etc/ceph by default
cephadm: verify the output files' containing directory exists
Reviewed-by: Michael Fritch <mfritch@suse.com>
Kefu Chai [Mon, 16 Mar 2020 09:44:04 +0000 (17:44 +0800)]
doc/releases/octopus.rst: use note directive for notes
so the note stands out in the text
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 16 Mar 2020 09:32:56 +0000 (17:32 +0800)]
doc/releases/octopus.rst: add '$' as prompt
to help the BashSession lexer to render the text starting with "#" as comments
see https://pygments.org/docs/lexers/#lexers-for-various-shells
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 16 Mar 2020 09:30:10 +0000 (17:30 +0800)]
doc/releases/octopus: decrease the indent level
for less and better horizontal spacing
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 16 Mar 2020 09:26:06 +0000 (17:26 +0800)]
doc/_static/css: fine tune the spacing
* `ul.simple > li` is also used in front page, where the items are too
sparse now. so we need to restore the default spacing.
* `ul.simple > li > ul > li:last-child` is used to control the spacing
between nested unordered list. we need have more spacing there.
* `div.section > ul > li > p` is added to decrease the spacing of nested
list items.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 16 Mar 2020 03:11:15 +0000 (11:11 +0800)]
Merge pull request #33971 from tchaikov/octopus-doc-release
doc/releases/octopus.rst: format tweaks
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 16 Mar 2020 02:26:20 +0000 (21:26 -0500)]
Merge PR #33968 into octopus
* refs/pull/33968/head:
mgr/cephadm: do not include 'osd' service in 'orch ls' output
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Mon, 16 Mar 2020 02:01:50 +0000 (21:01 -0500)]
Merge PR #33970 into octopus
* refs/pull/33970/head:
python-common: 'all:true' -> '*'
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Mon, 16 Mar 2020 02:01:07 +0000 (21:01 -0500)]
Merge PR #33973 into octopus
* refs/pull/33973/head:
mgr/orch,cephadm: elevate --force flag for daemons to interface
cephadm: backup data when we remove stateful daemons (mon, osd, prometheus)
cephadm: do not zap disk after removing an OSD daemon
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Sun, 15 Mar 2020 19:38:30 +0000 (14:38 -0500)]
Merge PR #33935 into octopus
* refs/pull/33935/head:
mgr/cephadm: fix host connection exception
doc/cephadm: use ssh-copy-id
Reviewed-by: Joshua Schmid <jschmid@suse.de>
Kefu Chai [Sun, 15 Mar 2020 17:54:25 +0000 (01:54 +0800)]
doc/releases/octopus.rst: reindent top-level items
reduce the indent level, so these items are better formated
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 15 Mar 2020 15:39:22 +0000 (23:39 +0800)]
doc/releases/octopus.rst: formatting tweaks
* use console lexer for highlighting command lines
otherwise they will be rendered as python code
* use bold font instead italic in subsection headers,
they look more formal this way
* fix a typo: delineated
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 15 Mar 2020 15:37:49 +0000 (23:37 +0800)]
doc/releases: fix hyper link
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 14 Mar 2020 16:55:19 +0000 (00:55 +0800)]
doc/release: fix "CephFS" subsection heading
it's a regression introduced by
26db06cf212be029e5628a40de3410632c0b86a0
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sun, 15 Mar 2020 15:18:41 +0000 (10:18 -0500)]
cephadm: bootstrap: allow --output-dir
This is easier than specifying each of output-config, output-keyring, and
output-pub-ssh-key.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 15 Mar 2020 15:18:04 +0000 (10:18 -0500)]
cephadm: do not infer image for bootstrap
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 15 Mar 2020 15:12:07 +0000 (10:12 -0500)]
cephadm: write output files to /etc/ceph by default
This streamlines the install for most users by putting the config and
keyring files in /etc/ceph, where other ceph CLI commands will find them.
The cost is making isolated installs a bit more painful, by requiring
that users specify a local location for --output-config etc.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 15 Mar 2020 15:09:30 +0000 (10:09 -0500)]
cephadm: verify the output files' containing directory exists
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 15 Mar 2020 13:01:45 +0000 (08:01 -0500)]
Merge PR #33977 into octopus
* refs/pull/33977/head:
pybind/mgr: apply_drivegroups should return Sequence[Completion]
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Sun, 15 Mar 2020 03:52:54 +0000 (11:52 +0800)]
pybind/mgr: apply_drivegroups should return Sequence[Completion]
* change annotation of `orchestrator.Orchestrator.apply_drivegroups()` so it returns
`Sequence[Completion]`
see
https://mypy.readthedocs.io/en/latest/generics.html#variance-of-generic-types
* to follow the interface defined by `orchestrator.Orchestrator`. change
all its implementations. see `orchestrator/_interface.py`.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 14 Mar 2020 14:10:13 +0000 (09:10 -0500)]
mgr/orch,cephadm: elevate --force flag for daemons to interface
Apply this check in the generic orchestrator code so that it applies
consistently to all implementations.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 13:55:35 +0000 (08:55 -0500)]
cephadm: backup data when we remove stateful daemons (mon, osd, prometheus)
This avoids doing permanent damage when removing stateful daemons.
We include OSDs here even though in most cases no precious data lives in
the osd data directory because there might be some important metadata
there--particularly for adopted OSDs from older clusters.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 13:44:15 +0000 (08:44 -0500)]
cephadm: do not zap disk after removing an OSD daemon
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 15:52:05 +0000 (10:52 -0500)]
Merge PR #33922 into octopus
* refs/pull/33922/head:
qa/tasks/mgr/test_orchestrator_cli: adapt
qa/suites/rados/cephadm/upgrade: start from compatible build
mgr/cephadm: refine log message
python-common: correctly dictify DriveGroupSpec objects when paths are used
mgr/cephadm: adapt test_cephadm.sh to new syntax
mgr/cephadm: adapt qa->test_cephadm.sh
qa/tasks/cephadm: use 'orch daemon osd add'
mgr/cephadm: adapt osd deployment to service_apply
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 19:29:01 +0000 (14:29 -0500)]
qa/tasks/mgr/test_orchestrator_cli: adapt
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 20:09:58 +0000 (15:09 -0500)]
qa/suites/rados/cephadm/upgrade: start from compatible build
The osd create command is changing, so upgrade from something that the
latest cephadm.py task can use.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 15:07:34 +0000 (10:07 -0500)]
mgr/cephadm: fix host connection exception
1- catch exception thrown by _get_connection itself
2- make the error message more informative. the old one was
Error ENOENT: New host dael (10.3.64.25) failed to connect: `ssh -F /tmp/cephadm-conf-9tvrgrls -i /tmp/cephadm-identity-sj66ado1 root@10.3.64.25`
which was both misleading and had irrelevant information. Now,
Error ENOENT: Failed to connect to dael (10.3.64.25). Check that the host is reachable and accepts connections using the cephadm SSH key
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 12 Mar 2020 22:18:58 +0000 (17:18 -0500)]
doc/cephadm: use ssh-copy-id
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 14:50:58 +0000 (09:50 -0500)]
python-common: 'all:true' -> '*'
'all:true' is no longer a valid PlacementSpec.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 14 Mar 2020 13:32:50 +0000 (08:32 -0500)]
mgr/cephadm: do not include 'osd' service in 'orch ls' output
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 22:33:26 +0000 (17:33 -0500)]
cephadm: rename distro args in repo methods
Consistently prefix distro vars with distro_
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 18:47:54 +0000 (13:47 -0500)]
mgr/orch: combine 'orch daemon add <type> ...' into one command
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 18:44:20 +0000 (13:44 -0500)]
mgr/orch: combine 'orch apply <type> [<placement>]' into one command
Declutter the CLI!
Signed-off-by: Sage Weil <sage@redhat.com>
David Galloway [Fri, 13 Mar 2020 22:03:42 +0000 (18:03 -0400)]
Merge remote-tracking branch 'gh/octopus' into octopus
Sage Weil [Fri, 13 Mar 2020 21:35:41 +0000 (16:35 -0500)]
Merge PR #33520 into octopus
* refs/pull/33520/head:
mgr/dashboard: Isolate each RBD component
Reviewed-by: Stephan Müller <smueller@suse.com>
Sage Weil [Fri, 13 Mar 2020 21:35:27 +0000 (16:35 -0500)]
Merge PR #33758 into octopus
* refs/pull/33758/head:
mgr/dashboard: Replace ng2-tree with angular-tree-component
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Sage Weil [Fri, 13 Mar 2020 21:35:16 +0000 (16:35 -0500)]
Merge PR #33941 into octopus
* refs/pull/33941/head:
mgr/dashboard: hide daemon table when orchestrator is disabled
Reviewed-by: Volker Theile <vtheile@suse.com>
Sage Weil [Fri, 13 Mar 2020 21:35:05 +0000 (16:35 -0500)]
Merge PR #33948 into octopus
* refs/pull/33948/head:
python-common: PlacementSpec.from_string: drop `host_pattern:` prefix
python-common: remove `all_hosts` from `PlacementSpec`
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 20:00:20 +0000 (15:00 -0500)]
mgr/cephadm: refine log message
Avoid a lot of these
2020-03-13T14:58:38.785360-0500 mgr.x [INF] No data_devices, skipping DriveGroup: osd.all
every time we consider the OSD spec and find nothing to do. Instead, log
something like this each time we actually have work to do:
2020-03-13T15:04:22.803356-0500 mgr.x [INF] Applying osd.all on host gnit...
2020-03-13T15:04:33.723731-0500 mgr.x [INF] Deploying daemon osd.5 on gnit
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 20:55:34 +0000 (15:55 -0500)]
Merge PR #33777 into octopus
* refs/pull/33777/head:
rgw: svc.config_key_rados: get() warns if potentially insecure connection
rgw: svc.rados: add clog_warn()
mon: log monitor: add command level param
auth registry: helpers for checking secure method/mode
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 20:51:18 +0000 (15:51 -0500)]
Merge PR #33950 into octopus
* refs/pull/33950/head:
ceph.in: use os._exit when we don't shut down
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 13 Mar 2020 18:29:38 +0000 (13:29 -0500)]
Merge PR #33951 into octopus
* refs/pull/33951/head:
mgr/orch: dump service spec by name
Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Fri, 13 Mar 2020 12:24:09 +0000 (07:24 -0500)]
ceph.in: use os._exit when we don't shut down
If we experience a timeout, we don't bother shutting down rados, because
it can't currently handle one thread blocked (or running) library init
at the same time that another thread calls rados_shutdown(). This
behavior was recently introduced by
c8f353c50bcd2a30be9e3600dba91912b8cd0429
However, sys.exit() runs all kinds of shutdown work that will also
interfere with the running librados threads.
Fix by using os._exit instead of sys.exit.
Fixes: https://tracker.ceph.com/issues/44566
Signed-off-by: Sage Weil <sage@redhat.com>
Jenkins Build Slave User [Fri, 13 Mar 2020 17:05:38 +0000 (17:05 +0000)]
15.1.1
Michael Fritch [Fri, 13 Mar 2020 13:48:44 +0000 (07:48 -0600)]
mgr/orch: dump service spec by name
add optional arg to allow a dump by name:
`ceph orch spec dump [svc_name]`
Signed-off-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Fri, 13 Mar 2020 15:25:40 +0000 (10:25 -0500)]
Merge PR #33953 into octopus
* refs/pull/33953/head:
doc: Move ceph-deploy docs to doc/install/ceph-deploy
Reviewed-by: Sage Weil <sage@redhat.com>
Sebastian Wagner [Fri, 13 Mar 2020 14:15:29 +0000 (15:15 +0100)]
doc: Move ceph-deploy docs to doc/install/ceph-deploy
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sage Weil [Fri, 13 Mar 2020 14:51:32 +0000 (09:51 -0500)]
Merge PR #33924 into octopus
* refs/pull/33924/head:
doc/mgr: Enhance placement specs
doc/cephadm: Fix toc of Drive Groups
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 13:35:30 +0000 (08:35 -0500)]
Merge PR #33891 into octopus
* refs/pull/33891/head:
mgr/cephadm: fix dump output by formatting to json first
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 13 Mar 2020 13:35:19 +0000 (08:35 -0500)]
Merge PR #33905 into octopus
* refs/pull/33905/head:
install-deps.sh: remove the workaround to bootstrap a new venv
install-deps.sh: install additional repo for RHEL8
install-deps.sh: install rhel-7-server-optional-rpms on el7 only
Reviewed-by: David Galloway <dgallowa@redhat.com>
Joshua Schmid [Fri, 13 Mar 2020 13:21:22 +0000 (14:21 +0100)]
python-common: correctly dictify DriveGroupSpec objects when paths are used
Signed-off-by: Joshua Schmid <jschmid@suse.de>
Kefu Chai [Fri, 13 Mar 2020 13:02:58 +0000 (21:02 +0800)]
Merge pull request #33940 from tchaikov/octopus-release-notes-header
doc: use subsection for representing components in release notes
Reviewed-by: Sage Weil <sage@redhat.com>
Sebastian Wagner [Tue, 10 Mar 2020 15:05:43 +0000 (16:05 +0100)]
doc/mgr: Enhance placement specs
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Kefu Chai [Fri, 13 Mar 2020 05:26:57 +0000 (13:26 +0800)]
doc/releases: use h3 for rendering subsections in release notes
to highlight the components with subsection header, and allow readers to
navigate through them with TOC.
Signed-off-by: Kefu Chai <kchai@redhat.com>