]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agorbd-mirror: peer_ping should send the local fsid to the remote 31950/head
Jason Dillaman [Mon, 2 Dec 2019 20:45:04 +0000 (15:45 -0500)]
rbd-mirror: peer_ping should send the local fsid to the remote

It was previously incorrectly sending the remote cluster's
fsid to the remote cluster.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #31780 into master
Patrick Donnelly [Mon, 25 Nov 2019 16:49:43 +0000 (08:49 -0800)]
Merge PR #31780 into master

* refs/pull/31780/head:
mgr/volumes: remove unsed variable

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31824 into master
Sage Weil [Mon, 25 Nov 2019 16:28:20 +0000 (10:28 -0600)]
Merge PR #31824 into master

* refs/pull/31824/head:
cls/rbd: sanitize the mirror image status peer address after reading from disk

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agomgr/dashboard: Update translations (#31435)
Lenz Grimmer [Mon, 25 Nov 2019 16:02:13 +0000 (16:02 +0000)]
mgr/dashboard: Update translations (#31435)

mgr/dashboard: Update translations

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge PR #31677 into master
Sage Weil [Mon, 25 Nov 2019 14:54:45 +0000 (08:54 -0600)]
Merge PR #31677 into master

* refs/pull/31677/head:
qa/standalone/ceph-helpers.sh: remove osd down check
qa/standalone/ceph-helpers.sh: destroy_osd: mark osd down
osd: add osd_fast_shutdown option (default true)

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #31823 into master
Sage Weil [Mon, 25 Nov 2019 14:12:41 +0000 (08:12 -0600)]
Merge PR #31823 into master

* refs/pull/31823/head:
ceph-daemon: fix logrotate su line

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31835 into master
Sage Weil [Mon, 25 Nov 2019 14:07:53 +0000 (08:07 -0600)]
Merge PR #31835 into master

* refs/pull/31835/head:
mgr/ssh: add TemporaryDirectory impl for py2 compat

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31325 from cbodley/wip-rgw-sync-concurrent-versions
Casey Bodley [Mon, 25 Nov 2019 14:03:18 +0000 (09:03 -0500)]
Merge pull request #31325 from cbodley/wip-rgw-sync-concurrent-versions

rgw multisite: fixes for concurrent version creation

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
5 years agoMerge PR #30972 into master
Patrick Donnelly [Mon, 25 Nov 2019 02:53:20 +0000 (18:53 -0800)]
Merge PR #30972 into master

* refs/pull/30972/head:
mds: move 'traverse to auth' logic into MDCache::path_traverse
mds: cleanup Capability initialization
mds: cleanup code that kills session requests
mds: cleanup Server::try_open_auth_dirfrag()
mds: restrict path that walks into snapdir
mds: use single map to track pinned & auth_pinned objects
mds: define operator<(...) for MutationImpl::LockOp
mds: cleanup Locker::acquire_locks()
mds: introduce Locker::wrlock_try()
mds: explictly specify if MDCache::path_traverse() needs to check null dentry
mds: cleanup dentry non-readable check in MDCache::path_traverse()
mds: change MDCache::path_traverse()'s 'onfail' argument to flags

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #31786 into master
Sage Weil [Sun, 24 Nov 2019 18:45:26 +0000 (12:45 -0600)]
Merge PR #31786 into master

* refs/pull/31786/head:
mgr: fix errors on using a reference in a Lambda function

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/standalone/ceph-helpers.sh: remove osd down check 31677/head
Sage Weil [Sat, 23 Nov 2019 14:55:00 +0000 (08:55 -0600)]
qa/standalone/ceph-helpers.sh: remove osd down check

A kill doesn't induce a mark-down of the OSD with osd_fast_shutdown=true.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: add TemporaryDirectory impl for py2 compat 31835/head
Sage Weil [Sat, 23 Nov 2019 18:14:13 +0000 (12:14 -0600)]
mgr/ssh: add TemporaryDirectory impl for py2 compat

This didn't get copied over in 4bfcb5db6bdb833496aa840d6aac603c7c405277

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31761 from tchaikov/wip-cmake-include-libfmt
Kefu Chai [Sun, 24 Nov 2019 17:08:02 +0000 (01:08 +0800)]
Merge pull request #31761 from tchaikov/wip-cmake-include-libfmt

cmake: do not include ${CMAKE_SOURCE_DIR}/src/fmt/include

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
5 years agoMerge pull request #31711 from p-se/wip-pse-fix-osd-full-alert
Kefu Chai [Sun, 24 Nov 2019 17:06:34 +0000 (01:06 +0800)]
Merge pull request #31711 from p-se/wip-pse-fix-osd-full-alert

monitoring: wait before firing osd full alert

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31692 from rzarzynski/wip-fips-zeroize-memset_bzero
Kefu Chai [Sun, 24 Nov 2019 17:05:16 +0000 (01:05 +0800)]
Merge pull request #31692 from rzarzynski/wip-fips-zeroize-memset_bzero

FIPS: audit and switch some memset & bzero users

Reviewed-by: Marcus Watts <mwatts@redhat.com>
5 years agoMerge pull request #31705 from tchaikov/wip-mgr-orchestrator
Kefu Chai [Sun, 24 Nov 2019 17:03:52 +0000 (01:03 +0800)]
Merge pull request #31705 from tchaikov/wip-mgr-orchestrator

mgr/orchestrator: do not try to iterate through None

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31691 from Anjingkegui/master.monv2change1
Kefu Chai [Sun, 24 Nov 2019 17:01:55 +0000 (01:01 +0800)]
Merge pull request #31691 from Anjingkegui/master.monv2change1

mon: remove the restriction of address type in init_with_hosts

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Xiaoxi Chen <xiaoxchen@ebay.com>
5 years agoMerge pull request #31513 from ifed01/wip-ifed-check-bluefs-allocs
Kefu Chai [Sun, 24 Nov 2019 17:00:54 +0000 (01:00 +0800)]
Merge pull request #31513 from ifed01/wip-ifed-check-bluefs-allocs

os/bluestore: check bluefs allocations on log replay

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
5 years agoMerge pull request #30204 from tchaikov/wip-test-aio-completion-release
Kefu Chai [Sun, 24 Nov 2019 16:59:25 +0000 (00:59 +0800)]
Merge pull request #30204 from tchaikov/wip-test-aio-completion-release

test/librados: free AioCompletion using AioCompletion::release()

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31703 from xiexingguo/wip-42577-plus
Kefu Chai [Sun, 24 Nov 2019 16:58:14 +0000 (00:58 +0800)]
Merge pull request #31703 from xiexingguo/wip-42577-plus

osd/PeeringState: do not exclude up from acting_recovery_backfill

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31693 from tchaikov/wip-42782
Kefu Chai [Sun, 24 Nov 2019 16:56:09 +0000 (00:56 +0800)]
Merge pull request #31693 from tchaikov/wip-42782

qa/workunits/rados/test_librados_build.sh: download from current branch

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31243 from lxbsz/log
Kefu Chai [Sun, 24 Nov 2019 16:55:24 +0000 (00:55 +0800)]
Merge pull request #31243 from lxbsz/log

log: just return if t is empty

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31714 from lxbsz/preforker
Kefu Chai [Sun, 24 Nov 2019 16:54:43 +0000 (00:54 +0800)]
Merge pull request #31714 from lxbsz/preforker

preforker: remove useless code

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31778 into master
Sage Weil [Sun, 24 Nov 2019 02:30:28 +0000 (20:30 -0600)]
Merge PR #31778 into master

* refs/pull/31778/head:
os/bluestore: pin onodes as they are added to the cache
Revert "Revert "Merge pull request #30964 from markhpc/wip-bs-cache-trim-pinned""

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31807 into master
Sage Weil [Sun, 24 Nov 2019 02:29:52 +0000 (20:29 -0600)]
Merge PR #31807 into master

* refs/pull/31807/head:
mgr/PyModule: correctly remove config options

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31806 into master
Sage Weil [Sun, 24 Nov 2019 02:29:37 +0000 (20:29 -0600)]
Merge PR #31806 into master

* refs/pull/31806/head:
spec,debian: ceph-mgr-ssh depends on openssh{-client{s}}

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
5 years agoMerge PR #31818 into master
Sage Weil [Sun, 24 Nov 2019 02:27:00 +0000 (20:27 -0600)]
Merge PR #31818 into master

* refs/pull/31818/head:
common/options: remove unused ms_msgr2_{sign,encrypt}_messages

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #31825 into master
Sage Weil [Sun, 24 Nov 2019 02:26:48 +0000 (20:26 -0600)]
Merge PR #31825 into master

* refs/pull/31825/head:
msg/async: fix typo in Error message

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31831 into master
Sage Weil [Sun, 24 Nov 2019 02:26:08 +0000 (20:26 -0600)]
Merge PR #31831 into master

* refs/pull/31831/head:
ceph-daemon: make infer_fsid behave when /var/lib/ceph dne

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31832 into master
Sage Weil [Sun, 24 Nov 2019 02:25:52 +0000 (20:25 -0600)]
Merge PR #31832 into master

* refs/pull/31832/head:
ceph-daemon: fix extract_uid_gid

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: fix extract_uid_gid 31832/head
Sage Weil [Sat, 23 Nov 2019 15:07:09 +0000 (09:07 -0600)]
ceph-daemon: fix extract_uid_gid

This will get confused by the cephdaemon user!

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make infer_fsid behave when /var/lib/ceph dne 31831/head
Sage Weil [Sat, 23 Nov 2019 15:02:28 +0000 (09:02 -0600)]
ceph-daemon: make infer_fsid behave when /var/lib/ceph dne

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31636 into master
Sage Weil [Sat, 23 Nov 2019 14:48:47 +0000 (08:48 -0600)]
Merge PR #31636 into master

* refs/pull/31636/head:
mgr/pg_autoscaler: default to pg_num[_min] = 16

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #31796 into master
Sage Weil [Sat, 23 Nov 2019 14:48:32 +0000 (08:48 -0600)]
Merge PR #31796 into master

* refs/pull/31796/head:
PendingReleaseNotes: note about the removal of 'nvme' class
common/blkdev: drop is_nvme() method
os/bluestore/KernelDevice: get rid of 'nvme' type

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agocls/rbd: sanitize the mirror image status peer address after reading from disk 31824/head
Jason Dillaman [Fri, 22 Nov 2019 21:39:43 +0000 (16:39 -0500)]
cls/rbd: sanitize the mirror image status peer address after reading from disk

RADOS upgrade tests were failing when OSDs were partially upgraded since the
entity_addr_t::type overload wasn't being recovered when re-read. Now we will
always sanitize the on-disk entity address after reading it to avoid such
issues of on-disk encoding/decoding.

Fixes: https://tracker.ceph.com/issues/42891
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31816 from jan--f/c-v-no-unittest-mock
Alfredo Deza [Sat, 23 Nov 2019 13:53:26 +0000 (08:53 -0500)]
Merge pull request #31816 from jan--f/c-v-no-unittest-mock

ceph-volume: import mock.mock instead of unittest.mock (py2)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoMerge pull request #30863 from matthewoliver/improve_do_cmake
Kefu Chai [Sat, 23 Nov 2019 01:13:13 +0000 (09:13 +0800)]
Merge pull request #30863 from matthewoliver/improve_do_cmake

do_cmake.sh: Add CEPH_GIT_DIR

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomsg/async: fix typo in Error message 31825/head
Willem Jan Withagen [Fri, 22 Nov 2019 22:33:28 +0000 (23:33 +0100)]
msg/async: fix typo in Error message

And fix layout while there

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoPendingReleaseNotes: note about the removal of 'nvme' class 31796/head
Sage Weil [Fri, 22 Nov 2019 21:33:13 +0000 (15:33 -0600)]
PendingReleaseNotes: note about the removal of 'nvme' class

There isn't much to say here since this really shouldn't be happening in
the wild.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31502 into master
Sage Weil [Fri, 22 Nov 2019 21:28:17 +0000 (15:28 -0600)]
Merge PR #31502 into master

* refs/pull/31502/head:
qa/tasks/ceph2: get ceph-daemon from same place as ceph
qa/tasks/ceph2: use safe_while
qa/tasks/ceph2: pull image using sha1
qa/tasks/ceph2: docker needs quay.io/ prefix for image name
qa/workunits/rados/test_python: make sure rbd pool exists
qa/suites/rados/ssh: new tests!
qa/tasks/ceph2: pull ceph-ci/ceph:$branch
qa/tasks/ceph2: register_daemons after pods start
qa/tasks/ceph2: fix conf
qa/tasks/ceph2: add restart
qa/tasks/ceph2: pass ceph-daemon path to DaemonState
qa/tasks/ceph2: tolerate no mdss or 1 mgr
qa/tasks/ceph: replace wait_for_osds_up with manager.wait_for_all_osds_up
qa/tasks/ceph: wait-until-healthy
qa/tasks/ceph2: set up managers
qa/tasks/ceph2: use seed ceph.conf
qa/tasks/ceph: healthy: use manager helpers (instead of teuthology/misc ones)
qa/tasks/ceph2: name mds daemons
qa/tasks/ceph2: fix osd ordering
qa/tasks/ceph2: start up mdss
qa/tasks/ceph2: set up daemon handles and use them to stop
qa/tasks/ceph2: make it multicluster-aware
qa/tasks/ceph2: can bring up mon, mgr, osds!
qa/tasks/ceph2: basic task to bring up cluster with ceph-daemon and ssh

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agorgw: allow apply_olh_log to rewrite the same olh version 31325/head
Casey Bodley [Fri, 1 Nov 2019 14:48:41 +0000 (10:48 -0400)]
rgw: allow apply_olh_log to rewrite the same olh version

if two zones write an object version with the same olh epoch,
apply_olh_log needs to be able to write the more-current instance at the
same epoch

Fixes: https://tracker.ceph.com/issues/39142
Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agorgw: apply_olh_log filters out older instances of same epoch
Casey Bodley [Fri, 1 Nov 2019 14:38:52 +0000 (10:38 -0400)]
rgw: apply_olh_log filters out older instances of same epoch

when apply_olh_log() detects multiple instances with the same epoch, we
only promote the one that the bucket index lists as more current

Fixes: https://tracker.ceph.com/issues/39142
Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agorgw: factor out decode_olh_info()
Casey Bodley [Fri, 22 Nov 2019 19:50:11 +0000 (14:50 -0500)]
rgw: factor out decode_olh_info()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agoceph-daemon: fix logrotate su line 31823/head
Sage Weil [Fri, 22 Nov 2019 17:28:58 +0000 (11:28 -0600)]
ceph-daemon: fix logrotate su line

The ceph group usually won't exist; rotate as root.root.

(If we leave this off, logrotate complains about directory ownership
and permissions and doesn't do anything.)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31657 from liewegas/fix-merge-vs-backoff
Neha Ojha [Fri, 22 Nov 2019 19:47:49 +0000 (11:47 -0800)]
Merge pull request #31657 from liewegas/fix-merge-vs-backoff

osd: release backoffs during merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoqa/tasks/ceph2: get ceph-daemon from same place as ceph 31502/head
Sage Weil [Fri, 22 Nov 2019 19:44:45 +0000 (19:44 +0000)]
qa/tasks/ceph2: get ceph-daemon from same place as ceph

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocls/rgw: only promote instance entries if they sort after current instance
Casey Bodley [Wed, 30 Oct 2019 15:21:06 +0000 (11:21 -0400)]
cls/rgw: only promote instance entries if they sort after current instance

to support bidirectional replication, where each zone could create its
own instances with the same olh epoch, the sort order of those instances
should be used to determine whether an entry should be promoted over the
current instance

Fixes: https://tracker.ceph.com/issues/39142
Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agotest/rgw: add test_concurrent_versioned_object_incremental_sync
Casey Bodley [Wed, 9 Oct 2019 15:43:23 +0000 (11:43 -0400)]
test/rgw: add test_concurrent_versioned_object_incremental_sync

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agocommon/options: remove unused ms_msgr2_{sign,encrypt}_messages 31818/head
Ilya Dryomov [Fri, 22 Nov 2019 17:39:58 +0000 (18:39 +0100)]
common/options: remove unused ms_msgr2_{sign,encrypt}_messages

These are unused since 1d29722f801c ("switch monc, daemons to use new
msgr2 auth frame exchange").  As they default to false, a confused user
might flip them to true and think that their client <-> OSD traffic is
encrypted.

The new set of options was added in c7ee66c3e54b
("auth,msg/async/ProtocolV2: negotiate connection modes").

Fixes: https://tracker.ceph.com/issues/42976
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoMerge PR #31698 into master
Sage Weil [Fri, 22 Nov 2019 17:24:27 +0000 (11:24 -0600)]
Merge PR #31698 into master

* refs/pull/31698/head:
rpm,deb: add cephdaemon user and sudoers file
ceph-daemon: use mgr/ssh command to create the ssh key
mgr/ssh: add 'ssh generate-key' and 'ssh clear-key' commands
mgr/ssh: add mode option
mgr/ssh: add 'ssh get-pub-key' and 'ssh get-user' commands
mgr/ssh: convert to command decorations
mgr/orchestrator: move command annotation helpers to orchestrator.py

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31790 into master
Sage Weil [Fri, 22 Nov 2019 17:22:27 +0000 (11:22 -0600)]
Merge PR #31790 into master

* refs/pull/31790/head:
Revert "Merge pull request #16715 from adamemerson/wip-I-Object!"

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agotest/librados: free AioCompletion using unique_ptr 30204/head
Kefu Chai [Fri, 6 Sep 2019 17:30:24 +0000 (01:30 +0800)]
test/librados: free AioCompletion using unique_ptr

always destroy AioCompletion pointers even if test fails

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: release pimpl pointer in destructor
Kefu Chai [Fri, 6 Sep 2019 17:29:49 +0000 (01:29 +0800)]
librados: release pimpl pointer in destructor

before this change, the librados applications are responsible to call
`AioCompletion::release()` explicitly to release its internal pimpl
pointer. this is error prone and not intuitive.

after this change, the destructor of `AioCompletion` and
`PoolAsyncCompletion` will do this automatically. while
`AioCompletion::release()` and `PoolAsyncCompletion::release()` still
delete the instance as they did before. so this change is backward
compatible, as existing librados clients can still use `ptr->release()`
to free the completion instance, while new clients can just `delete
ptr`.

librados_test_stub is updated accordingly to match the new model

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-volume: import mock.mock instead of unittest.mock (py2) 31816/head
Jan Fajerski [Fri, 22 Nov 2019 15:57:11 +0000 (16:57 +0100)]
ceph-volume: import mock.mock instead of unittest.mock (py2)

Fixes: bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657
Fixes: https://tracker.ceph.com/issues/42970
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31814 from jan--f/c-v-check-selinux-py2
Jan Fajerski [Fri, 22 Nov 2019 16:26:45 +0000 (17:26 +0100)]
Merge pull request #31814 from jan--f/c-v-check-selinux-py2

ceph-volume: check if we run in an selinux environment, now also in py2

5 years agoMerge PR #31788 into master
Sage Weil [Fri, 22 Nov 2019 15:33:36 +0000 (09:33 -0600)]
Merge PR #31788 into master

* refs/pull/31788/head:
ceph-daemon: append newline before public key string

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoRevert "Merge pull request #16715 from adamemerson/wip-I-Object!" 31790/head
Sage Weil [Fri, 22 Nov 2019 15:24:11 +0000 (09:24 -0600)]
Revert "Merge pull request #16715 from adamemerson/wip-I-Object!"

This reverts commit 669453138d89e0f797a1bd37f38a2d68e6aac366, reversing
changes made to 36f5fcbb97eb2b1bceb526331eb3464f460fc701.

Signed-off-by: Sage Weil <sage@redhat.com>
- conflicts due to code rearrangement in 14b0db908f652032c358e419ffa90f5676698d0e

5 years ago ceph-volume: python2 raises OSError on Popen with missing binary. 31814/head
Jan Fajerski [Fri, 22 Nov 2019 14:51:00 +0000 (15:51 +0100)]
 ceph-volume: python2 raises OSError on Popen with missing binary.

For compatibility alias FileNotFoundError to OSError.

Fixes: 72b79f71fa84fe0d56b2fd1745f5bb130380cc38
Fixes: https://tracker.ceph.com/issues/42967
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge PR #31798 into master
Sage Weil [Fri, 22 Nov 2019 14:50:52 +0000 (08:50 -0600)]
Merge PR #31798 into master

* refs/pull/31798/head:
ceph-daemon: ceph-volume works without an fsid
ceph-daemon: several commands that can infer fsids still require them
ceph-daemon: fix fsid inference

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-volume: py2 compatibility for selinux test
Jan Fajerski [Fri, 22 Nov 2019 14:49:41 +0000 (15:49 +0100)]
ceph-volume: py2 compatibility for selinux test

Fixes: af30c7f956380beb3bc4021d60b9229a82bda4e2
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31809 from jan--f/c-v-check-selinux
Alfredo Deza [Fri, 22 Nov 2019 14:28:21 +0000 (09:28 -0500)]
Merge pull request #31809 from jan--f/c-v-check-selinux

ceph-volume: check if we run in an selinux environment

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoceph-daemon: ceph-volume works without an fsid 31798/head
Sage Weil [Thu, 21 Nov 2019 22:48:40 +0000 (16:48 -0600)]
ceph-daemon: ceph-volume works without an fsid

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: several commands that can infer fsids still require them
Sage Weil [Thu, 21 Nov 2019 22:48:30 +0000 (16:48 -0600)]
ceph-daemon: several commands that can infer fsids still require them

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix fsid inference
Sage Weil [Thu, 21 Nov 2019 22:47:59 +0000 (16:47 -0600)]
ceph-daemon: fix fsid inference

All return paths should return func.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr: fix errors on using a reference in a Lambda function 31786/head
Willem Jan Withagen [Thu, 21 Nov 2019 12:57:42 +0000 (13:57 +0100)]
mgr: fix errors on using a reference in a Lambda function

This is the extra info on this matter:

https://bugs.llvm.org/show_bug.cgi?id=35984.

Fixes: https://tracker.ceph.com/issues/42905
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agomgr/PyModule: correctly remove config options 31807/head
Tim Serong [Fri, 22 Nov 2019 09:25:19 +0000 (20:25 +1100)]
mgr/PyModule: correctly remove config options

Previously, incorrect parameters were being passed to "config rm",
causing it to do nothing.  This commit also ensures the correct
error message is shown for both the set and remove failure cases.
I've also moved the update of the in-memory config map to *after*
the value is persisted, to ensure the config map actually reflects
what's stored.

Fixes: https://tracker.ceph.com/issues/42958
Signed-off-by: Tim Serong <tserong@suse.com>
5 years agoMerge pull request #31771 from idryomov/wip-krbd-read-only-test
Ilya Dryomov [Fri, 22 Nov 2019 11:43:13 +0000 (12:43 +0100)]
Merge pull request #31771 from idryomov/wip-krbd-read-only-test

qa: update krbd_blkroset.t and add krbd_get_features.t

Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
5 years agoceph-volume: don't assume SELinux 31809/head
Jan Fajerski [Fri, 22 Nov 2019 09:46:05 +0000 (10:46 +0100)]
ceph-volume: don't assume SELinux

Expect selinux related binaries to not be present.

Fixes: 33c8a64a54d9ea8962091caf8564cea3f603c5f5
Fixes: https://tracker.ceph.com/issues/42957
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #30621 from wjwithagen/wjw-fix-freebsd-linking
Kefu Chai [Fri, 22 Nov 2019 10:27:02 +0000 (18:27 +0800)]
Merge pull request #30621 from wjwithagen/wjw-fix-freebsd-linking

cmake: use GNU linker on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-volume: fix test test_selinuxenabled_doesnt_exist
Jan Fajerski [Fri, 22 Nov 2019 10:09:22 +0000 (11:09 +0100)]
ceph-volume: fix test test_selinuxenabled_doesnt_exist

Popen does not open a shell by default, so A FileNotFoundError is
raised instead of returning a 127 return code.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agospec,debian: ceph-mgr-ssh depends on openssh{-client{s}} 31806/head
Sebastian Wagner [Fri, 22 Nov 2019 09:13:29 +0000 (10:13 +0100)]
spec,debian: ceph-mgr-ssh depends on openssh{-client{s}}

Container images don't include ssh by default. Thus we
have to explictly depend on it.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31777 from smithfarm/wip-mimic-v13.2.7-release-notes
Nathan Cutler [Fri, 22 Nov 2019 08:13:20 +0000 (09:13 +0100)]
Merge pull request #31777 from smithfarm/wip-mimic-v13.2.7-release-notes

doc/releases: add release notes for mimic v13.2.7

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30387 from rzarzynski/wip-crimson-errorator
Kefu Chai [Fri, 22 Nov 2019 05:30:27 +0000 (13:30 +0800)]
Merge pull request #30387 from rzarzynski/wip-crimson-errorator

crimson: bring ceph::errorator with its first appliances

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31793 into master
Patrick Donnelly [Fri, 22 Nov 2019 04:01:53 +0000 (20:01 -0800)]
Merge PR #31793 into master

* refs/pull/31793/head:
mds: release free heap pages after trim

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31799 from yuriw/wip-yuriw-crontab-master
Yuri Weinstein [Fri, 22 Nov 2019 01:44:28 +0000 (17:44 -0800)]
Merge pull request #31799 from yuriw/wip-yuriw-crontab-master

qa/tests: trying to fix syntax error that prevented mimic-x to be add…

5 years agoqa/tests: trying to fix syntax error that prevented mimic-x to be added to the schedule 31799/head
Yuri Weinstein [Fri, 22 Nov 2019 00:43:54 +0000 (16:43 -0800)]
qa/tests: trying to fix syntax error that prevented mimic-x to be added to the schedule

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge PR #31465 into master
Sage Weil [Thu, 21 Nov 2019 22:26:04 +0000 (16:26 -0600)]
Merge PR #31465 into master

* refs/pull/31465/head:
doc/install/containers: add summary of containers and branches

Reviewed-by: Dan Mick <dmick@redhat.com>
5 years agocommon/blkdev: drop is_nvme() method
Sage Weil [Thu, 21 Nov 2019 22:20:58 +0000 (16:20 -0600)]
common/blkdev: drop is_nvme() method

No more callers (and I don't think it works anyway).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoos/bluestore/KernelDevice: get rid of 'nvme' type
Sage Weil [Thu, 21 Nov 2019 22:19:17 +0000 (16:19 -0600)]
os/bluestore/KernelDevice: get rid of 'nvme' type

We are either 'hdd' or 'ssd' based on the rotational flag.  Previously,
we would try to distinguish between an nvme vs SATA/SAS ssd and set the
class to 'nvme'.  This was misguided--the interface is not important and
has no direct bearing on the device performance.  Moreover, the HDD
manufacturers are planning to produce rotation HDDs that use the nvme
interface instead of SATA/SAS.

So, drop this.

This may be somewhat disruptive to clusters where we were detecting
nvme but now are not.  However, the good news is that this doesn't seem
to trigger for real deployments because LVM breaks the is_nvme()
method.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31702 into master
Sage Weil [Thu, 21 Nov 2019 21:41:56 +0000 (15:41 -0600)]
Merge PR #31702 into master

* refs/pull/31702/head:
ceph-daemon: infer fsid for shell, enter, ceph-volume, unit, logs

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoqa/tasks/ceph2: use safe_while
Sage Weil [Thu, 21 Nov 2019 16:48:27 +0000 (10:48 -0600)]
qa/tasks/ceph2: use safe_while

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorpm,deb: add cephdaemon user and sudoers file 31698/head
Sage Weil [Mon, 18 Nov 2019 01:44:08 +0000 (19:44 -0600)]
rpm,deb: add cephdaemon user and sudoers file

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/releases: add release notes for mimic v13.2.7 31777/head
Nathan Cutler [Thu, 21 Nov 2019 03:02:51 +0000 (04:02 +0100)]
doc/releases: add release notes for mimic v13.2.7

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30960 from yuvalif/wip-yuval-add-kafka-notif-endpoint
Casey Bodley [Thu, 21 Nov 2019 19:42:23 +0000 (14:42 -0500)]
Merge pull request #30960 from yuvalif/wip-yuval-add-kafka-notif-endpoint

rgw/pubsub: add kafka notification endpoint

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
5 years agoceph-daemon: use mgr/ssh command to create the ssh key
Sage Weil [Mon, 18 Nov 2019 02:44:52 +0000 (20:44 -0600)]
ceph-daemon: use mgr/ssh command to create the ssh key

The mgr/ssh module has a command now to do this; use that instead of
generating the key ourselves and manually injecting it.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: add 'ssh generate-key' and 'ssh clear-key' commands
Sage Weil [Thu, 21 Nov 2019 18:42:17 +0000 (12:42 -0600)]
mgr/ssh: add 'ssh generate-key' and 'ssh clear-key' commands

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomds: release free heap pages after trim 31793/head
Patrick Donnelly [Thu, 21 Nov 2019 18:09:39 +0000 (10:09 -0800)]
mds: release free heap pages after trim

MDS free heap space can grow to large for some workloads (like smallfile
and recursive deletes). This can cause the MDS mapped memory to grow
well beyond memory targets.

When we finally use the PriorityCache in the MDS, this will not be
necessary anymore as the PriorityCache already does this.

Fixes: https://tracker.ceph.com/issues/42938
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr/ssh: add mode option
Sage Weil [Mon, 18 Nov 2019 01:45:36 +0000 (19:45 -0600)]
mgr/ssh: add mode option

Set the mgr/ssh/mode option to ceph-daemon-package to switch to a mode
where we assume ceph-daemon is installed on the remote host and we can
ssh as user cephdaemon.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: add 'ssh get-pub-key' and 'ssh get-user' commands
Sage Weil [Mon, 18 Nov 2019 01:25:56 +0000 (19:25 -0600)]
mgr/ssh: add 'ssh get-pub-key' and 'ssh get-user' commands

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: convert to command decorations
Sage Weil [Mon, 18 Nov 2019 01:22:17 +0000 (19:22 -0600)]
mgr/ssh: convert to command decorations

Also fix up set-ssh-config error checking a bit.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: move command annotation helpers to orchestrator.py
Sage Weil [Thu, 21 Nov 2019 18:35:42 +0000 (12:35 -0600)]
mgr/orchestrator: move command annotation helpers to orchestrator.py

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31747 into master
Sage Weil [Thu, 21 Nov 2019 17:49:35 +0000 (11:49 -0600)]
Merge PR #31747 into master

* refs/pull/31747/head:
qa/suites/rados/singleton-nomsgr/all/balancer: whitelist PG_AVAILABILITY

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31734 from smithfarm/wip-cbs-fork-option
Nathan Cutler [Thu, 21 Nov 2019 17:43:22 +0000 (18:43 +0100)]
Merge pull request #31734 from smithfarm/wip-cbs-fork-option

ceph-backport.sh: allow user to specify --fork explicitly

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoqa/tasks/ceph2: pull image using sha1
Sage Weil [Fri, 15 Nov 2019 14:21:02 +0000 (14:21 +0000)]
qa/tasks/ceph2: pull image using sha1

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/ceph2: docker needs quay.io/ prefix for image name
Sage Weil [Thu, 14 Nov 2019 03:49:41 +0000 (03:49 +0000)]
qa/tasks/ceph2: docker needs quay.io/ prefix for image name

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/workunits/rados/test_python: make sure rbd pool exists
Sage Weil [Wed, 13 Nov 2019 23:13:59 +0000 (23:13 +0000)]
qa/workunits/rados/test_python: make sure rbd pool exists

The ceph2 task doesn't create it for you.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/ssh: new tests!
Sage Weil [Wed, 13 Nov 2019 23:10:38 +0000 (23:10 +0000)]
qa/suites/rados/ssh: new tests!

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/ceph2: pull ceph-ci/ceph:$branch
Sage Weil [Wed, 13 Nov 2019 17:14:51 +0000 (17:14 +0000)]
qa/tasks/ceph2: pull ceph-ci/ceph:$branch

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/ceph2: register_daemons after pods start
Sage Weil [Wed, 13 Nov 2019 17:14:34 +0000 (17:14 +0000)]
qa/tasks/ceph2: register_daemons after pods start

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/ceph2: fix conf
Sage Weil [Wed, 13 Nov 2019 14:34:30 +0000 (14:34 +0000)]
qa/tasks/ceph2: fix conf

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