]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
5 years agoadmin/build-doc: add dot to the check list
Kefu Chai [Sun, 15 Mar 2020 03:36:02 +0000 (11:36 +0800)]
admin/build-doc: add dot to the check list

also print the missing list in stderr

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoadmin/build-doc: add optional "_" prefix before function names to match
Kefu Chai [Sun, 15 Mar 2020 03:08:47 +0000 (11:08 +0800)]
admin/build-doc: add optional "_" prefix before function names to match

as compilers targeting ELF does not add the leading "_" to symbol names,
while clang on OSX always do this.

and remove the underscore from the symbol name when generating the
function name, as the compiler will add it back for us.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoadmin/build-doc: drop --no-as-needed on Darwin
Kefu Chai [Sun, 15 Mar 2020 02:42:03 +0000 (10:42 +0800)]
admin/build-doc: drop --no-as-needed on Darwin

which is not supported by ld on OSX.

also, pass the rpath argument as a new command line argument instead
using -rpath=foo, which is not supported by llvm linker.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoadmin/install-doc: error out if missing deps
Kefu Chai [Sun, 15 Mar 2020 02:40:16 +0000 (10:40 +0800)]
admin/install-doc: error out if missing deps

we should not `set -e` at the very beginning of this script, which fails
the script if any dependency is missing without printing out error
messages.

in this change `set -e` is removed. and refactor the code to print the
error message.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind: move linker flags out of "libraries"
Kefu Chai [Sun, 15 Mar 2020 02:47:44 +0000 (10:47 +0800)]
pybind: move linker flags out of "libraries"

sometimes, `distutils.sysconfig.get_config_vars('LIBS')` returns flags
not starting with `-l`, and hence we should not allow
`setuptools.extension.Extension` to rebuild the `-l` options from those
flags, otherwise the linker just fails as the `-l-flags_for_linker` will
be passed to the linker.

in this change, those linker flags are passed directly to linker.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/cephfs: support MacOS
Kefu Chai [Sun, 15 Mar 2020 02:46:04 +0000 (10:46 +0800)]
pybind/cephfs: support MacOS

like FreeBSD, dentry on MacOS does not have `d_off` field

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33653 from TRYTOBE8TME/wip-rgw-sts-doc-correction
Casey Bodley [Fri, 13 Mar 2020 13:26:49 +0000 (09:26 -0400)]
Merge pull request #33653 from TRYTOBE8TME/wip-rgw-sts-doc-correction

rgw: STS Lite documentation correction

Reviewed-by: Pritha Srivastava <prsivas@redhat.com>
5 years agoMerge pull request #33921 from tchaikov/wip-cmake-node-gyp
Kefu Chai [Fri, 13 Mar 2020 13:01:57 +0000 (21:01 +0800)]
Merge pull request #33921 from tchaikov/wip-cmake-node-gyp

cmake: use specified python for running node-gyp

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge remote-tracking branch 'gh/octopus'
Sage Weil [Fri, 13 Mar 2020 11:55:55 +0000 (06:55 -0500)]
Merge remote-tracking branch 'gh/octopus'

5 years agoMerge pull request #33918 from tchaikov/wip-seastar
Kefu Chai [Fri, 13 Mar 2020 08:30:38 +0000 (16:30 +0800)]
Merge pull request #33918 from tchaikov/wip-seastar

seastar: pickup change to always enable smp poller

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge PR #33930 into octopus
Sage Weil [Fri, 13 Mar 2020 02:56:20 +0000 (21:56 -0500)]
Merge PR #33930 into octopus

* refs/pull/33930/head:
mgr/cephadm: implement pause/resume to suspect non-monitoring background work
mgr/orch: add pause/resume hooks

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33868 into octopus
Sage Weil [Fri, 13 Mar 2020 02:55:52 +0000 (21:55 -0500)]
Merge PR #33868 into octopus

* refs/pull/33868/head:
mgr/rook: implement remove_daemons()
mgr/rook: fix mds/fs create/apply/update
mgr/rook: use ceph_daemon_id label consistently
mgr/rook: show filesystems in 'orch ls'
mgr/orch: 'age' -> 'ago' in 'orch ls' output
mgr/rook: initial pass at 'orch ls'
mgr/rook: include timestamps in 'orch ps'
mgr/orch: shorten container_id (hash) in cephadm, not orch ps
mgr/rook: include container_image_name in 'orch ps'
mgr/rook: fix list_daemons host arg

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33932 into octopus
Sage Weil [Fri, 13 Mar 2020 02:55:39 +0000 (21:55 -0500)]
Merge PR #33932 into octopus

* refs/pull/33932/head:
cephadm: fix datetime regexp to capture at most 6 digits

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoseastar: pickup change to always enable smp poller
Kefu Chai [Thu, 12 Mar 2020 13:03:10 +0000 (21:03 +0800)]
seastar: pickup change to always enable smp poller

this is the first commit which is in sync with upstream without any
addition change in our branch.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/mgr: include necessary header
Kefu Chai [Thu, 12 Mar 2020 15:02:20 +0000 (23:02 +0800)]
crimson/mgr: include necessary header

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33900 from dillaman/wip-44459
Jason Dillaman [Thu, 12 Mar 2020 23:22:22 +0000 (19:22 -0400)]
Merge pull request #33900 from dillaman/wip-44459

qa/suites/rbd: removed OpenStack tempest test cases

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33840 from trociny/wip-schedule-optimize-scan
Jason Dillaman [Thu, 12 Mar 2020 23:21:28 +0000 (19:21 -0400)]
Merge pull request #33840 from trociny/wip-schedule-optimize-scan

mgr/rbd_support: don't scan pools that don't have schedules

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33914 into octopus
Sage Weil [Thu, 12 Mar 2020 22:04:50 +0000 (17:04 -0500)]
Merge PR #33914 into octopus

* refs/pull/33914/head:
mgr/orch: Cleanup python imports of the interface
mgr/orch: Properly handle NotImplementedError
pybind/mgr: Rm PersistentStoreDict

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: implement remove_daemons()
Sage Weil [Thu, 12 Mar 2020 22:00:35 +0000 (18:00 -0400)]
mgr/rook: implement remove_daemons()

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: fix mds/fs create/apply/update
Sage Weil [Thu, 12 Mar 2020 19:29:14 +0000 (15:29 -0400)]
mgr/rook: fix mds/fs create/apply/update

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: use ceph_daemon_id label consistently
Sage Weil [Thu, 12 Mar 2020 19:27:59 +0000 (15:27 -0400)]
mgr/rook: use ceph_daemon_id label consistently

In particular, for mds's, it's $fsname-$rank for mds.$fsname-$rank,
which is what we want.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: show filesystems in 'orch ls'
Sage Weil [Thu, 12 Mar 2020 18:41:37 +0000 (14:41 -0400)]
mgr/rook: show filesystems in 'orch ls'

The count vs size discrepancy is weird since rook things in terms of
ranks (*2 if standby) vs just a count.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: 'age' -> 'ago' in 'orch ls' output
Sage Weil [Wed, 11 Mar 2020 21:51:10 +0000 (17:51 -0400)]
mgr/orch: 'age' -> 'ago' in 'orch ls' output

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: initial pass at 'orch ls'
Sage Weil [Wed, 11 Mar 2020 21:50:53 +0000 (17:50 -0400)]
mgr/rook: initial pass at 'orch ls'

This doesn't cover mds.* or rgw.* yet.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: include timestamps in 'orch ps'
Sage Weil [Tue, 10 Mar 2020 23:07:59 +0000 (19:07 -0400)]
mgr/rook: include timestamps in 'orch ps'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: shorten container_id (hash) in cephadm, not orch ps
Sage Weil [Tue, 10 Mar 2020 22:56:30 +0000 (18:56 -0400)]
mgr/orch: shorten container_id (hash) in cephadm, not orch ps

This lets us present a longer, human-readable id for rook.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: include container_image_name in 'orch ps'
Sage Weil [Tue, 10 Mar 2020 22:53:09 +0000 (18:53 -0400)]
mgr/rook: include container_image_name in 'orch ps'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/rook: fix list_daemons host arg
Sage Weil [Tue, 10 Mar 2020 19:55:59 +0000 (15:55 -0400)]
mgr/rook: fix list_daemons host arg

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: fix datetime regexp to capture at most 6 digits
Michael Fritch [Thu, 12 Mar 2020 19:33:11 +0000 (13:33 -0600)]
cephadm: fix datetime regexp to capture at most 6 digits

trailing `0` digits are not shown in the precision

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #33821 from votdev/issue_43446_bucket_lock
Lenz Grimmer [Thu, 12 Mar 2020 19:26:32 +0000 (20:26 +0100)]
Merge pull request #33821 from votdev/issue_43446_bucket_lock

mgr/dashboard: Create bucket with x-amz-bucket-object-lock-enabled

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #31997 from bk201/wip-43062
Lenz Grimmer [Thu, 12 Mar 2020 19:24:02 +0000 (20:24 +0100)]
Merge pull request #31997 from bk201/wip-43062

mgr/dashboard: support removing OSDs in OSDs page

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #33920 from LenzGr/update-404-image
Lenz Grimmer [Thu, 12 Mar 2020 19:12:45 +0000 (20:12 +0100)]
Merge pull request #33920 from LenzGr/update-404-image

mgr/dashboard: Updated octopus image on 404 page

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/cephadm: implement pause/resume to suspect non-monitoring background work
Sage Weil [Thu, 12 Mar 2020 18:13:11 +0000 (13:13 -0500)]
mgr/cephadm: implement pause/resume to suspect non-monitoring background work

If the user does 'orch pause', suspend all background work that makes
actual changes.

Continue to do read-only operations, like checking host connectivity
and scraping daemon and device status.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33858 from tspmelo/wip-use-cd-modal
Laura Paduano [Thu, 12 Mar 2020 18:12:06 +0000 (19:12 +0100)]
Merge pull request #33858 from tspmelo/wip-use-cd-modal

mgr/dashboard: Use ModalComponent in all modals

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agomgr/orch: add pause/resume hooks
Sage Weil [Thu, 12 Mar 2020 17:53:50 +0000 (12:53 -0500)]
mgr/orch: add pause/resume hooks

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33926 into octopus
Sage Weil [Thu, 12 Mar 2020 18:01:56 +0000 (13:01 -0500)]
Merge PR #33926 into octopus

* refs/pull/33926/head:
python: fixate mypy requirement to mypy==0.770

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33874 into octopus
Sage Weil [Thu, 12 Mar 2020 17:34:35 +0000 (12:34 -0500)]
Merge PR #33874 into octopus

* refs/pull/33874/head:
qa/suites/powercycle: install build deps for building xfstest

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoMerge PR #33813 into octopus
Sage Weil [Thu, 12 Mar 2020 17:34:07 +0000 (12:34 -0500)]
Merge PR #33813 into octopus

* refs/pull/33813/head:
osd/PGStateUtils: initialize NamedState::enter_time.
osd/PGStatueUtils: remove unused member variable

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33814 into octopus
Sage Weil [Thu, 12 Mar 2020 17:33:56 +0000 (12:33 -0500)]
Merge PR #33814 into octopus

* refs/pull/33814/head:
osd/OSDMap: stop encoding osd_state with >8 bits wide states only for old client

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: yanjun <yan.jun8@zte.com.cn>
5 years agoMerge PR #33064 into octopus
Sage Weil [Thu, 12 Mar 2020 17:29:14 +0000 (12:29 -0500)]
Merge PR #33064 into octopus

* refs/pull/33064/head:
cephadm: add version to `command_ls` output
cephadm: add type checking to `update_filewalld`
cephadm: allow prepare-host to start an enabled service
cephadm: add type checking for `check_host` and `prepare_host`
cephadm: generalize logic for checking and enabling units
cephadm: add 'CEPH_CONF' to the NFS ganesha container envs
cephadm: trim nfs.json sample
qa/workunits/cephadm/test_cephadm.sh: systemctl stop nfs-server
qa/workunits/cephadm/test_cephadm.sh: make pgs available
cephadm: add some log lines
cephadm: check port in use
cephadm: add/remove nfs ganesha grace
cephadm: update firewalld with nfs service
qa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test
cephadm: add ganasha.conf
cephadm: add NFSGanesha deployment type
cephadm: consolidate list of supported daemons
cephadm: use keyword instead of positional args

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33855 into octopus
Sage Weil [Thu, 12 Mar 2020 17:28:43 +0000 (12:28 -0500)]
Merge PR #33855 into octopus

* refs/pull/33855/head:
mgr/cephadm: reconfigure ceph daemons when monmap changes

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #33829 into octopus
Sage Weil [Thu, 12 Mar 2020 16:33:14 +0000 (11:33 -0500)]
Merge PR #33829 into octopus

* refs/pull/33829/head:
cephadm: log when we infer the image
cephadm: Avoid `inspect` call by using ceph label
cephadm: Infer ceph image

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33919 from LenzGr/octopus-documentation
Lenz Grimmer [Thu, 12 Mar 2020 16:28:34 +0000 (17:28 +0100)]
Merge pull request #33919 from LenzGr/octopus-documentation

documentation: Updated Dashboard Features, improved flow

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #33887 from rhcs-dashboard/39714-decimal-places
Lenz Grimmer [Thu, 12 Mar 2020 16:26:20 +0000 (17:26 +0100)]
Merge pull request #33887 from rhcs-dashboard/39714-decimal-places

mgr/dashboard: Pool read/write OPS shows too many decimal places

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #33871 into octopus
Sage Weil [Thu, 12 Mar 2020 16:17:53 +0000 (11:17 -0500)]
Merge PR #33871 into octopus

* refs/pull/33871/head:
qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoMerge PR #33890 into octopus
Sage Weil [Thu, 12 Mar 2020 15:40:43 +0000 (10:40 -0500)]
Merge PR #33890 into octopus

* refs/pull/33890/head:
doc/install: rethink docs install page (similar to PR#33613)
doc/install: Rethink doc/install

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agopython: fixate mypy requirement to mypy==0.770
Sebastian Wagner [Thu, 12 Mar 2020 15:27:45 +0000 (16:27 +0100)]
python: fixate mypy requirement to mypy==0.770

I don't like suprises when upstream publishes a new mypy version.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: Append "Modal" to all modal components names
Tiago Melo [Tue, 10 Mar 2020 13:22:49 +0000 (12:22 -0100)]
mgr/dashboard: Append "Modal" to all modal components names

Fixes: https://tracker.ceph.com/issues/44547
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Use ModalComponent in all modals
Tiago Melo [Tue, 10 Mar 2020 11:33:45 +0000 (10:33 -0100)]
mgr/dashboard: Use ModalComponent in all modals

Fixes: https://tracker.ceph.com/issues/44547
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #33902 from dillaman/wip-test-rbd-integration
Mykola Golub [Thu, 12 Mar 2020 15:01:07 +0000 (17:01 +0200)]
Merge pull request #33902 from dillaman/wip-test-rbd-integration

test/cli-integration: fixed spacing issue for RBD formatted tables

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agomgr/cephadm: reconfigure ceph daemons when monmap changes
Sage Weil [Tue, 10 Mar 2020 14:01:15 +0000 (09:01 -0500)]
mgr/cephadm: reconfigure ceph daemons when monmap changes

This keeps ceph.conf fresh.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33898 from dillaman/wip-44567
Mykola Golub [Thu, 12 Mar 2020 14:52:56 +0000 (16:52 +0200)]
Merge pull request #33898 from dillaman/wip-44567

qa/workunits/rbd: wait for nbd map to close after unmap

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #33906 from tchaikov/wip-no-req-for-python2
Kefu Chai [Thu, 12 Mar 2020 14:46:25 +0000 (22:46 +0800)]
Merge pull request #33906 from tchaikov/wip-no-req-for-python2

mgr,python-common: drop modules for python2 in requirements.txt

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agocmake: use specified python for running node-gyp
Kefu Chai [Thu, 12 Mar 2020 13:51:55 +0000 (21:51 +0800)]
cmake: use specified python for running node-gyp

to make sure node-gyp is able to find a compatible python3

see also
https://github.com/nodejs/node-gyp#configuring-python-dependency

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocephadm: add version to `command_ls` output
Michael Fritch [Thu, 5 Mar 2020 23:00:43 +0000 (16:00 -0700)]
cephadm: add version to `command_ls` output

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add type checking to `update_filewalld`
Michael Fritch [Wed, 4 Mar 2020 22:30:03 +0000 (15:30 -0700)]
cephadm: add type checking to `update_filewalld`

fixes mypy errors:
cephadm:1682: error: Incompatible types in assignment (expression has type "str", variable has type "int")
cephadm:1683: error: List item 3 has incompatible type "int"; expected "str"
cephadm:1686: error: List item 3 has incompatible type "int"; expected "str"
Found 3 errors in 1 file (checked 1 source file)

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: allow prepare-host to start an enabled service
Michael Fritch [Wed, 4 Mar 2020 21:19:35 +0000 (14:19 -0700)]
cephadm: allow prepare-host to start an enabled service

the service might be enabled, but not running

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add type checking for `check_host` and `prepare_host`
Michael Fritch [Wed, 4 Mar 2020 20:21:58 +0000 (13:21 -0700)]
cephadm: add type checking for `check_host` and `prepare_host`

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: generalize logic for checking and enabling units
Michael Fritch [Wed, 4 Mar 2020 19:43:21 +0000 (12:43 -0700)]
cephadm: generalize logic for checking and enabling units

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add 'CEPH_CONF' to the NFS ganesha container envs
Michael Fritch [Tue, 3 Mar 2020 21:27:05 +0000 (14:27 -0700)]
cephadm: add 'CEPH_CONF' to the NFS ganesha container envs

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: trim nfs.json sample
Michael Fritch [Tue, 3 Mar 2020 21:06:54 +0000 (14:06 -0700)]
cephadm: trim nfs.json sample

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

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: systemctl stop nfs-server
Michael Fritch [Fri, 28 Feb 2020 16:14:41 +0000 (09:14 -0700)]
qa/workunits/cephadm/test_cephadm.sh: systemctl stop nfs-server

stop any running nfs servers before attempting a deploy of nfs-ganesha

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: make pgs available
Michael Fritch [Sat, 22 Feb 2020 06:21:03 +0000 (23:21 -0700)]
qa/workunits/cephadm/test_cephadm.sh: make pgs available

allow rados obj. create to succeed during a single node test

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add some log lines
Michael Fritch [Tue, 18 Feb 2020 21:34:12 +0000 (14:34 -0700)]
cephadm: add some log lines

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: check port in use
Michael Fritch [Mon, 3 Feb 2020 16:30:45 +0000 (09:30 -0700)]
cephadm: check port in use

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add/remove nfs ganesha grace
Michael Fritch [Mon, 3 Feb 2020 04:10:25 +0000 (21:10 -0700)]
cephadm: add/remove nfs ganesha grace

container unit pre-start/post-stop for ganesha grace db

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: update firewalld with nfs service
Michael Fritch [Mon, 3 Feb 2020 02:36:16 +0000 (19:36 -0700)]
cephadm: update firewalld with nfs service

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test
Michael Fritch [Sun, 2 Feb 2020 06:22:20 +0000 (23:22 -0700)]
qa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add ganasha.conf
Michael Fritch [Sun, 2 Feb 2020 02:30:33 +0000 (19:30 -0700)]
cephadm: add ganasha.conf

also allows for any arbitrary nfs conf to be deployed by adding items to
the `files` dict of the config-json

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: add NFSGanesha deployment type
Michael Fritch [Tue, 28 Jan 2020 22:47:41 +0000 (15:47 -0700)]
cephadm: add NFSGanesha deployment type

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: consolidate list of supported daemons
Michael Fritch [Tue, 28 Jan 2020 23:19:38 +0000 (16:19 -0700)]
cephadm: consolidate list of supported daemons

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: use keyword instead of positional args
Michael Fritch [Tue, 28 Jan 2020 22:35:51 +0000 (15:35 -0700)]
cephadm: use keyword instead of positional args

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/rbd_support: fix recursive non-global level schedule listing
Mykola Golub [Thu, 12 Mar 2020 13:40:25 +0000 (13:40 +0000)]
mgr/rbd_support: fix recursive non-global level schedule listing

For the case when the non-global level does not have a schedule
and a higher level is used as the parent, it wrongly listed
schedules from all branches under the parent, instead of only the
interested one.

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agomgr/dashboard: Updated octopus image on 404 page
Lenz Grimmer [Thu, 12 Mar 2020 13:37:30 +0000 (14:37 +0100)]
mgr/dashboard: Updated octopus image on 404 page

Replaced the image of the Nautilus octopus with another octopus
in preparation for the "Octopus" release.

The image was taken from Museums Victoria
(https://collections.museumvictoria.com.au/species/8696) and is
licensed under the Creative Commons "Attribution 4.0 International"
(CC BY 4.0) license.

Deleted older, now obsolete images from the assets directory.

Fixes: https://tracker.ceph.com/issues/43581
Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agodoc: Improved Dashboard installation workflow
Lenz Grimmer [Thu, 12 Mar 2020 13:21:11 +0000 (14:21 +0100)]
doc: Improved Dashboard installation workflow

Moved the "Accessing the Dashboard" section in front of
the paragraphs that talk about enabling additional services.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agodoc: Updated dashboard feature overview for Octopus
Lenz Grimmer [Thu, 12 Mar 2020 13:19:52 +0000 (14:19 +0100)]
doc: Updated dashboard feature overview for Octopus

Added new Dashboard features added for the Octopus
release.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agomgr/orch: Cleanup python imports of the interface
Sebastian Wagner [Thu, 12 Mar 2020 12:03:56 +0000 (13:03 +0100)]
mgr/orch: Cleanup python imports of the interface

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/orch: Properly handle NotImplementedError
Sebastian Wagner [Thu, 12 Mar 2020 11:58:49 +0000 (12:58 +0100)]
mgr/orch: Properly handle NotImplementedError

They are masked as RuntimeError by the mgr.

Fixes: https://tracker.ceph.com/issues/44569
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agopybind/mgr: Rm PersistentStoreDict
Sebastian Wagner [Thu, 12 Mar 2020 11:50:02 +0000 (12:50 +0100)]
pybind/mgr: Rm PersistentStoreDict

`PersistentStoreDict` works great, except that is
too expensive to be used.

In addition, no one makes use of it.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agocephadm: log when we infer the image
Sage Weil [Thu, 12 Mar 2020 12:42:43 +0000 (07:42 -0500)]
cephadm: log when we infer the image

This is similar to how we log when we infer the fsid.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: Avoid `inspect` call by using ceph label
Ricardo Marques [Mon, 9 Mar 2020 22:24:20 +0000 (22:24 +0000)]
cephadm: Avoid `inspect` call by using ceph label

Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agocephadm: Infer ceph image
Ricardo Marques [Mon, 9 Mar 2020 18:13:41 +0000 (18:13 +0000)]
cephadm: Infer ceph image

Fixes: https://tracker.ceph.com/issues/44440
Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge PR #33897 into octopus
Sage Weil [Thu, 12 Mar 2020 12:37:10 +0000 (07:37 -0500)]
Merge PR #33897 into octopus

* refs/pull/33897/head:
mgr/PyModule: initialize options on standby class too
Revert "pybind/mgr/mgr_module: fix standby module logging options"

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoosd/PGStateUtils: initialize NamedState::enter_time.
Jianpeng Ma [Tue, 10 Mar 2020 04:01:25 +0000 (12:01 +0800)]
osd/PGStateUtils: initialize NamedState::enter_time.

This bug introduce by d96c907.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
5 years agoosd/PGStatueUtils: remove unused member variable
Jianpeng Ma [Mon, 9 Mar 2020 02:27:49 +0000 (10:27 +0800)]
osd/PGStatueUtils: remove unused member variable

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
5 years agoqa/workunits/rbd: wait for schedule status updated
Mykola Golub [Thu, 12 Mar 2020 11:43:04 +0000 (11:43 +0000)]
qa/workunits/rbd: wait for schedule status updated

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge PR #33870 into octopus
Sage Weil [Thu, 12 Mar 2020 11:37:19 +0000 (06:37 -0500)]
Merge PR #33870 into octopus

* refs/pull/33870/head:
mgr/cephadm: fix redeploy for the crash daemon
cephadm: prefer config/keyring args
cephadm: raise Error when no config/keyring
cephadm: consolidate logic for reading `config-json`
cephadm: merge `--config-and-keyring` and `--config-json` args

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #33842 from s1eke/master
Kefu Chai [Thu, 12 Mar 2020 11:06:20 +0000 (19:06 +0800)]
Merge pull request #33842 from s1eke/master

doc: Fix link errors

Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/dashboard: Create bucket with x-amz-bucket-object-lock-enabled
Volker Theile [Tue, 10 Mar 2020 11:38:20 +0000 (12:38 +0100)]
mgr/dashboard: Create bucket with x-amz-bucket-object-lock-enabled

Fixes: https://tracker.ceph.com/issues/43446
Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #33831 from dillaman/wip-44396
Mykola Golub [Thu, 12 Mar 2020 09:53:04 +0000 (11:53 +0200)]
Merge pull request #33831 from dillaman/wip-44396

rbd-mirror: prevent I/O modifications against a non-primary image

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #32419 from rhcs-dashboard/fix-43419-master
Lenz Grimmer [Thu, 12 Mar 2020 09:17:56 +0000 (10:17 +0100)]
Merge pull request #32419 from rhcs-dashboard/fix-43419-master

mgr/dashboard: add feature toggle for NFS and fix feature toggles regression

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agodoc: Fix three link errors about mount cephfs
Sean Fang [Tue, 10 Mar 2020 09:05:14 +0000 (17:05 +0800)]
doc: Fix three link errors about mount cephfs

Some links about mount cephfs did not jump to the right place.

Signed-off-by: Sean Fang <silence.boy@live.cn>
5 years agomgr,python-common: drop modules for python2 in requirements.txt
Kefu Chai [Thu, 12 Mar 2020 06:47:15 +0000 (14:47 +0800)]
mgr,python-common: drop modules for python2 in requirements.txt

we don't support python2 anymore, so no need to install them for
python2 anymore.

also, this helps to silence the messages from pip like

```
Ignoring pytest: markers 'python_version < "3.5"' don't match your environment
Ignoring mock: markers 'python_version < "3.3"' don't match your environment
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/PyModule: initialize options on standby class too
Sage Weil [Wed, 11 Mar 2020 17:14:59 +0000 (12:14 -0500)]
mgr/PyModule: initialize options on standby class too

Create a separate callback (_register_options) and call that on both
the regular MgrModule and MgrStandbyModule.

Fixes: https://tracker.ceph.com/issues/44562
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33817 into octopus
Sage Weil [Thu, 12 Mar 2020 03:39:32 +0000 (22:39 -0500)]
Merge PR #33817 into octopus

* refs/pull/33817/head:
mgr/dashboard: Adapt tests to new DriveGroupSpec
fixup mgr/test_orchestrator: validate drive group matches anything.
mgr/orch: CLI: No Tracebacks for ServiceSpecValidationError
mgr/test_orchestrator: validate drive group matches anything.
python-common: don't run flake8 on tests.
python-common: Add support for legacy serialization format for Drive Groups
doc: Move Move ServiceSpec to python-common
python-common: Add `host_pattern` to `PlacementSpec.from_string()`
cephadm: add host_pattern to supported scheduling
python-common: Joined ServiceSpec and DriveGroupSpec from_json()
python-common: Make DriveGroupSpec a sub type of ServiceSpec
pybind/mgr: Move ServiceSpec to python-common: Fix imports
python-common, orch: Move ServiceSpec to python-common: Fix imports
python-common, orch: Move ServiceSpec tests to python-common
python-common: Move ServiceSpec to python-common: fix linting
python-common, orch: Move ServiceSpec (+deps) to python-common

Reviewed-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge PR #33895 into octopus
Sage Weil [Thu, 12 Mar 2020 03:39:15 +0000 (22:39 -0500)]
Merge PR #33895 into octopus

* refs/pull/33895/head:
cephadm: update unit.* atomically

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #32675 from rosinL/openssl-evp
Kefu Chai [Thu, 12 Mar 2020 03:12:47 +0000 (11:12 +0800)]
Merge pull request #32675 from rosinL/openssl-evp

crypto/openssl: update to use evp functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agocephadm: update unit.* atomically
Sage Weil [Fri, 6 Mar 2020 23:43:33 +0000 (17:43 -0600)]
cephadm: update unit.* atomically

Some of these are run as bash scripts, which means that updating them
can lead to the running bash picking up at a weird position mid-script
when it goes to the next command.  This produces weird errors like

bash[9321]: /var/lib/ceph/f1758250-639e-11ea-9a42-001a4aab830c/mon.c/unit.run: line 2: -to-stderr=true: command not found

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agotest/cli-integration: fixed spacing issue for RBD formatted tables
Jason Dillaman [Wed, 11 Mar 2020 23:00:17 +0000 (19:00 -0400)]
test/cli-integration: fixed spacing issue for RBD formatted tables

The tables now use two spaces between columns instead of one.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #33885 into master
Sage Weil [Wed, 11 Mar 2020 22:38:59 +0000 (17:38 -0500)]
Merge PR #33885 into master

* refs/pull/33885/head:
Merge pull request #33848 from mchangir/octopus-tests-remove-suprious-whitespace
Merge PR #33746 into octopus
Merge PR #33830 into octopus
Merge PR #33732 into octopus
Merge PR #33620 into octopus
Merge pull request #33876 from tchaikov/octopus-cephadm-mypy
cephadm: add "assert foo is not None" for mypy check
Merge pull request #33067 from tspmelo/wip-rbd-delete-with-snapshot
cephadm: add grafana adopt
Merge PR #33771 into octopus
Merge PR #33850 into octopus
Merge PR #33853 into octopus
Merge PR #33857 into octopus
Merge PR #32990 into octopus
Merge PR #33713 into octopus
Merge PR #33838 into octopus
qa/tasks/cephadm: no default mon|mgr|crash service specs
qa/suites/rados/cephadm/upgrade: upgrade start point that supports the no-spec option
Merge PR #33832 into octopus
cephadm: bootstrap: wait for mgr to restart after enabling a module
mgr: add 'mgr_status' tell command
Merge pull request #33839 from rhcs-dashboard/44538-fix-rgw-grafana-get-put-latencies
Merge pull request #33743 from votdev/issue_43869_fix_qa_test
cephadm: create initial mon and mgr service specs too
cephadm: no need to pregenerate a crash key for the bootstrap host
mgr/cephadm: do not complain when we don't have enough hosts
mgr/cephadm: remove orphan daemons
mgr/cephadm: report size=0 for fabricated ServiceDescription
mgr/cephadm: safety check to prevent removing all mon|mgr daemons
mgr/cephadm: prevent scaling mon|mgr below count=1
mgr/cephadm: do not remove daemons from remove_service
Merge pull request #33805 from tchaikov/wip-44500
spec: Podman (temporarily) requires apparmor-abstractions on suse
mgr/cephadm: Make sure we don't co-locate the same daemon
monitoring: fix RGW grafana chart 'Average GET/PUT Latencies'
tests: remove spurious whitespace
mgr/cephadm: fix service list filtering
Merge PR #33825 into octopus
Merge PR #33811 into octopus
Revert "Merge pull request #33673 from cbodley/wip-denc-enum"
mgr/cephadm: fix upgrade order
Merge PR #33801 into octopus
Merge PR #33822 into octopus
cephadm: bootstrap: tolerate error return from -h
Merge PR #33809 into octopus
Merge PR #32678 into octopus
cephadm: use `sh` instead of `bash` during enter
ceph.in: only shut down rados on clean exit
common/ceph_timer: Pass reference to waited time on stack
common/ceph_timer: Add test
common/ceph_timer: Use unique_function, allowing noncopyable events
common/ceph_timer: Couple cleanups
common/ceph_timer: Fix namespaces
common/ceph_timer: Add missing includes
common/ceph_timer.h: Don't indent contents of a namespace
mgr/dashboard: Crush rule modal
mgr/dashboard: Preserve rule selection on pool type change
mgr/dashboard: Crush rule is only send during replicated pool creation
mgr/dashboard: Explicit returns in pool form
mgr/dashboard: Removes fork join in pool form
mgr/dashboard: Hide ECP actions during ec pool edit
mgr/dashboard: Pool form erasure/replicated boolean
mgr/dashboard: Change pool info API endpoint
mgr/dashboard: Moves ECP info endpoint to UI-API
mgr/cephadm: add _remove_osds_bg back to main loop
mgr/cephadm/osd: update removal report immediately
qa/tasks/ceph_manager: use StringIO for capturing COT output
qa/standalone/scrub/osd-scrub-repair: force osdmap prop to osds
qa/standalone/scrub/osd-scrub-test: wait longer for update
qa/tasks/ceph_manager: capture stderr for COT
qa/suites/rados/ceph: drop opensuse for now
mon/MonClient: send logs to mon on separate schedule than pings
mgr/dashboard: Fix missing ImageSpec usage
mgr/dashboard: Allow removing RBD with snapshots
mgr/dashboard: Refactor and cleanup tasks.mgr.dashboard.test_user
mgr/dashboard: support multiple DriveGroups when creating OSDs
mon/MonClient: send logs to mon even if we have no keelalive2
cephadm: flag dashboard user to change password

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