]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoClient: make sure the Finisher's mutex lock not held during it being distructed 33915/head
Xiubo Li [Tue, 31 Mar 2020 09:09:45 +0000 (05:09 -0400)]
Client: make sure the Finisher's mutex lock not held during it being distructed

The objecter_finisher is already started in Client::Client(), but
in the failure path when initializing and starting the Client object,
we may not get a chance to call the Client::shutdown() to stop the
Finisher thread, which maybe still holding the mutex lock in it. Then
when destrucing the Finisher object the pthread_mutex_destroy() will
fail.

This fix will delay the objecter_finisher thread to start in ::init()
until we're ready to call Client::shutdown on any errors instead.

Fixes: https://tracker.ceph.com/issues/44389
Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agoMerge pull request #34184 from cbodley/wip-qa-rgw-test-multi-fix
Kefu Chai [Thu, 26 Mar 2020 03:44:56 +0000 (11:44 +0800)]
Merge pull request #34184 from cbodley/wip-qa-rgw-test-multi-fix

qa/rgw: multisite test fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33581 into master
Sage Weil [Thu, 26 Mar 2020 02:18:45 +0000 (21:18 -0500)]
Merge PR #33581 into master

* refs/pull/33581/head:
mgr/cephadm: add watch_url to NFS bootstrap config
mgr/cephadm: check for an existing NFS config object
mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
mon: allow `auth caps` for `mgr` profile
mgr/cephadm: add deployment example to NFS docs
mgr/cephadm: add utils.py
mgr/cephadm: create/update keyring during nfs config
mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
mgr/cephadm: add nfs apply test
mgr/cephadm: fix nfs redeploy/reconfig
mgr/cephadm: ensure nfs uses the correct entity
mgr/cephadm: fix service name for nfs type
mgr/cephadm: apply nfs service spec
mgr/cephadm: don't create a unique nfs daemon name
mgr/cephadm: update docs
mgr/cephadm: add minimal caps for nfs client keyring
mgr/cephadm: add logging to NFSGanesha class
mgr/cephadm: create empty nfs rados config obj
mgr/cephadm: add nfs tests
mgr/cephadm: add a minimal ganesha.conf
mgr/cephadm: deploy nfs-ganesha service
mgr/cephadm: split out `config-and-keyrings` json
mgr/orchestrator: rearrange interface to match impl. order

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34181 into master
Sage Weil [Thu, 26 Mar 2020 02:18:10 +0000 (21:18 -0500)]
Merge PR #34181 into master

* refs/pull/34181/head:
mgr/cephadm: bind grafana to all interfaces

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #34182 into master
Sage Weil [Thu, 26 Mar 2020 02:17:18 +0000 (21:17 -0500)]
Merge PR #34182 into master

* refs/pull/34182/head:
mgr/cephadm: fix 'orch ps --refresh'

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #33910 from xiexingguo/wip-44532-2
Xie Xingguo [Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)]
Merge pull request #33910 from xiexingguo/wip-44532-2

osd/PeeringState: do not trim pg log past last_update_ondisk

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
5 years agomgr/cephadm: add watch_url to NFS bootstrap config 33581/head
Michael Fritch [Mon, 23 Mar 2020 23:41:09 +0000 (17:41 -0600)]
mgr/cephadm: add watch_url to NFS bootstrap config

watch for changes to the per-daemon RADOS conf file

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: check for an existing NFS config object
Michael Fritch [Wed, 18 Mar 2020 19:57:18 +0000 (13:57 -0600)]
mgr/cephadm: check for an existing NFS config object

assume an existing NFS config if the named rados object already exists

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
Michael Fritch [Tue, 17 Mar 2020 21:14:55 +0000 (15:14 -0600)]
mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomon: allow `auth caps` for `mgr` profile
Michael Fritch [Tue, 17 Mar 2020 17:17:17 +0000 (11:17 -0600)]
mon: allow `auth caps` for `mgr` profile

cephadm orchestrator needs to update the caps during reconfig/redeploy

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add deployment example to NFS docs
Michael Fritch [Tue, 17 Mar 2020 04:48:31 +0000 (22:48 -0600)]
mgr/cephadm: add deployment example to NFS docs

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add utils.py
Michael Fritch [Tue, 17 Mar 2020 04:47:36 +0000 (22:47 -0600)]
mgr/cephadm: add utils.py

move `name_to_config_section` and `assert_valid_host` into utils.py

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: create/update keyring during nfs config
Michael Fritch [Mon, 16 Mar 2020 18:05:56 +0000 (12:05 -0600)]
mgr/cephadm: create/update keyring during nfs config

the keyring might already exist from a prior config/reconfig/redeploy.

attempt to get_or_create the keyring first and than update the keyring
caps afterward

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
Michael Fritch [Sun, 15 Mar 2020 18:14:05 +0000 (12:14 -0600)]
mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add nfs apply test
Michael Fritch [Sun, 15 Mar 2020 17:08:23 +0000 (11:08 -0600)]
mgr/cephadm: add nfs apply test

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: fix nfs redeploy/reconfig
Michael Fritch [Sun, 15 Mar 2020 16:53:32 +0000 (10:53 -0600)]
mgr/cephadm: fix nfs redeploy/reconfig

search for the `NFSServiceSpec` instead of passing empty
`cephadm_args` during `_create_daemon`

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: ensure nfs uses the correct entity
Michael Fritch [Fri, 13 Mar 2020 20:19:23 +0000 (14:19 -0600)]
mgr/cephadm: ensure nfs uses the correct entity

mon entity needs to start with `client.`

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: fix service name for nfs type
Michael Fritch [Mon, 9 Mar 2020 23:21:11 +0000 (17:21 -0600)]
mgr/cephadm: fix service name for nfs type

the `nfs` service was incorrectly reported as `mds`

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: apply nfs service spec
Michael Fritch [Mon, 9 Mar 2020 18:44:06 +0000 (12:44 -0600)]
mgr/cephadm: apply nfs service spec

orch apply nfs <svc_id> [<placement>]

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: don't create a unique nfs daemon name
Michael Fritch [Mon, 9 Mar 2020 18:38:25 +0000 (12:38 -0600)]
mgr/cephadm: don't create a unique nfs daemon name

only one nfs daemon will be deployed per host

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: update docs
Michael Fritch [Sun, 8 Mar 2020 23:27:54 +0000 (17:27 -0600)]
mgr/cephadm: update docs

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add minimal caps for nfs client keyring
Michael Fritch [Sun, 8 Mar 2020 16:53:17 +0000 (10:53 -0600)]
mgr/cephadm: add minimal caps for nfs client keyring

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add logging to NFSGanesha class
Michael Fritch [Thu, 27 Feb 2020 14:48:58 +0000 (07:48 -0700)]
mgr/cephadm: add logging to NFSGanesha class

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: create empty nfs rados config obj
Michael Fritch [Thu, 27 Feb 2020 14:24:52 +0000 (07:24 -0700)]
mgr/cephadm: create empty nfs rados config obj

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add nfs tests
Michael Fritch [Wed, 26 Feb 2020 19:34:42 +0000 (12:34 -0700)]
mgr/cephadm: add nfs tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add a minimal ganesha.conf
Michael Fritch [Tue, 25 Feb 2020 02:32:49 +0000 (19:32 -0700)]
mgr/cephadm: add a minimal ganesha.conf

we only need to specify the rados pool and config object url

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: deploy nfs-ganesha service
Michael Fritch [Mon, 24 Feb 2020 18:47:34 +0000 (11:47 -0700)]
mgr/cephadm: deploy nfs-ganesha service

orch daemon add nfs <svc_arg> <pool> [<namespace>] [<placement>]

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: split out `config-and-keyrings` json
Michael Fritch [Mon, 24 Feb 2020 18:43:07 +0000 (11:43 -0700)]
mgr/cephadm: split out `config-and-keyrings` json

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/orchestrator: rearrange interface to match impl. order
Michael Fritch [Mon, 24 Feb 2020 14:50:05 +0000 (07:50 -0700)]
mgr/orchestrator: rearrange interface to match impl. order

rgw impl. happens before rbd impl

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #34146 into master
Sage Weil [Wed, 25 Mar 2020 21:44:17 +0000 (16:44 -0500)]
Merge PR #34146 into master

* refs/pull/34146/head:
mgr/cephadm: use docker.io in default container image name
mgr/cephadm: fix 'upgrade start' message when specifying a version

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #34166 into master
Sage Weil [Wed, 25 Mar 2020 21:42:54 +0000 (16:42 -0500)]
Merge PR #34166 into master

* refs/pull/34166/head:
mgr/cephadm: DriveGroupSpec needs to know about unmanaged attribute
mgr/cephadm: DriveGroupSpec needs to support/ignore _unmanaged_

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34180 into master
Sage Weil [Wed, 25 Mar 2020 21:42:42 +0000 (16:42 -0500)]
Merge PR #34180 into master

* refs/pull/34180/head:
cephadm: Fix check_ip_port to work with IPv6

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoqa/rgw: partial revert of 'import with full path' 34184/head
Casey Bodley [Wed, 25 Mar 2020 20:19:15 +0000 (16:19 -0400)]
qa/rgw: partial revert of 'import with full path'

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34179 from cbodley/wip-rgw-admin-user-axe
Casey Bodley [Wed, 25 Mar 2020 19:53:30 +0000 (15:53 -0400)]
Merge pull request #34179 from cbodley/wip-rgw-admin-user-axe

rgw: remove unused librgw_admin_user

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agorgw: remove unused librgw_admin_user 34179/head
Casey Bodley [Wed, 25 Mar 2020 14:50:07 +0000 (10:50 -0400)]
rgw: remove unused librgw_admin_user

unused and not worth the effort to maintain

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agomgr/cephadm: fix 'orch ps --refresh' 34182/head
Sage Weil [Wed, 25 Mar 2020 15:39:59 +0000 (10:39 -0500)]
mgr/cephadm: fix 'orch ps --refresh'

The use of host in the refresh loop was clobbering the argument value.

Fixes: https://tracker.ceph.com/issues/44513
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: bind grafana to all interfaces 34181/head
Sage Weil [Wed, 25 Mar 2020 15:34:21 +0000 (10:34 -0500)]
mgr/cephadm: bind grafana to all interfaces

Fixes: https://tracker.ceph.com/issues/44608
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: Fix check_ip_port to work with IPv6 34180/head
Ricardo Marques [Wed, 25 Mar 2020 15:06:17 +0000 (15:06 +0000)]
cephadm: Fix check_ip_port to work with IPv6

Fixes: https://tracker.ceph.com/issues/43816
Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge pull request #34173 from tchaikov/wip-test-rgw
Kefu Chai [Wed, 25 Mar 2020 14:29:11 +0000 (22:29 +0800)]
Merge pull request #34173 from tchaikov/wip-test-rgw

test/rgw: should import parse not urlparse

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoMerge pull request #34117 from smithfarm/wip-43746-follow-on
Kefu Chai [Wed, 25 Mar 2020 14:17:38 +0000 (22:17 +0800)]
Merge pull request #34117 from smithfarm/wip-43746-follow-on

pybind/mgr/*: fix config_notify handling of default values

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34136 from tchaikov/test-msgr-stdout
Kefu Chai [Wed, 25 Mar 2020 14:13:07 +0000 (22:13 +0800)]
Merge pull request #34136 from tchaikov/test-msgr-stdout

test/msgr: print out informative messages to stdout

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #34015 from yuyuyu101/wip-pin-rocksdb
Kefu Chai [Wed, 25 Mar 2020 14:12:21 +0000 (22:12 +0800)]
Merge pull request #34015 from yuyuyu101/wip-pin-rocksdb

kv/RocksDBStore: using PinnableSlice to avoid extra value copy

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34140 from theanalyst/doc/releases/oct-distro-fix
Abhishek L [Wed, 25 Mar 2020 13:49:55 +0000 (14:49 +0100)]
Merge pull request #34140 from theanalyst/doc/releases/oct-distro-fix

doc: releases: add a note on debian packages & those built by the community

Reviewed-By: Kefu Chai <kchai@redhat.com>
Reviewed-By: Sage Weil <sweil@redhat.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>
5 years agotest/rgw: should import parse not urlparse 34173/head
Kefu Chai [Wed, 25 Mar 2020 13:47:54 +0000 (21:47 +0800)]
test/rgw: should import parse not urlparse

urlparse is a function while parse is a submodule where parse_qsl() is
provided

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34138 from bk201/wip-44725
Kefu Chai [Wed, 25 Mar 2020 11:56:02 +0000 (19:56 +0800)]
Merge pull request #34138 from bk201/wip-44725

qa/tasks/mgr/dashboard/test_health: update mdsmap schema

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #34139 from tchaikov/wip-qa-test-py3
Kefu Chai [Wed, 25 Mar 2020 11:48:33 +0000 (19:48 +0800)]
Merge pull request #34139 from tchaikov/wip-qa-test-py3

qa,test: py3 compatible changes and fix

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoMerge pull request #34131 from tspmelo/wip-force-npm-resolutions
Lenz Grimmer [Wed, 25 Mar 2020 09:54:15 +0000 (10:54 +0100)]
Merge pull request #34131 from tspmelo/wip-force-npm-resolutions

mgr/dashboard: Check for missing npm resolutions

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agomgr/cephadm: DriveGroupSpec needs to know about unmanaged attribute 34166/head
Joshua Schmid [Wed, 25 Mar 2020 09:53:06 +0000 (10:53 +0100)]
mgr/cephadm: DriveGroupSpec needs to know about unmanaged attribute

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge pull request #34165 from tchaikov/wip-doc-release-octopus-indent
Kefu Chai [Wed, 25 Mar 2020 08:42:58 +0000 (16:42 +0800)]
Merge pull request #34165 from tchaikov/wip-doc-release-octopus-indent

doc/releases/octopus: fix indents

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agomgr/cephadm: DriveGroupSpec needs to support/ignore _unmanaged_
Joshua Schmid [Wed, 25 Mar 2020 08:34:06 +0000 (09:34 +0100)]
mgr/cephadm: DriveGroupSpec needs to support/ignore _unmanaged_

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agodoc/releases/octopus: fix indents 34165/head
Kefu Chai [Wed, 25 Mar 2020 04:16:16 +0000 (12:16 +0800)]
doc/releases/octopus: fix indents

reduce the indent in subsection of "RGW object storage", some of the
nested items should be indented with two spaces instead of four.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/mgr/dashboard/test_health: ignore fsmap.standbys 34138/head
Kiefer Chang [Wed, 25 Mar 2020 03:17:17 +0000 (11:17 +0800)]
qa/tasks/mgr/dashboard/test_health: ignore fsmap.standbys

Fixes: https://tracker.ceph.com/issues/44725
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge pull request #34106 from adamemerson/wip-namespace-mon
Kefu Chai [Wed, 25 Mar 2020 02:48:57 +0000 (10:48 +0800)]
Merge pull request #34106 from adamemerson/wip-namespace-mon

Make ceph-mon compile without top-level using namespace in headers

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34161 from tchaikov/wip-perf-test-on-bionic
Yuri Weinstein [Wed, 25 Mar 2020 02:16:48 +0000 (19:16 -0700)]
Merge pull request #34161 from tchaikov/wip-perf-test-on-bionic

qa/suites/perf-basic: only test on bionic

5 years agoqa/suites/perf-basic: only test on bionic 34161/head
Kefu Chai [Wed, 25 Mar 2020 01:54:04 +0000 (09:54 +0800)]
qa/suites/perf-basic: only test on bionic

because centos8/rhel8 does not package collectl or pdsh anymore. but
these packages are required by CBT for collecting performance stats.
so instead of testing on all supported distros, let's run the perf tests
only on distros offering these packages.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33851 into master
Sage Weil [Tue, 24 Mar 2020 22:26:49 +0000 (17:26 -0500)]
Merge PR #33851 into master

* refs/pull/33851/head:
mgr/orch: allow list daemons by service_name

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33957 into master
Sage Weil [Tue, 24 Mar 2020 21:42:09 +0000 (16:42 -0500)]
Merge PR #33957 into master

* refs/pull/33957/head:
Add alertmanager sample

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
5 years agoMerge PR #33958 into master
Sage Weil [Tue, 24 Mar 2020 21:41:09 +0000 (16:41 -0500)]
Merge PR #33958 into master

* refs/pull/33958/head:
Add alertmanager adopt

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34145 into master
Sage Weil [Tue, 24 Mar 2020 21:35:47 +0000 (16:35 -0500)]
Merge PR #34145 into master

* refs/pull/34145/head:
qa/workunits/cephadm: create lvs before calling cephadm

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34130 from theanalyst/octopus-changelog
Abhishek L [Tue, 24 Mar 2020 21:11:21 +0000 (22:11 +0100)]
Merge pull request #34130 from theanalyst/octopus-changelog

doc: add changelog for octopus release

Reviewed-By: Sage Weil <sage@redhat.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>
5 years agomgr/dashboard: Check for missing npm resolutions 34131/head
Tiago Melo [Mon, 23 Mar 2020 19:54:06 +0000 (18:54 -0100)]
mgr/dashboard: Check for missing npm resolutions

Check if it's necessary to run "npm run fix:audit" before committing the changes.

This is important to resolve some issues with building and
to fix some npm vulnerabilities.

Fixes: https://tracker.ceph.com/issues/44723
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge PR #33967 into master
Sage Weil [Tue, 24 Mar 2020 20:39:13 +0000 (15:39 -0500)]
Merge PR #33967 into master

* refs/pull/33967/head:
mgr: ceph_pg_* metrics contains last value instead of sum all of them

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #34085 into master
Sage Weil [Tue, 24 Mar 2020 20:38:04 +0000 (15:38 -0500)]
Merge PR #34085 into master

* refs/pull/34085/head:
debian: add ceph-grafana-dashboards package
ceph.spec: put prometheus alerts in vendor-neutral location
mgr/cephadm: include prom alerts, if present in the container

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
5 years agoMerge PR #34089 into master
Sage Weil [Tue, 24 Mar 2020 20:36:59 +0000 (15:36 -0500)]
Merge PR #34089 into master

* refs/pull/34089/head:
mgr/cephadm: point alertmanager at all mgr/dashboard URLs

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
5 years agoMerge PR #34114 into master
Sage Weil [Tue, 24 Mar 2020 20:35:44 +0000 (15:35 -0500)]
Merge PR #34114 into master

* refs/pull/34114/head:
mgr/cephadm: Add example to run when debugging ssh failures

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33917 from yuvalif/fix_bucket_notification_json_format
Casey Bodley [Tue, 24 Mar 2020 18:08:11 +0000 (14:08 -0400)]
Merge pull request #33917 from yuvalif/fix_bucket_notification_json_format

rgw/pubsub: invalid json format in bucket notification example

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agodoc: releases: add a note on debian packages & those built by the community 34140/head
Abhishek Lekshmanan [Tue, 24 Mar 2020 10:49:56 +0000 (11:49 +0100)]
doc: releases: add a note on debian packages & those built by the community

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agomgr/cephadm: use docker.io in default container image name 34146/head
Sage Weil [Tue, 24 Mar 2020 16:46:30 +0000 (11:46 -0500)]
mgr/cephadm: use docker.io in default container image name

Not all hosts have docker.io configured as a default registry.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34076 from p-se/wip-pse-doc-preliminary-steps
Lenz Grimmer [Tue, 24 Mar 2020 16:38:58 +0000 (17:38 +0100)]
Merge pull request #34076 from p-se/wip-pse-doc-preliminary-steps

mgr/dashboard: add preliminary steps to documentation

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/cephadm: fix 'upgrade start' message when specifying a version
Sage Weil [Tue, 24 Mar 2020 16:07:12 +0000 (11:07 -0500)]
mgr/cephadm: fix 'upgrade start' message when specifying a version

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephadm: create lvs before calling cephadm 34145/head
Jan Fajerski [Tue, 24 Mar 2020 13:53:26 +0000 (14:53 +0100)]
qa/workunits/cephadm: create lvs before calling cephadm

Fixes: https://tracker.ceph.com/issues/44682
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #33911 from tchaikov/wip-cephfs-doc
Kefu Chai [Tue, 24 Mar 2020 15:01:16 +0000 (23:01 +0800)]
Merge pull request #33911 from tchaikov/wip-cephfs-doc

pybind/cephfs, doc: add python binding doc

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31885 from jtlayton/wip-42447
Sebastian Wagner [Tue, 24 Mar 2020 13:31:07 +0000 (14:31 +0100)]
Merge pull request #31885 from jtlayton/wip-42447

doc: add a basic client configuration document

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #34124 from smithfarm/wip-fix-cbs-for-octopus
Nathan Cutler [Tue, 24 Mar 2020 13:06:08 +0000 (14:06 +0100)]
Merge pull request #34124 from smithfarm/wip-fix-cbs-for-octopus

script/ceph-backport.sh: update for octopus

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoAdd alertmanager adopt 33958/head
Eric Jackson [Fri, 13 Mar 2020 18:35:54 +0000 (14:35 -0400)]
Add alertmanager adopt

Signed-off-by: Eric Jackson <swiftgist@gmail.com>
5 years agoAdd alertmanager sample 33957/head
Eric Jackson [Fri, 13 Mar 2020 18:42:57 +0000 (14:42 -0400)]
Add alertmanager sample

Default contents of alertmanager.yml with additional peers key

Signed-off-by: Eric Jackson <swiftgist@gmail.com>
5 years agomgr/dashboard: add preliminary steps to documentation 34076/head
Patrick Seidensal [Thu, 19 Mar 2020 21:52:03 +0000 (22:52 +0100)]
mgr/dashboard: add preliminary steps to documentation

to pick up newcomers with little to no Ceph experience.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
5 years agoqa/tasks/cephfs: fix syntax error 34139/head
Kefu Chai [Tue, 24 Mar 2020 10:15:58 +0000 (18:15 +0800)]
qa/tasks/cephfs: fix syntax error

it's a regression introduced by 9f6c764f10

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa: import py3 compatible modules using six
Kefu Chai [Tue, 24 Mar 2020 08:33:57 +0000 (16:33 +0800)]
qa: import py3 compatible modules using six

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa: import with full path
Kefu Chai [Tue, 24 Mar 2020 08:33:22 +0000 (16:33 +0800)]
qa: import with full path

to be py3 compatible

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/mgr/*: fix config_notify handling of default values 34117/head
Nathan Cutler [Mon, 23 Mar 2020 14:41:16 +0000 (15:41 +0100)]
pybind/mgr/*: fix config_notify handling of default values

After 5ace82e65c72847fb875fc01c419937a26a59d70 was merged, I found
three more instances of the code being patched.

The commit message of 5ace82e65c72847fb875fc01c419937a26a59d70 was/is:

"The default values are handled by mgr_module.py's _get_module_option();
the or here means that we break any non-true (0, false, none) value and
override it with the default."

Fixes: 5ace82e65c72847fb875fc01c419937a26a59d70
Fixes: https://tracker.ceph.com/issues/43746
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoqa/tasks/mgr/dashboard/test_health: update mdsmap schema
Kiefer Chang [Tue, 24 Mar 2020 10:14:05 +0000 (18:14 +0800)]
qa/tasks/mgr/dashboard/test_health: update mdsmap schema

Fixes: https://tracker.ceph.com/issues/44725
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoscript/ceph-backport.sh: bump version number 34124/head
Nathan Cutler [Mon, 23 Mar 2020 15:47:51 +0000 (16:47 +0100)]
script/ceph-backport.sh: bump version number

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoscript/ceph-backport.sh: set target_branch in API case
Nathan Cutler [Mon, 23 Mar 2020 15:46:02 +0000 (16:46 +0100)]
script/ceph-backport.sh: set target_branch in API case

When we falling back to the GitHub API to determine the milestone
number, we were not initializing target_branch, so the script was
broken for octopus backports.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agodoc: add changelog for octopus release 34130/head
Abhishek Lekshmanan [Tue, 24 Mar 2020 09:29:23 +0000 (10:29 +0100)]
doc: add changelog for octopus release

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #34108 from mgfritch/cephadm-optional-config-keyring
Kefu Chai [Tue, 24 Mar 2020 06:03:12 +0000 (14:03 +0800)]
Merge pull request #34108 from mgfritch/cephadm-optional-config-keyring

cephadm: init config and keyring with None

Tested-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34101 from s1eke/master
Kefu Chai [Tue, 24 Mar 2020 06:00:29 +0000 (14:00 +0800)]
Merge pull request #34101 from s1eke/master

doc: Fix some link errors about ceph-deploy

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agotest/msgr: print out informative messages to stdout 34136/head
Kefu Chai [Tue, 24 Mar 2020 05:43:20 +0000 (13:43 +0800)]
test/msgr: print out informative messages to stdout

they should not goto stderr

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orch: allow list daemons by service_name 33851/head
Kiefer Chang [Tue, 10 Mar 2020 11:43:42 +0000 (19:43 +0800)]
mgr/orch: allow list daemons by service_name

Services like rgw and mds are differentiated by service_name. For
example: mds.xyz vs. mds.abc. With current interface, we can't list all
daemons belonged to mds.xyz only. Add service_name as a new argument to
filter daemons by it.

Fixes: https://tracker.ceph.com/issues/44541
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agokv/RocksDBStore: using PinnableSlice to avoid extra value copy 34015/head
Haomai Wang [Wed, 18 Mar 2020 01:51:41 +0000 (09:51 +0800)]
kv/RocksDBStore: using PinnableSlice to avoid extra value copy

Signed-off-by: Haomai Wang <haomai@xsky.com>
5 years agoMerge pull request #34103 from yanghonggang/perf-msgr-client
Kefu Chai [Tue, 24 Mar 2020 04:46:55 +0000 (12:46 +0800)]
Merge pull request #34103 from yanghonggang/perf-msgr-client

test/msgr/perf_msgr_client.cc: fix misleading total op num

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33753 from ukernel/wip-44448
Yan, Zheng [Tue, 24 Mar 2020 02:07:36 +0000 (10:07 +0800)]
Merge pull request #33753 from ukernel/wip-44448

mds: fix 'if there is lock cache on dir' check

5 years agodebian: add ceph-grafana-dashboards package 34085/head
Sage Weil [Fri, 20 Mar 2020 16:36:10 +0000 (11:36 -0500)]
debian: add ceph-grafana-dashboards package

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph.spec: put prometheus alerts in vendor-neutral location
Sage Weil [Fri, 20 Mar 2020 15:15:54 +0000 (10:15 -0500)]
ceph.spec: put prometheus alerts in vendor-neutral location

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: include prom alerts, if present in the container
Sage Weil [Fri, 20 Mar 2020 14:27:28 +0000 (09:27 -0500)]
mgr/cephadm: include prom alerts, if present in the container

The prometheus config already looks in/etc/prometheus/alerting/*, so drop
this file into position.

Note that the file is currently only present in SUSE builds, so that needs
to be fixed still.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge remote-tracking branch 'gh/octopus' v16.0.0
Sage Weil [Tue, 24 Mar 2020 01:09:41 +0000 (20:09 -0500)]
Merge remote-tracking branch 'gh/octopus'

5 years agoMerge PR #34100 into octopus 34135/head
Sage Weil [Tue, 24 Mar 2020 01:01:12 +0000 (20:01 -0500)]
Merge PR #34100 into octopus

* refs/pull/34100/head:
doc/cephadm: notes on status/stability
doc/cephadm: some troubleshooting tips

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34115 into octopus
Sage Weil [Tue, 24 Mar 2020 01:00:58 +0000 (20:00 -0500)]
Merge PR #34115 into octopus

* refs/pull/34115/head:
doc/releases/octopus: drop stray line
doc/releases/octopus: note about repository locations
doc/releases: include octopus in index
doc/install/get-packages: update package install instructions
doc/releases/octopus: final notes

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
5 years agoMerge PR #34126 into master 33962/head
Sage Weil [Mon, 23 Mar 2020 18:55:16 +0000 (13:55 -0500)]
Merge PR #34126 into master

* refs/pull/34126/head:
qa/*/osd-backfill-recovery-log.sh: flush_pg_stats before checking log length

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agodoc/releases/octopus: drop stray line 34115/head
Sage Weil [Mon, 23 Mar 2020 18:54:12 +0000 (13:54 -0500)]
doc/releases/octopus: drop stray line

Signed-off-by: Sage Weil <sage@redhat.com>