]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoos/bluestore: fix huge (>4GB) bluefs reads 34503/head
Igor Fedotov [Wed, 8 Apr 2020 21:06:14 +0000 (00:06 +0300)]
os/bluestore: fix huge (>4GB) bluefs reads

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge pull request #34231 from majianpeng/bluefs-fix-invalidate-cache-bug
Kefu Chai [Mon, 13 Apr 2020 03:03:32 +0000 (11:03 +0800)]
Merge pull request #34231 from majianpeng/bluefs-fix-invalidate-cache-bug

os/bluestore: don't foreget invalidate cache of FileReaderBuffer.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge PR #34272 into master
Sage Weil [Sun, 12 Apr 2020 22:33:57 +0000 (17:33 -0500)]
Merge PR #34272 into master

* refs/pull/34272/head:
mgr/PyModuleRegistry: ignore 'obsolete' modules
qa/suites/fs/upgrade: start with msgr2
qa/suites/fs/upgrade: s/mimic/nautilus/
qa/suites/upgrade: whitelist when orchestrator_cli can't be loaded
qa/standalone/mon/msgr-v2-transition: remove test
mon/MgrMonitor: disable orchestrator_cli if >= octopus
qa/suites/ugprade: remove mimic -> pacific upgrade tests
qa/standalone/mon/misc: update TEST_mon_features
mon/MgrMap: use always_on_modules from most recent release
mon/MonCommands: require-osd-release pacific
qa/suites/rados/thrash-old-clients: adjust octopus package list for el7
doc/dev/release-kickoff-checklist: include ceph-build change
qa/workunits/cephtool/test.sh: fix require-osd-release test
mon/MgrMonitor: define mgr modules for pacific
doc/dev/release-checklists: generalize
doc/dev/release-kickoff-checklist: quotes
qa/suites/rados/thrash-old-clients/1-install/octopus
qa/releases/pacific.yaml
mds/cephfs_features: CEPHFS_CURRENT_RELEASE
doc/dev/release-kickoff-checklist: a few other items
osd: remove redundant check
mon/OSDMonitor: make pacific changes
mon/mon_types: add mon pacific feature
include/ceph_features: define SERVER_PACIFIC
include/ceph_features: fix whitespace
mon: persistent INCOMPAT_PACIFIC item
ceph-volume: __release__ == pacific
script: update backport scripts for now-released octopus
common: pacific release constants
doc/dev/release-kickoff-checklist
src/ceph_release: pacific, 16, dev
CMakeLists: 16.0.0

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #34525 from Dmole/patch-5
Sebastian Wagner [Sat, 11 Apr 2020 19:24:00 +0000 (21:24 +0200)]
Merge pull request #34525 from Dmole/patch-5

doc: Update index.rst

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #32297 from varshar16/wip-mgr-nfs-ganesha-exports
Sebastian Wagner [Sat, 11 Apr 2020 19:22:56 +0000 (21:22 +0200)]
Merge pull request #32297 from varshar16/wip-mgr-nfs-ganesha-exports

Create and delete exports for nfs ganesha with mgr volume

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/PyModuleRegistry: ignore 'obsolete' modules 34272/head
Sage Weil [Sat, 11 Apr 2020 14:51:46 +0000 (09:51 -0500)]
mgr/PyModuleRegistry: ignore 'obsolete' modules

Old modules may be in the mgrmap (and always_on) but no longer exist.  Do
not try to load those or raise errors about them.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoUpdate index.rst 34525/head
Tim [Sat, 11 Apr 2020 12:25:51 +0000 (08:25 -0400)]
Update index.rst

clean up "only only"

Signed-off-by: Tim <elatllat@gmail.com>
5 years agoMerge pull request #34348 from ifed01/wip-ifed-fix-enforce
Kefu Chai [Sat, 11 Apr 2020 04:32:34 +0000 (12:32 +0800)]
Merge pull request #34348 from ifed01/wip-ifed-fix-enforce

os/bluestore: apply bluestore_debug_enforce_settings when choosing mi…

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34421 from ifed01/wip-ifed-kill-buf-in-read
Kefu Chai [Sat, 11 Apr 2020 04:28:10 +0000 (12:28 +0800)]
Merge pull request #34421 from ifed01/wip-ifed-kill-buf-in-read

os/bluestore: kill buf param in BlueFS::read

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
5 years agoMerge pull request #34468 from tchaikov/wip-mgr-telegraph
Kefu Chai [Sat, 11 Apr 2020 04:26:37 +0000 (12:26 +0800)]
Merge pull request #34468 from tchaikov/wip-mgr-telegraph

mgr/telegraf: catch FileNotFoundError exception

Reviewed-by: Wido den Hollander <wido@42on.com>
5 years agoMerge pull request #34084 from sebastian-philipp/cephadm-host-ls-offline
Sebastian Wagner [Fri, 10 Apr 2020 20:56:20 +0000 (22:56 +0200)]
Merge pull request #34084 from sebastian-philipp/cephadm-host-ls-offline

mgr/cephadm: enhance `host ls`

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34382 from mgfritch/cephadm-nfs-grace
Sebastian Wagner [Fri, 10 Apr 2020 20:50:42 +0000 (22:50 +0200)]
Merge pull request #34382 from mgfritch/cephadm-nfs-grace

cephadm: add config required for ganesha grace

Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge pull request #34488 from tchaikov/wip-dmclock
Kefu Chai [Fri, 10 Apr 2020 16:46:06 +0000 (00:46 +0800)]
Merge pull request #34488 from tchaikov/wip-dmclock

dmclock: pick up change to s/uint/unsigned/

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #34508 from tchaikov/wip-45022
Kefu Chai [Fri, 10 Apr 2020 11:34:03 +0000 (19:34 +0800)]
Merge pull request #34508 from tchaikov/wip-45022

selinux: add "type http_cache_port_t" in require section

Reviewed-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
5 years agoMerge pull request #34494 from idryomov/wip-krbd-unmap-spacing
Ilya Dryomov [Fri, 10 Apr 2020 08:29:57 +0000 (10:29 +0200)]
Merge pull request #34494 from idryomov/wip-krbd-unmap-spacing

tests: update unmap.t for table spacing changes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoselinux: add "type http_cache_port_t" in require section 34508/head
Kefu Chai [Fri, 10 Apr 2020 06:27:48 +0000 (14:27 +0800)]
selinux: add "type http_cache_port_t" in require section

this addresses the regression introduced by
611a2a7ce1713cf92797b19d8a9a93a7dfc68fa5

Fixes: https://tracker.ceph.com/issues/45022
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34499 from ceph/wip-rtd
Kefu Chai [Fri, 10 Apr 2020 01:43:28 +0000 (09:43 +0800)]
Merge pull request #34499 from ceph/wip-rtd

doc: enable Read the Docs

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #34487 from tchaikov/wip-test-cronjob-py3
Kefu Chai [Fri, 10 Apr 2020 01:42:42 +0000 (09:42 +0800)]
Merge pull request #34487 from tchaikov/wip-test-cronjob-py3

qa/tests: pass "-t 2" to teuthology-suite when testing non-master bra…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agodoc: add in-doc search from read the docs 34499/head
Kefu Chai [Thu, 9 Apr 2020 15:14:42 +0000 (23:14 +0800)]
doc: add in-doc search from read the docs

readthedocs-sphinx-search features better user experience than the
builtin search offered by sphinx

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc: use plantweb as fallback of sphinx-ditaa
Kefu Chai [Thu, 9 Apr 2020 13:25:39 +0000 (21:25 +0800)]
doc: use plantweb as fallback of sphinx-ditaa

RTD does not support installing system packages, the only ways to install
dependencies are setuptools and pip. while ditaa is a tool written in
Java. so we need to find a native python tool allowing us to render ditaa
images. plantweb is able to the web service for rendering the ditaa
diagram. so let's use it as a fallback if "ditaa" is not around.

also start a new line after the directive, otherwise planweb server will
return 500 at seeing the diagram.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/cephadm: add CACHEINODE and EXPORT_DEFAULTS sections 34382/head
Michael Fritch [Thu, 9 Apr 2020 20:49:14 +0000 (14:49 -0600)]
mgr/cephadm: add CACHEINODE and EXPORT_DEFAULTS sections

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: add config required for ganesha grace
Michael Fritch [Thu, 2 Apr 2020 19:12:40 +0000 (13:12 -0600)]
mgr/cephadm: add config required for ganesha grace

adds minimal config for ganesha-rados-grace

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add userid during grace add/remove
Michael Fritch [Thu, 2 Apr 2020 16:31:39 +0000 (10:31 -0600)]
cephadm: add userid during grace add/remove

ganesha-rados-grace needs a rados userid to add/remove from the grace db

Mar 27 10:05:25 host1 bash[11684]: rados_connect: -13
Mar 27 10:05:25 host1 bash[11684]: Can't connect to cluster: -13

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #34502 from ceph/kalebskeithley-patch-1-2
Daniel Gryniewicz [Thu, 9 Apr 2020 18:24:09 +0000 (14:24 -0400)]
Merge pull request #34502 from ceph/kalebskeithley-patch-1-2

Update ceph.te

5 years agoMerge pull request #34484 from cbodley/wip-sub-spawn
Matt Benjamin [Thu, 9 Apr 2020 18:17:52 +0000 (14:17 -0400)]
Merge pull request #34484 from cbodley/wip-sub-spawn

spawn: update submodule

5 years agoUpdate ceph.te 34502/head
kalebskeithley [Thu, 9 Apr 2020 17:00:57 +0000 (13:00 -0400)]
Update ceph.te

Fixes: https://tracker.ceph.com/issues/45022
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
5 years agodoc/conf.py: exclude pybindings docs from build for RTD
Kefu Chai [Thu, 9 Apr 2020 08:51:06 +0000 (16:51 +0800)]
doc/conf.py: exclude pybindings docs from build for RTD

because it'd difficult to prepare (dummy) librados,libcephfs and librbd for
their python bindings in the building environment offered by Read the Docs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34314 from ishanrai05/html-cleanup
Lenz Grimmer [Thu, 9 Apr 2020 14:15:50 +0000 (16:15 +0200)]
Merge pull request #34314 from ishanrai05/html-cleanup

mgr/dashboard: Clean up HTML

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #34223 from liewegas/cephadm-dashboard-grafana-ssl-verify
Sebastian Wagner [Thu, 9 Apr 2020 14:10:57 +0000 (16:10 +0200)]
Merge pull request #34223 from liewegas/cephadm-dashboard-grafana-ssl-verify

mgr/cephadm: disable dashboard's grafana cert ssl_verify if we generate it

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34454 from mgfritch/cephadm-osd-fsid-test
Sebastian Wagner [Thu, 9 Apr 2020 14:07:34 +0000 (16:07 +0200)]
Merge pull request #34454 from mgfritch/cephadm-osd-fsid-test

qa/workunits/cephadm/test_cephadm.sh: add fsid to ceph-volume cmds

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34249 from mgfritch/cephadm-nfs-common-config
Sebastian Wagner [Thu, 9 Apr 2020 14:05:59 +0000 (16:05 +0200)]
Merge pull request #34249 from mgfritch/cephadm-nfs-common-config

mgr/cephadm: nfs common config

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #34485 from mgfritch/cephadm-no-func
Sebastian Wagner [Thu, 9 Apr 2020 14:03:36 +0000 (16:03 +0200)]
Merge pull request #34485 from mgfritch/cephadm-no-func

cephadm: show error when no command is specified

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34411 from votdev/issue_44589
Lenz Grimmer [Thu, 9 Apr 2020 11:25:11 +0000 (13:25 +0200)]
Merge pull request #34411 from votdev/issue_44589

mgr/dashboard: lint error on plugins/debug.py

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agotests: update unmap.t for table spacing changes 34494/head
Ilya Dryomov [Thu, 9 Apr 2020 10:41:34 +0000 (12:41 +0200)]
tests: update unmap.t for table spacing changes

Introduced in 4d42b4c5a0ed ("common/TextTable: default to 2 spaces
separating columns") and 41f003518a07 ("common/TextTable: only pad
between columns").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoMerge pull request #34452 from rhcs-dashboard/fix-44923-master
Lenz Grimmer [Thu, 9 Apr 2020 10:20:41 +0000 (12:20 +0200)]
Merge pull request #34452 from rhcs-dashboard/fix-44923-master

mgr/dashboard: use FQDN for failover redirection

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #34471 from idryomov/wip-rbd-fio-rstrip
Ilya Dryomov [Thu, 9 Apr 2020 09:37:14 +0000 (11:37 +0200)]
Merge pull request #34471 from idryomov/wip-rbd-fio-rstrip

qa/tasks/rbd_fio: unbreak after the conversion from StringIO

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoreadthedocs: add .readthedocs.yml
Kefu Chai [Thu, 9 Apr 2020 07:35:15 +0000 (15:35 +0800)]
readthedocs: add .readthedocs.yml

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34408 from dillaman/wip-44727
Mykola Golub [Thu, 9 Apr 2020 07:13:57 +0000 (10:13 +0300)]
Merge pull request #34408 from dillaman/wip-44727

rbd-mirror: improved replication statistics

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agodmclock: pick up change to s/uint/unsigned/ 34488/head
Kefu Chai [Thu, 9 Apr 2020 04:30:30 +0000 (12:30 +0800)]
dmclock: pick up change to s/uint/unsigned/

to address the FTBFS with musl libc which does not define uint.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tests: pass "-t 2" to teuthology-suite when testing non-master branches 34487/head
Kefu Chai [Thu, 9 Apr 2020 03:18:58 +0000 (11:18 +0800)]
qa/tests: pass "-t 2" to teuthology-suite when testing non-master branches

-t is an alias of "--teuthology-branch" which defaults to master. we
have a "py2" branch in teuthology. that branch is compatible with
python2, and the teuthology-worker is executed in a Python2 environment,
so all qa suites tested using "py2" branch of teuthology should work
fine as long as they are Python2 compatible. currently, all LTS branches
are compatible with Python2, and only master is also compatible with
Python3. but we plan to migrate master and octopus' qa suites to
python3 to ease the pain of maintainance in long term.

to achieve this goal, in this change, all non-master branches are now
tested using the "py2" teuthology branch.

once the python3 compatible changes are backported to octopus, "-t 2"
options will be removed from the command lines testing octopus.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34264 from tchaikov/wip-qa-py3
Kefu Chai [Thu, 9 Apr 2020 02:08:44 +0000 (10:08 +0800)]
Merge pull request #34264 from tchaikov/wip-qa-py3

qa/tasks: be python3 compatible

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #34284 from liewegas/followon-34266-cleanup
Kefu Chai [Thu, 9 Apr 2020 00:39:27 +0000 (08:39 +0800)]
Merge pull request #34284 from liewegas/followon-34266-cleanup

mgr/DaemonServer: add missing ceph_abort

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/suites/fs/upgrade: start with msgr2
Sage Weil [Wed, 8 Apr 2020 20:46:36 +0000 (15:46 -0500)]
qa/suites/fs/upgrade: start with msgr2

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: show error when no command is specified 34485/head
Michael Fritch [Wed, 8 Apr 2020 20:42:12 +0000 (14:42 -0600)]
cephadm: show error when no command is specified

Traceback (most recent call last):
  File "./cephadm", line 4452, in <module>
    if args.func != command_check_host:
AttributeError: 'Namespace' object has no attribute 'func'

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: use fsid during dump_log 34454/head
Michael Fritch [Wed, 8 Apr 2020 19:35:02 +0000 (13:35 -0600)]
qa/workunits/cephadm/test_cephadm.sh: use fsid during dump_log

needed when running with multiple ceph clusters

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #34414 from yuvalif/add_timeout_to_http_client
Casey Bodley [Wed, 8 Apr 2020 19:35:11 +0000 (15:35 -0400)]
Merge pull request #34414 from yuvalif/add_timeout_to_http_client

rgw/http: add timeout to http client

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agospawn: update submodule 34484/head
Casey Bodley [Wed, 8 Apr 2020 18:40:09 +0000 (14:40 -0400)]
spawn: update submodule

pulls in fixes for exception handling, and support for multiple return
values with std::tuple<>

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34463 from jan--f/c-v-batch-filter-check-lvs-before-access
Jan Fajerski [Wed, 8 Apr 2020 16:07:06 +0000 (18:07 +0200)]
Merge pull request #34463 from jan--f/c-v-batch-filter-check-lvs-before-access

ceph-volume/batch: check lvs list before access

5 years agoMerge pull request #34472 from jan--f/c-v-noninteractive-batch-idempotency-all-filtered
Jan Fajerski [Wed, 8 Apr 2020 15:14:24 +0000 (17:14 +0200)]
Merge pull request #34472 from jan--f/c-v-noninteractive-batch-idempotency-all-filtered

ceph-volume/batch: return success when all devices are filtered

5 years agorbd-mirror: fixed race condition with snapshot sync and shutdown 34408/head
Jason Dillaman [Tue, 7 Apr 2020 16:13:46 +0000 (12:13 -0400)]
rbd-mirror: fixed race condition with snapshot sync and shutdown

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoceph-volume/batch: return success when all devices are filtered 34472/head
Jan Fajerski [Wed, 8 Apr 2020 09:55:57 +0000 (11:55 +0200)]
ceph-volume/batch: return success when all devices are filtered

batch should only return an error if some (but not all) devices are
filtered. When only some devices are filtered the resulting osd layout
could look very different from what a user expects. If all devies are
filtered just return success.

Fixes: https://tracker.ceph.com/issues/44994
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoqa/suites/fs/upgrade: s/mimic/nautilus/
Sage Weil [Mon, 6 Apr 2020 21:32:03 +0000 (16:32 -0500)]
qa/suites/fs/upgrade: s/mimic/nautilus/

Also rename 3-compat_client/mimic -> pacific to match the min_client
setting (the naming here confuses me...).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/upgrade: whitelist when orchestrator_cli can't be loaded
Sage Weil [Fri, 3 Apr 2020 22:41:32 +0000 (17:41 -0500)]
qa/suites/upgrade: whitelist when orchestrator_cli can't be loaded

This happens because mgrs may start before mons, or before mons have
published a new mgrmap that disables orchestrator_cli.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/standalone/mon/msgr-v2-transition: remove test
Sage Weil [Wed, 1 Apr 2020 13:31:09 +0000 (08:31 -0500)]
qa/standalone/mon/msgr-v2-transition: remove test

v2 was introduced in nautilus, and we don't support mimic -> pacific
upgrades (only mimic -> octopus).  This test can be removed!

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/MgrMonitor: disable orchestrator_cli if >= octopus
Sage Weil [Wed, 1 Apr 2020 13:28:53 +0000 (08:28 -0500)]
mon/MgrMonitor: disable orchestrator_cli if >= octopus

Fixes: https://tracker.ceph.com/issues/44883
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/ugprade: remove mimic -> pacific upgrade tests
Sage Weil [Wed, 1 Apr 2020 13:19:16 +0000 (08:19 -0500)]
qa/suites/ugprade: remove mimic -> pacific upgrade tests

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/standalone/mon/misc: update TEST_mon_features
Sage Weil [Tue, 31 Mar 2020 21:55:50 +0000 (16:55 -0500)]
qa/standalone/mon/misc: update TEST_mon_features

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/MgrMap: use always_on_modules from most recent release
Sage Weil [Tue, 31 Mar 2020 21:47:54 +0000 (16:47 -0500)]
mon/MgrMap: use always_on_modules from most recent release

If our release isn't in the always_on_map, say because you just upgraded,
then start with the modules from the last/most recent release.  This
should be sufficient to allow an upgrade when the mon is still the old
release and the mgrmap doesn't tell us what modules we should be enabling.

(Arguably, the always_on_modules should be enshrined in the MgrMap itself
and not in the mon?)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/MonCommands: require-osd-release pacific
Sage Weil [Tue, 31 Mar 2020 21:37:44 +0000 (16:37 -0500)]
mon/MonCommands: require-osd-release pacific

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/thrash-old-clients: adjust octopus package list for el7
Sage Weil [Tue, 31 Mar 2020 21:36:13 +0000 (16:36 -0500)]
qa/suites/rados/thrash-old-clients: adjust octopus package list for el7

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/dev/release-kickoff-checklist: include ceph-build change
Sage Weil [Tue, 31 Mar 2020 13:10:35 +0000 (08:10 -0500)]
doc/dev/release-kickoff-checklist: include ceph-build change

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/cephtool/test.sh: fix require-osd-release test
Sage Weil [Tue, 31 Mar 2020 12:57:29 +0000 (07:57 -0500)]
qa/workunits/cephtool/test.sh: fix require-osd-release test

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/MgrMonitor: define mgr modules for pacific
Sage Weil [Tue, 31 Mar 2020 01:49:27 +0000 (20:49 -0500)]
mon/MgrMonitor: define mgr modules for pacific

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/dev/release-checklists: generalize
Sage Weil [Sun, 29 Mar 2020 15:30:46 +0000 (10:30 -0500)]
doc/dev/release-checklists: generalize

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/dev/release-kickoff-checklist: quotes
Sage Weil [Sun, 29 Mar 2020 15:28:15 +0000 (10:28 -0500)]
doc/dev/release-kickoff-checklist: quotes

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/thrash-old-clients/1-install/octopus
Sage Weil [Sun, 29 Mar 2020 14:39:21 +0000 (09:39 -0500)]
qa/suites/rados/thrash-old-clients/1-install/octopus

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/releases/pacific.yaml
Sage Weil [Sun, 29 Mar 2020 14:37:57 +0000 (09:37 -0500)]
qa/releases/pacific.yaml

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomds/cephfs_features: CEPHFS_CURRENT_RELEASE
Sage Weil [Sun, 29 Mar 2020 14:34:16 +0000 (09:34 -0500)]
mds/cephfs_features: CEPHFS_CURRENT_RELEASE

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/dev/release-kickoff-checklist: a few other items
Sage Weil [Sat, 28 Mar 2020 14:23:31 +0000 (09:23 -0500)]
doc/dev/release-kickoff-checklist: a few other items

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoosd: remove redundant check
Sage Weil [Sat, 28 Mar 2020 14:20:45 +0000 (09:20 -0500)]
osd: remove redundant check

This is already covered by the ceph_osd.cc can_upgrade_from() check.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/OSDMonitor: make pacific changes
Sage Weil [Sat, 28 Mar 2020 14:16:59 +0000 (09:16 -0500)]
mon/OSDMonitor: make pacific changes

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/mon_types: add mon pacific feature
Sage Weil [Sat, 28 Mar 2020 14:08:28 +0000 (09:08 -0500)]
mon/mon_types: add mon pacific feature

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoinclude/ceph_features: define SERVER_PACIFIC
Sage Weil [Sat, 28 Mar 2020 13:49:28 +0000 (08:49 -0500)]
include/ceph_features: define SERVER_PACIFIC

Reuse bit 20, which is available.

Declare it as gen 3 so that we | in SERVER_MIMIC (bits 57+28).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoinclude/ceph_features: fix whitespace
Sage Weil [Sat, 28 Mar 2020 13:41:10 +0000 (08:41 -0500)]
include/ceph_features: fix whitespace

Goofed this up in 47049407ad0422c0bceab4dd6e3374f02ef72409.  We only
want spaces if the same RETIRED bit isn't reused yet.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon: persistent INCOMPAT_PACIFIC item
Sage Weil [Thu, 26 Mar 2020 02:30:15 +0000 (21:30 -0500)]
mon: persistent INCOMPAT_PACIFIC item

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-volume: __release__ == pacific
Sage Weil [Thu, 26 Mar 2020 02:23:24 +0000 (21:23 -0500)]
ceph-volume: __release__ == pacific

We didn't do this for octopus...  :/

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoscript: update backport scripts for now-released octopus
Sage Weil [Thu, 26 Mar 2020 02:23:09 +0000 (21:23 -0500)]
script: update backport scripts for now-released octopus

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon: pacific release constants
Sage Weil [Thu, 26 Mar 2020 02:22:38 +0000 (21:22 -0500)]
common: pacific release constants

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/dev/release-kickoff-checklist
Sage Weil [Thu, 26 Mar 2020 02:22:15 +0000 (21:22 -0500)]
doc/dev/release-kickoff-checklist

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agosrc/ceph_release: pacific, 16, dev
Sage Weil [Thu, 26 Mar 2020 02:04:03 +0000 (21:04 -0500)]
src/ceph_release: pacific, 16, dev

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoCMakeLists: 16.0.0
Sage Weil [Thu, 26 Mar 2020 02:03:51 +0000 (21:03 -0500)]
CMakeLists: 16.0.0

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/telegraf: catch FileNotFoundError exception 34264/head
Kefu Chai [Wed, 8 Apr 2020 12:21:25 +0000 (20:21 +0800)]
mgr/telegraf: catch FileNotFoundError exception

in tasks/module_selftest.yaml, `TestModuleSelftest.test_telegraf()` is
called. but we fail to prepare a unix domain socket to which the telegraf
module can send stats. and telegraf module does not catch
FileNotFoundError exception, so the exception is populated to ceph-mgr
and is found by the test, hence the test is marked a failure whenever
telegraf is tested.

in this change,

* catch this exception, so it won't be caught by ceph-mgr
* whitelist the error message, so the test can pass

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/openssl_keys.py: sort cert configs before creating certs
Kefu Chai [Wed, 8 Apr 2020 11:22:06 +0000 (19:22 +0800)]
qa/tasks/openssl_keys.py: sort cert configs before creating certs

we cannot rely on the order in which items are arranged in a dict, the
order varies from version to another. in Python2, it happens to work,
and we can always have the self-signed cert added first. but in Python3,
it does not. and an exception is thrown
```
teuthology.exceptions.ConfigError: ssl: ca root not found for
certificate rgw.client.0
```

in this change, before creating certs, the settings are reordered so
that the self-signed ones are created first.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34398 from rzarzynski/wip-crimson-outdata-to-pglog
Kefu Chai [Wed, 8 Apr 2020 13:03:31 +0000 (21:03 +0800)]
Merge pull request #34398 from rzarzynski/wip-crimson-outdata-to-pglog

crimson/osd: record op's outdata and rval in pg log

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34466 from tchaikov/wip-cmake-get-git-version
Kefu Chai [Wed, 8 Apr 2020 12:29:08 +0000 (20:29 +0800)]
Merge pull request #34466 from tchaikov/wip-cmake-get-git-version

cmake: check $top_srcdir/.git directly

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agomgr/telegraf: catch FileNotFoundError exception 34468/head
Kefu Chai [Wed, 8 Apr 2020 12:21:25 +0000 (20:21 +0800)]
mgr/telegraf: catch FileNotFoundError exception

in tasks/module_selftest.yaml, `TestModuleSelftest.test_telegraf()` is
called. but we fail to prepare a unix domain socket to which the telegraf
module can send stats. and telegraf module does not catch
FileNotFoundError exception, so the exception is populated to ceph-mgr
and is found by the test, hence the test is marked a failure whenever
telegraf is tested.

in this change,

* catch this exception, so it won't be caught by ceph-mgr
* whitelist the error message, so the test can pass

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/volumes: Add a note about placement option in nfs cluster create 32297/head
Varsha Rao [Wed, 8 Apr 2020 06:13:57 +0000 (11:43 +0530)]
mgr/volumes: Add a note about placement option in nfs cluster create

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Remove unused typing module
Varsha Rao [Wed, 8 Apr 2020 06:09:29 +0000 (11:39 +0530)]
mgr/volumes: Remove unused typing module

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Make cluster id option mandatory in nfs create export
Varsha Rao [Mon, 6 Apr 2020 14:24:37 +0000 (19:54 +0530)]
mgr/volumes: Make cluster id option mandatory in nfs create export

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Update nfs cluster and export interface
Varsha Rao [Wed, 1 Apr 2020 16:01:26 +0000 (21:31 +0530)]
mgr/volumes: Update nfs cluster and export interface

Instead of prefixing 'fs' to the commands, type is added for easy extension to
create rgw exports.

$ ceph nfs cluster create <type=cephfs> [--size=1] <clusterid>
$ ceph nfs export create <type=cephfs> <fsname> <binding> [--readonly] [--path=/path/in/cephfs] [--attach=<clusterid>]

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agovstart: Update the nfs cluster create and export interface
Varsha Rao [Wed, 1 Apr 2020 15:34:58 +0000 (21:04 +0530)]
vstart: Update the nfs cluster create and export interface

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Remove GaneshaConf and NFSConfig class
Varsha Rao [Wed, 1 Apr 2020 11:18:30 +0000 (16:48 +0530)]
mgr/volumes: Remove GaneshaConf and NFSConfig class

NFSCluster and FSExport class replace GaneshaConf and NFSConfig class.

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Create multiple CephFS exports
Varsha Rao [Tue, 31 Mar 2020 11:48:03 +0000 (17:18 +0530)]
mgr/volumes: Create multiple CephFS exports

Using the following fs nfs interface multiple exports can be created:
ceph fs nfs export create <fsname> <binding> --readonly --path=<pathname> --attach=<clusterid>

Note: Binding is pseudo path.

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Move ganesha common config to vstart
Varsha Rao [Mon, 30 Mar 2020 10:17:15 +0000 (15:47 +0530)]
mgr/volumes: Move ganesha common config to vstart

This is a preparatoy patch before calling orchestrator for nfs cluster
deployment. All the ganesha config is moved to vstart. Keyring creation is also
taken care by vstart.

The volumes fs nfs cluster create interface does the following things:
1) Create a common recovery pool for all ganesha clusters. Each cluster will
   have their own namespace.
2) Create an empty rados conf object named 'conf-nfs' for saving all export
   urls.

Call to orch interface will be done in future patch.

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes/nfs: Fix mypy errors
Varsha Rao [Tue, 24 Mar 2020 18:56:56 +0000 (00:26 +0530)]
mgr/volumes/nfs: Fix mypy errors

This patch fixes the following mypy errors:
volumes/module.py:9: note: In module imported here,
volumes/__init__.py:2: note: ... from here:
volumes/fs/nfs.py: note: In member "validate_path" of class "CephFSFSal":
volumes/fs/nfs.py:80: error: Name 're' is not defined
volumes/fs/nfs.py: note: In member "create_path" of class "CephFSFSal":
volumes/fs/nfs.py:83: error: Name 'CephFS' is not defined
volumes/fs/nfs.py: note: In member "_persist_daemon_configuration" of class "GaneshaConf":
volumes/fs/nfs.py:259: error: Need type annotation for 'daemon_map' (hint: "daemon_map: Dict[<type>, <type>] = ...")
volumes/fs/nfs.py: note: In member "create_instance" of class "NFSConfig":
volumes/fs/nfs.py:386: error: Incompatible types in assignment (expression has type "GaneshaConf", variable has type "str")
volumes/fs/nfs.py: note: In member "create_export" of class "NFSConfig":
volumes/fs/nfs.py:389: error: "str" has no attribute "create_export"
volumes/fs/nfs.py: note: In member "delete_export" of class "NFSConfig":
volumes/fs/nfs.py:404: error: "str" has no attribute "has_export"
volumes/fs/nfs.py:407: error: "str" has no attribute "remove_export"
volumes/fs/nfs.py:408: error: "str" has no attribute "reload_daemons"
volumes/__init__.py:2: note: In module imported here:
volumes/module.py: note: In member "_cmd_fs_nfs_export_create" of class "Module":
volumes/module.py:406: error: "str" has no attribute "check_fsal_valid"
volumes/module.py:407: error: "str" has no attribute "create_instance"
volumes/module.py:408: error: "str" has no attribute "create_export"
volumes/module.py: note: In member "_cmd_fs_nfs_export_delete" of class "Module":
volumes/module.py:412: error: "str" has no attribute "delete_export"
volumes/module.py: note: In member "_cmd_fs_nfs_cluster_create" of class "Module":
volumes/module.py:415: error: Incompatible types in assignment (expression has type "NFSConfig", variable has type "str")
volumes/module.py:416: error: "str" has no attribute "create_nfs_cluster"

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes/nfs: Update the export class to remove unecessary config options
Varsha Rao [Tue, 24 Mar 2020 18:13:40 +0000 (23:43 +0530)]
mgr/volumes/nfs: Update the export class to remove unecessary config options

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Remove dependency on dashboard ganesha module
Varsha Rao [Tue, 24 Mar 2020 11:13:09 +0000 (16:43 +0530)]
mgr/volumes: Remove dependency on dashboard ganesha module

Instead of importing ganesha module, necessary classes are directly used in
volumes nfs module.

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agovstart: Use random port instead of default Ganesha port
Varsha Rao [Tue, 24 Mar 2020 09:56:51 +0000 (15:26 +0530)]
vstart: Use random port instead of default Ganesha port

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agovstart: Use "NFS" instead "GANESHA" for starting nfs ganesha clusters
Varsha Rao [Fri, 6 Mar 2020 20:33:51 +0000 (02:03 +0530)]
vstart: Use "NFS" instead "GANESHA" for starting nfs ganesha clusters

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/volumes: Improve readability of ganesha common config
Varsha Rao [Fri, 6 Mar 2020 20:19:30 +0000 (01:49 +0530)]
mgr/volumes: Improve readability of ganesha common config

Signed-off-by: Varsha Rao <varao@redhat.com>