]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agovstart.sh: fix install of cephadm ssh keys from ~/.ssh 33647/head
Sage Weil [Sun, 1 Mar 2020 18:06:19 +0000 (12:06 -0600)]
vstart.sh: fix install of cephadm ssh keys from ~/.ssh

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33639 into master
Sage Weil [Sun, 1 Mar 2020 13:22:45 +0000 (07:22 -0600)]
Merge PR #33639 into master

* refs/pull/33639/head:
pybind/mgr/mgr_module: fix standby module logging options

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31109 from liupengs/wip-msg-async-fix-event-center-block
Kefu Chai [Sun, 1 Mar 2020 07:47:19 +0000 (15:47 +0800)]
Merge pull request #31109 from liupengs/wip-msg-async-fix-event-center-block

msg/async/rdma: unblock event center if the peer is down when connecting

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomsg/async/rdma: move C_handle_connection to RDMAConnectionSocketImpl.cc 31109/head
liupengs [Sun, 1 Mar 2020 05:04:37 +0000 (13:04 +0800)]
msg/async/rdma: move C_handle_connection to RDMAConnectionSocketImpl.cc

Signed-off-by: Peng Liu <liupeng37@baidu.com>
5 years agoMerge pull request #33591 from badone/wip-install-deps-set-gpgcheck-for-reals
Kefu Chai [Sun, 1 Mar 2020 05:43:26 +0000 (13:43 +0800)]
Merge pull request #33591 from badone/wip-install-deps-set-gpgcheck-for-reals

install-deps.sh: Actually set gpgcheck to false

Reviewed-by: Dan Mick <dan.mick@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomsg/async/rdma: fix bug event center is blocked by rdma construct connection for...
liupengs [Sun, 17 Nov 2019 15:03:07 +0000 (23:03 +0800)]
msg/async/rdma: fix bug event center is blocked by rdma construct connection for transport ib sync msg

We construct a tcp connection to transport ib sync msg, if the
remote node is shutdown (shutdown by accident), the net.connect will be blocked until timeout
is reached, which cause the event center be blocked.

This bug may cause mon probe timeout and osd not reply, and so on.

Signed-off-by: Peng Liu <liupeng37@baidu.com>
5 years agoMerge PR #33634 into master
Sage Weil [Sat, 29 Feb 2020 22:13:07 +0000 (16:13 -0600)]
Merge PR #33634 into master

* refs/pull/33634/head:
qa/workunits/cephadm/test_cephadm.sh: dump logs on exit
qa/workunits/cephadm/test_cephadm.sh: add `cleanup` function

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agopybind/mgr/mgr_module: fix standby module logging options 33639/head
Sage Weil [Sat, 29 Feb 2020 14:58:59 +0000 (08:58 -0600)]
pybind/mgr/mgr_module: fix standby module logging options

We need to define the module options and their default so that
_configure_logging can succeed.

Broken by 8ec3b3d3cc7d4c2d2678f460de27ecc8cb07d8fe

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33438 into master
Sage Weil [Sat, 29 Feb 2020 03:32:47 +0000 (21:32 -0600)]
Merge PR #33438 into master

* refs/pull/33438/head:
cephadm: add prometheus adopt

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33433 into master
Sage Weil [Sat, 29 Feb 2020 03:32:36 +0000 (21:32 -0600)]
Merge PR #33433 into master

* refs/pull/33433/head:
cephadm: also return JSON decode error.

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33596 from badone/wip-serve-doc-python3
Kefu Chai [Sat, 29 Feb 2020 01:58:01 +0000 (09:58 +0800)]
Merge pull request #33596 from badone/wip-serve-doc-python3

admin/serve-doc: Switch to python3 only

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoadmin/serve-doc: Switch to python3 only 33596/head
Brad Hubbard [Fri, 28 Feb 2020 05:25:17 +0000 (15:25 +1000)]
admin/serve-doc: Switch to python3 only

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: dump logs on exit 33634/head
Michael Fritch [Fri, 28 Feb 2020 21:46:59 +0000 (14:46 -0700)]
qa/workunits/cephadm/test_cephadm.sh: dump logs on exit

dumps the last few lines from each of the surviving daemon logs

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: add `cleanup` function
Michael Fritch [Fri, 28 Feb 2020 21:45:42 +0000 (14:45 -0700)]
qa/workunits/cephadm/test_cephadm.sh: add `cleanup` function

moves logic for clean-up during `trap EXIT` into a function

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #33624 from trociny/wip-dateutil-dep
Jason Dillaman [Fri, 28 Feb 2020 20:40:01 +0000 (15:40 -0500)]
Merge pull request #33624 from trociny/wip-dateutil-dep

rpm,deb: fix python dateutil module dependency

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agorpm,deb: fix python dateutil module dependency 33624/head
Mykola Golub [Fri, 28 Feb 2020 16:24:01 +0000 (16:24 +0000)]
rpm,deb: fix python dateutil module dependency

(needed for mgr/rbd_support)

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33063 from theanalyst/boto3-ext-append
Casey Bodley [Fri, 28 Feb 2020 14:31:14 +0000 (09:31 -0500)]
Merge pull request #33063 from theanalyst/boto3-ext-append

examples: rgw: add boto3 append & get usage api extensions

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoMerge pull request #33527 from alimaredia/wip-rgw-realm-pull-log-msg
Casey Bodley [Fri, 28 Feb 2020 14:29:18 +0000 (09:29 -0500)]
Merge pull request #33527 from alimaredia/wip-rgw-realm-pull-log-msg

rgw: increase log level for same or older period pull msg

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoMerge pull request #33600 from ceph/doc_config_set
Sebastian Wagner [Fri, 28 Feb 2020 12:58:49 +0000 (13:58 +0100)]
Merge pull request #33600 from ceph/doc_config_set

doc/cephadm: adjust syntax for config set

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/cephadm: adjust syntax for config set 33600/head
Joshua Schmid [Fri, 28 Feb 2020 09:05:31 +0000 (10:05 +0100)]
doc/cephadm: adjust syntax for config set

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge PR #33226 into master
Sage Weil [Fri, 28 Feb 2020 09:17:39 +0000 (03:17 -0600)]
Merge PR #33226 into master

* refs/pull/33226/head:
unittest_auth: update for new ms_*_mode semantics
auth: treat mgr the same as mon when selecting auth mode

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33542 into master
Sage Weil [Fri, 28 Feb 2020 09:15:58 +0000 (03:15 -0600)]
Merge PR #33542 into master

* refs/pull/33542/head:
mon/Monitor: fail forwarded tell commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
5 years agoMerge PR #33558 into master
Sage Weil [Fri, 28 Feb 2020 09:15:46 +0000 (03:15 -0600)]
Merge PR #33558 into master

* refs/pull/33558/head:
common/config: fix lack of normalize_key_name() apply.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33566 from dzafman/wip-44296
Kefu Chai [Fri, 28 Feb 2020 03:42:47 +0000 (11:42 +0800)]
Merge pull request #33566 from dzafman/wip-44296

test: Expect being off by up to 2 and make sure all PGs are active+clean

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33592 from tchaikov/wip-doc-search
Kefu Chai [Fri, 28 Feb 2020 03:33:05 +0000 (11:33 +0800)]
Merge pull request #33592 from tchaikov/wip-doc-search

doc,admin: fix the builtin search

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoinstall-deps.sh: Actually set gpgcheck to false 33591/head
Brad Hubbard [Fri, 28 Feb 2020 01:47:55 +0000 (11:47 +1000)]
install-deps.sh: Actually set gpgcheck to false

The current command appears to do nothing.

Fixes: https://tracker.ceph.com/issues/44344
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
5 years agodoc: drop http://ayni.ceph.com/public/js/ceph.js 33592/head
Kefu Chai [Fri, 28 Feb 2020 01:50:49 +0000 (09:50 +0800)]
doc: drop http://ayni.ceph.com/public/js/ceph.js

seems we will never have this file in foreseeable future.

See-also: https://tracker.ceph.com/issues/11490
See-also: https://tracker.ceph.com/issues/18075
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest: Expect being off by up to 2 and make sure all PGs are active+clean 33566/head
David Zafman [Tue, 25 Feb 2020 23:32:58 +0000 (15:32 -0800)]
test: Expect being off by up to 2 and make sure all PGs are active+clean

Fixes: https://tracker.ceph.com/issues/44296
Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agodoc/_static/js/ceph.js: avoid the "//" in URI
Kefu Chai [Fri, 28 Feb 2020 01:50:17 +0000 (09:50 +0800)]
doc/_static/js/ceph.js: avoid the "//" in URI

it's just annoying.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoadmin/doc-requirements: bump sphinx version
Kefu Chai [Fri, 28 Feb 2020 01:49:44 +0000 (09:49 +0800)]
admin/doc-requirements: bump sphinx version

to pick up the fix to address the search when using dirhtml builder

see https://github.com/sphinx-doc/sphinx/pull/6741

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33554 into master
Sage Weil [Fri, 28 Feb 2020 01:49:05 +0000 (19:49 -0600)]
Merge PR #33554 into master

* refs/pull/33554/head:
mgr/cephadm: Configure Alertmanagers in Prometheus configuration
mgr/cephadm: Create configuration for alertmanager
mgr/cephadm: Provision alertmanager
mgr/orchestrator: Add alertmanager hooks

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33585 into master
Sage Weil [Fri, 28 Feb 2020 01:48:24 +0000 (19:48 -0600)]
Merge PR #33585 into master

* refs/pull/33585/head:
mgr/orchestrator: fix 'orch host label rm' help text

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33586 into master
Sage Weil [Fri, 28 Feb 2020 01:48:13 +0000 (19:48 -0600)]
Merge PR #33586 into master

* refs/pull/33586/head:
mgr/orch: fix 'orch ls' table spacing

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33587 into master
Sage Weil [Fri, 28 Feb 2020 01:47:50 +0000 (19:47 -0600)]
Merge PR #33587 into master

* refs/pull/33587/head:
remove cephadm-adoption-corpus as submodule

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33488 into master
Sage Weil [Fri, 28 Feb 2020 01:46:20 +0000 (19:46 -0600)]
Merge PR #33488 into master

* refs/pull/33488/head:
doc/mgr/cephadm: document how to see the logs
ceph: -W as shorthand for --watch-channel
pybind/mgr_module: make mgr log message prefix a bit less verbose
mgr/cephadm: silence remoto logger info messages
mgr/cephadm: add misc info messages for major events
mgr/cephadm: adjust logging
mgr/cephadm: log to cluster channel by default
pybind/mgr_module: infrastructure to allow logging to cluster log
mgr/mgr_module: log to mgr log even when log_to_file
mon: accept cephadm channel to 'ceph log last'
ceph: allow watching channels aside from cluster and audit
mon/LogMonitor: fix debug output for logmonitor output file parsing
mgr: allow logging to any channel

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge PR #32983 into master
Sage Weil [Fri, 28 Feb 2020 01:44:54 +0000 (19:44 -0600)]
Merge PR #32983 into master

* refs/pull/32983/head:
mgr/cephadm: remove/replace osds

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #33389 from trociny/wip-43619
Jason Dillaman [Thu, 27 Feb 2020 23:21:14 +0000 (18:21 -0500)]
Merge pull request #33389 from trociny/wip-43619

rbd: schedule for running trash purge operations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32554 from dzafman/wip-dump-perf
David Zafman [Thu, 27 Feb 2020 21:48:29 +0000 (13:48 -0800)]
Merge pull request #32554 from dzafman/wip-dump-perf

Improve internal python to c++ interface

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #33493 from zhengchengyao/read
Jason Dillaman [Thu, 27 Feb 2020 21:18:20 +0000 (16:18 -0500)]
Merge pull request #33493 from zhengchengyao/read

librbd: improved support for balanced and localized reads

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #33563 from dillaman/wip-rbd-op-threads
Jason Dillaman [Thu, 27 Feb 2020 21:16:57 +0000 (16:16 -0500)]
Merge pull request #33563 from dillaman/wip-rbd-op-threads

librbd: fix potential race conditions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agotest: Disable self-test of diskprediction_cloud since it isn't loaded 32554/head
David Zafman [Thu, 16 Jan 2020 16:15:41 +0000 (16:15 +0000)]
test: Disable self-test of diskprediction_cloud since it isn't loaded

See qa/packages/packages.yaml

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agomon mgr osd: Add dump_osd_times interface for python
David Zafman [Fri, 10 Jan 2020 23:42:19 +0000 (23:42 +0000)]
mon mgr osd: Add dump_osd_times interface for python

The dump_osd_times interface is here for future use of a manager module.
The osd_stats and pg_dump python interfaces don't return network ping
information.

User facing ping time information is formatted 3 decimal places
Use dump_float() (low overhead) for network ping times
   used by python dump_osd_times and dump commands like
   "ceph --formet=json pg dump osds" which for now yields output like
   >>>> "1min": 0.61599999999999999,

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agomgr/progress: Add pg_ready interface for python to get pgmap_ready state
David Zafman [Thu, 9 Jan 2020 00:02:51 +0000 (16:02 -0800)]
mgr/progress: Add pg_ready interface for python to get pgmap_ready state

Fixes: https://tracker.ceph.com/issues/43557
Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #33559 from liewegas/fix-42328-more
Jason Dillaman [Thu, 27 Feb 2020 21:11:01 +0000 (16:11 -0500)]
Merge pull request #33559 from liewegas/fix-42328-more

msg/async/ProtocolV2: fix typo in register_lossy_clients fix

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #33460 into master
Sage Weil [Thu, 27 Feb 2020 20:13:10 +0000 (14:13 -0600)]
Merge PR #33460 into master

* refs/pull/33460/head:
doc/cephadm: Add Troubleshooting

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephadm: Add Troubleshooting 33460/head
Sebastian Wagner [Fri, 21 Feb 2020 13:39:16 +0000 (14:39 +0100)]
doc/cephadm: Add Troubleshooting

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge PR #33518 into master
Sage Weil [Thu, 27 Feb 2020 18:58:14 +0000 (12:58 -0600)]
Merge PR #33518 into master

* refs/pull/33518/head:
doc/foundation: add Samsung

Reviewed-by: Myougnwon Oh <myoungwon.oh@samsung.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #33044 from jschmid1/drive_group_docs
Sebastian Wagner [Thu, 27 Feb 2020 18:57:37 +0000 (19:57 +0100)]
Merge pull request #33044 from jschmid1/drive_group_docs

doc/drivegroups: add docs for DriveGroups with excessive examples

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agodoc/mgr/cephadm: document how to see the logs 33488/head
Sage Weil [Mon, 24 Feb 2020 15:03:54 +0000 (09:03 -0600)]
doc/mgr/cephadm: document how to see the logs

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph: -W as shorthand for --watch-channel
Sage Weil [Tue, 25 Feb 2020 22:34:53 +0000 (16:34 -0600)]
ceph: -W as shorthand for --watch-channel

'ceph -w' to watch default cluster channel
'ceph -W foo' to watch channel 'foo'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agopybind/mgr_module: make mgr log message prefix a bit less verbose
Sage Weil [Tue, 25 Feb 2020 22:23:11 +0000 (16:23 -0600)]
pybind/mgr_module: make mgr log message prefix a bit less verbose

2020-02-25T16:22:48.484-0600 7f664dcec700  0 [cephadm DEBUG root] code: 0

instead of

2020-02-25T16:19:48.359-0600 7f0c0d776700  0 [cephadm] [DEBUG] [root] code: 0

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: silence remoto logger info messages
Sage Weil [Tue, 25 Feb 2020 22:21:03 +0000 (16:21 -0600)]
mgr/cephadm: silence remoto logger info messages

Remoto issues events like

 Running command: /usr/bin/python3 -u

at level 'info' which are below the threshold of other 'info' messages in
cephadm.  So, silence info and below.  We still want to see warning and
above.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: add misc info messages for major events
Sage Weil [Tue, 25 Feb 2020 19:45:26 +0000 (13:45 -0600)]
mgr/cephadm: add misc info messages for major events

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: adjust logging
Sage Weil [Tue, 25 Feb 2020 19:35:56 +0000 (13:35 -0600)]
mgr/cephadm: adjust logging

- drop a bunch of stale debug messages
- single site that logs full cephadm out/err/code

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: log to cluster channel by default
Sage Weil [Tue, 25 Feb 2020 19:23:21 +0000 (13:23 -0600)]
mgr/cephadm: log to cluster channel by default

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agopybind/mgr_module: infrastructure to allow logging to cluster log
Sage Weil [Tue, 25 Feb 2020 19:23:06 +0000 (13:23 -0600)]
pybind/mgr_module: infrastructure to allow logging to cluster log

This is incomplete--a module that wants to opt-in needs to call
_enable_cluster_log() and manage the level themselves.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/mgr_module: log to mgr log even when log_to_file
Sage Weil [Tue, 25 Feb 2020 18:59:03 +0000 (12:59 -0600)]
mgr/mgr_module: log to mgr log even when log_to_file

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon: accept cephadm channel to 'ceph log last'
Sage Weil [Mon, 24 Feb 2020 15:04:04 +0000 (09:04 -0600)]
mon: accept cephadm channel to 'ceph log last'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph: allow watching channels aside from cluster and audit
Sage Weil [Sat, 22 Feb 2020 17:06:09 +0000 (11:06 -0600)]
ceph: allow watching channels aside from cluster and audit

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/LogMonitor: fix debug output for logmonitor output file parsing
Sage Weil [Sat, 22 Feb 2020 16:59:37 +0000 (10:59 -0600)]
mon/LogMonitor: fix debug output for logmonitor output file parsing

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr: allow logging to any channel
Sage Weil [Sat, 22 Feb 2020 16:13:16 +0000 (10:13 -0600)]
mgr: allow logging to any channel

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33218 from yuvalif/add_cls_queue_ut
Casey Bodley [Thu, 27 Feb 2020 17:53:03 +0000 (12:53 -0500)]
Merge pull request #33218 from yuvalif/add_cls_queue_ut

cls/queue: add unit tests

Reviewed-by: Pritha Srivastava <prsivas@redhat.com>
5 years agoremove cephadm-adoption-corpus as submodule 33587/head
Sage Weil [Thu, 27 Feb 2020 17:46:42 +0000 (11:46 -0600)]
remove cephadm-adoption-corpus as submodule

The test_adoption.sh just clones from master--no need to make this a
submodule.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: fix 'orch ls' table spacing 33586/head
Sage Weil [Thu, 27 Feb 2020 17:39:01 +0000 (11:39 -0600)]
mgr/orch: fix 'orch ls' table spacing

This command crossed paths with the PR that changed the spacing.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: fix 'orch host label rm' help text 33585/head
Sage Weil [Thu, 27 Feb 2020 17:22:55 +0000 (11:22 -0600)]
mgr/orchestrator: fix 'orch host label rm' help text

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorgw: increase log level for same or older period pull msg 33527/head
Ali Maredia [Tue, 25 Feb 2020 05:29:30 +0000 (00:29 -0500)]
rgw: increase log level for same or older period pull msg

Signed-off-by: Ali Maredia <amaredia@redhat.com>
5 years agomgr/rbd_support: wait for latest osdmap on init 33389/head
Mykola Golub [Thu, 27 Feb 2020 10:34:03 +0000 (10:34 +0000)]
mgr/rbd_support: wait for latest osdmap on init

The main goal is to initialize the librados instance before
starting any thread that may use it.

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33561 from dillaman/wip-44249
Mykola Golub [Thu, 27 Feb 2020 16:27:14 +0000 (18:27 +0200)]
Merge pull request #33561 from dillaman/wip-44249

doc/rbd: document the new snapshot-based mirroring feature

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33490 from dillaman/wip-43934
Mykola Golub [Thu, 27 Feb 2020 16:26:41 +0000 (18:26 +0200)]
Merge pull request #33490 from dillaman/wip-43934

rbd-mirror: add support for snapshot-based mirroring resyncs

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge PR #33574 into master
Sage Weil [Thu, 27 Feb 2020 16:24:46 +0000 (10:24 -0600)]
Merge PR #33574 into master

* refs/pull/33574/head:
doc/mgr/orchestrator: Add CephFS
doc/mgr/orchestrator: Add documentation for plcement specs
doc/mgr: Reordering

Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33577 into master
Sage Weil [Thu, 27 Feb 2020 15:35:02 +0000 (09:35 -0600)]
Merge PR #33577 into master

* refs/pull/33577/head:
doc: Add sphinx_autodoc_typehints extension

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33555 from LenzGr/master-documentation
Lenz Grimmer [Thu, 27 Feb 2020 14:57:54 +0000 (14:57 +0000)]
Merge pull request #33555 from LenzGr/master-documentation

doc: Add Dashboard Octopus release notes

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agomgr/cephadm: Configure Alertmanagers in Prometheus configuration 33554/head
Kristoffer Grönlund [Thu, 27 Feb 2020 07:29:22 +0000 (08:29 +0100)]
mgr/cephadm: Configure Alertmanagers in Prometheus configuration

This will configure Prometheus with any alertmanager daemons
that have already been created.

TODO: Currently the Prometheus configuration is not updated if
additional alertmanager daemons are created.

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
5 years agocephadm: add prometheus adopt 33438/head
Eric Jackson [Thu, 20 Feb 2020 16:31:45 +0000 (11:31 -0500)]
cephadm: add prometheus adopt

Follow the same strategy for migrating an existing prometheus installation into the container structure. Keep logic separate to avoid mixing Ceph and non-Ceph behavior. Refactor duplication in later PRs.

Signed-off-by: Eric Jackson <swiftgist@gmail.com>
5 years agorbd-mirror: no need to perform extra image-meta filtering for image-state 33490/head
Jason Dillaman [Tue, 25 Feb 2020 14:31:13 +0000 (09:31 -0500)]
rbd-mirror: no need to perform extra image-meta filtering for image-state

The image-state now only stores non RBD-internal image-meta keys and only
non RBD-internal image-meta keys are returned from the image-meta helper
state machine.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: snapshot image-state should use get image-meta state machine
Jason Dillaman [Tue, 25 Feb 2020 14:00:44 +0000 (09:00 -0500)]
librbd: snapshot image-state should use get image-meta state machine

This commit was accidentally dropped from commit bcbdd6cf698 when all
existing logic was updated to use the new helper state machine.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: optionally filter internal image-meta when copying/cloning
Jason Dillaman [Tue, 25 Feb 2020 13:54:37 +0000 (08:54 -0500)]
librbd: optionally filter internal image-meta when copying/cloning

Any ".rbd"-prefixed image-meta keys will be considered RBD-internal and
will not be added to the new image when copied/cloned.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: remove snapshot mirror image-meta when disabling
Jason Dillaman [Mon, 24 Feb 2020 22:33:51 +0000 (17:33 -0500)]
librbd: remove snapshot mirror image-meta when disabling

Remove the snapshot-based mirroring image-meta key/value pair
(if any) when disabling mirroring.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: support resync request for snapshot-based mirroring
Jason Dillaman [Sat, 22 Feb 2020 20:23:10 +0000 (15:23 -0500)]
rbd-mirror: support resync request for snapshot-based mirroring

When a local image has the resync requested image-meta property, the
snapshot replayer will stop and initiate the resync request.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: register for local image updates in snapshot replayer
Jason Dillaman [Sat, 22 Feb 2020 19:00:47 +0000 (14:00 -0500)]
rbd-mirror: register for local image updates in snapshot replayer

The snapshot replayer will need to watch for local forced-promotion
events and also resync requests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32937 from rzarzynski/wip-bl-carry-_carriage
Kefu Chai [Thu, 27 Feb 2020 12:41:43 +0000 (20:41 +0800)]
Merge pull request #32937 from rzarzynski/wip-bl-carry-_carriage

common/bl: carry the bufferlist::_carriage over std::moves

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32515 from majianpeng/osd-remove-unused-func3
Kefu Chai [Thu, 27 Feb 2020 12:39:54 +0000 (20:39 +0800)]
Merge pull request #32515 from majianpeng/osd-remove-unused-func3

osd: remove unused functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agodoc: Add sphinx_autodoc_typehints extension 33577/head
Sebastian Wagner [Thu, 27 Feb 2020 12:16:00 +0000 (13:16 +0100)]
doc: Add sphinx_autodoc_typehints extension

`mgr/orchestrator_modules.rst` makes heavy use type hints.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/mgr/orchestrator: Add CephFS 33574/head
Sebastian Wagner [Thu, 27 Feb 2020 09:59:59 +0000 (10:59 +0100)]
doc/mgr/orchestrator: Add CephFS

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/mgr/orchestrator: Add documentation for plcement specs
Sebastian Wagner [Thu, 27 Feb 2020 09:57:58 +0000 (10:57 +0100)]
doc/mgr/orchestrator: Add documentation for plcement specs

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/mgr: Reordering
Sebastian Wagner [Thu, 27 Feb 2020 09:24:37 +0000 (10:24 +0100)]
doc/mgr: Reordering

* Moved *Configuring the Orchestrator CLI*
* Updated the definitions

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #33573 from votdev/fix_mypy_issue
Laura Paduano [Thu, 27 Feb 2020 10:30:06 +0000 (11:30 +0100)]
Merge pull request #33573 from votdev/fix_mypy_issue

mgr/dashboard: make check mypy failure

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agomgr/dashboard: make check mypy failure 33573/head
Volker Theile [Thu, 27 Feb 2020 09:38:14 +0000 (10:38 +0100)]
mgr/dashboard: make check mypy failure

Fixes: https://tracker.ceph.com/issues/44319
Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #33079 from jan--f/c-v-scan-dmcrypt-osds
Jan Fajerski [Thu, 27 Feb 2020 09:00:26 +0000 (10:00 +0100)]
Merge pull request #33079 from jan--f/c-v-scan-dmcrypt-osds

ceph-volume: strip _dmcrypt suffix in simple scan json output

5 years agomgr/cephadm: Create configuration for alertmanager
Kristoffer Grönlund [Thu, 27 Feb 2020 07:06:22 +0000 (08:06 +0100)]
mgr/cephadm: Create configuration for alertmanager

Create a skeleton configuration for alertmanager
which forwards alerts to the dashboard by default.

Tracker: https://tracker.ceph.com/issues/44308

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
5 years agomgr/cephadm: Provision alertmanager
Kristoffer Grönlund [Wed, 26 Feb 2020 12:14:43 +0000 (13:14 +0100)]
mgr/cephadm: Provision alertmanager

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
5 years agomgr/orchestrator: Add alertmanager hooks
Kristoffer Grönlund [Wed, 26 Feb 2020 12:09:07 +0000 (13:09 +0100)]
mgr/orchestrator: Add alertmanager hooks

Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
5 years agoMerge pull request #33562 from dillaman/wip-fix-doc-builds
Kefu Chai [Thu, 27 Feb 2020 08:32:27 +0000 (16:32 +0800)]
Merge pull request #33562 from dillaman/wip-fix-doc-builds

Revert "doc: do not add suffix for search result links"

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32953 from votdev/issue_43665_smart_data
Lenz Grimmer [Thu, 27 Feb 2020 08:23:17 +0000 (08:23 +0000)]
Merge pull request #32953 from votdev/issue_43665_smart_data

mgr/dashboard: smart: smart data read out on down osd causes error popup

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge PR #33547 into master
Patrick Donnelly [Thu, 27 Feb 2020 04:37:37 +0000 (20:37 -0800)]
Merge PR #33547 into master

* refs/pull/33547/head:
mgr/volumes: unregister job upon async threads exception

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr/volumes: unregister job upon async threads exception 33547/head
Venky Shankar [Wed, 26 Feb 2020 04:52:37 +0000 (23:52 -0500)]
mgr/volumes: unregister job upon async threads exception

If the async threads hit a temporary exception the job is
never unregistered and therefore gets skipped by the async
threads on subsequent scans.

Patrick hit this in nautilus when one of the purge threads
hit an exception when trying to log a message. The trash
entry was never picked up again by the purge threads.

Fixes: http://tracker.ceph.com/issues/44293
Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agomsg/async/AsyncMessenger: make accept_conn respect register_lossy_clients 33559/head
Sage Weil [Thu, 27 Feb 2020 03:32:51 +0000 (21:32 -0600)]
msg/async/AsyncMessenger: make accept_conn respect register_lossy_clients

Back in 507d213cc453ed86ab38619590f710f33245c652 we missed this condition,
which was originally introduced by c48a29b9edde3c6d3cd34252d202885e2e064fe0.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33552 into master
Sage Weil [Wed, 26 Feb 2020 23:13:02 +0000 (17:13 -0600)]
Merge PR #33552 into master

* refs/pull/33552/head:
mgr/dashboard: Enhance user create CLI command to force password change

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge PR #33550 into master
Sage Weil [Wed, 26 Feb 2020 23:12:31 +0000 (17:12 -0600)]
Merge PR #33550 into master

* refs/pull/33550/head:
rpm,deb: poke Python OpenSSL dependencies
mgr: outsource creation of self-signed certificates

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33517 into master
Sage Weil [Wed, 26 Feb 2020 23:12:20 +0000 (17:12 -0600)]
Merge PR #33517 into master

* refs/pull/33517/head:
cephadm: bootstrap: nag about telemetry

Reviewed-by: Sebastian Wagner <swagner@suse.com>