]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoqa: reduce cache size further 31729/head
Patrick Donnelly [Tue, 10 Dec 2019 21:24:50 +0000 (13:24 -0800)]
qa: reduce cache size further

1M isn't low enough to trigger recall/trimming.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: obsoleting 'mds_cache_size'
Ramana Raja [Mon, 18 Nov 2019 11:32:28 +0000 (17:02 +0530)]
mds: obsoleting 'mds_cache_size'

Remove last bits of support for 'mds_cache_size'.
'mds_cache_memory_limit' is preferred.

Fixes: https://tracker.ceph.com/issues/41951
Signed-off-by: Ramana Raja <rraja@redhat.com>
5 years agoMerge PR #31756 into master
Patrick Donnelly [Tue, 26 Nov 2019 23:53:48 +0000 (15:53 -0800)]
Merge PR #31756 into master

* refs/pull/31756/head:
pybind / cephfs: remove static typing in LibCephFS.chown

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31828 into master
Sage Weil [Tue, 26 Nov 2019 22:18:44 +0000 (16:18 -0600)]
Merge PR #31828 into master

* refs/pull/31828/head:
mgr/orchestrator: include container_image in 'service ls' output
ceph-daemon: include container_image_name and container_image_id in 'ls' output
common/options: default to ceph/ceph:latest-master-devel (for now)

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31854 into master
Sage Weil [Tue, 26 Nov 2019 22:18:28 +0000 (16:18 -0600)]
Merge PR #31854 into master

* refs/pull/31854/head:
mgr/orchestrator_cli: print table for 'host ls'
mgr/ssh: populate labels
mgr/orchestrator: add 'labels' property to InventoryNode
mgr/ssh: add/remove labels
mgr/orchestrator: orchestrator host label {add,rm}
mgr/ssh: add explicit host list

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31864 into master
Sage Weil [Tue, 26 Nov 2019 22:17:51 +0000 (16:17 -0600)]
Merge PR #31864 into master

* refs/pull/31864/head:
osd/PeeringState: clear LAGGY and WAIT states on exiting Started

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
5 years agoMerge PR #31865 into master
Sage Weil [Tue, 26 Nov 2019 22:17:05 +0000 (16:17 -0600)]
Merge PR #31865 into master

* refs/pull/31865/head:
cls/rbd: improve efficiency of mirror image status queries

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge PR #31866 into master
Sage Weil [Tue, 26 Nov 2019 22:16:33 +0000 (16:16 -0600)]
Merge PR #31866 into master

* refs/pull/31866/head:
osd/SnapMirror: no need to record purged_snaps every epoch

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #27467 into master
Patrick Donnelly [Tue, 26 Nov 2019 17:47:40 +0000 (09:47 -0800)]
Merge PR #27467 into master

* refs/pull/27467/head:
cephfs-shell: add snapshot management

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #31871 from smithfarm/wip-43021
Nathan Cutler [Tue, 26 Nov 2019 17:42:58 +0000 (18:42 +0100)]
Merge pull request #31871 from smithfarm/wip-43021

doc: mention --namespace option in rados manpage

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agodoc: mention --namespace option in rados manpage 31871/head
Nathan Cutler [Tue, 26 Nov 2019 07:04:17 +0000 (08:04 +0100)]
doc: mention --namespace option in rados manpage

Fixes: https://tracker.ceph.com/issues/43021
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agomgr/orchestrator_cli: print table for 'host ls' 31854/head
Sage Weil [Mon, 25 Nov 2019 14:44:54 +0000 (08:44 -0600)]
mgr/orchestrator_cli: print table for 'host ls'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: populate labels
Sage Weil [Mon, 25 Nov 2019 14:44:41 +0000 (08:44 -0600)]
mgr/ssh: populate labels

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: add 'labels' property to InventoryNode
Sage Weil [Mon, 25 Nov 2019 14:44:37 +0000 (08:44 -0600)]
mgr/orchestrator: add 'labels' property to InventoryNode

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: add/remove labels
Sage Weil [Mon, 25 Nov 2019 14:32:59 +0000 (08:32 -0600)]
mgr/ssh: add/remove labels

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: orchestrator host label {add,rm}
Sage Weil [Mon, 25 Nov 2019 14:32:53 +0000 (08:32 -0600)]
mgr/orchestrator: orchestrator host label {add,rm}

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: add explicit host list
Sage Weil [Mon, 25 Nov 2019 14:22:41 +0000 (08:22 -0600)]
mgr/ssh: add explicit host list

Keep the host list in an explicit 'inventory' key, and provide a dict for
each host so that we can keep other metadata (like labels).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31837 into master
Sage Weil [Tue, 26 Nov 2019 13:11:05 +0000 (07:11 -0600)]
Merge PR #31837 into master

* refs/pull/31837/head:
ceph-daemon: add additional debug logging

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31874 from tchaikov/wip-crimson-cyanstore-restructure
Kefu Chai [Tue, 26 Nov 2019 12:13:40 +0000 (20:13 +0800)]
Merge pull request #31874 from tchaikov/wip-crimson-cyanstore-restructure

crimson: move os/cyan_* down to os/cyanstore/*

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: move os/cyan_* down to os/cyanstore/* 31874/head
Kefu Chai [Tue, 26 Nov 2019 08:24:17 +0000 (16:24 +0800)]
crimson: move os/cyan_* down to os/cyanstore/*

prepare for bluestore and seastore

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31859 from rzarzynski/wip-crimson-drop_dup_failed
Kefu Chai [Tue, 26 Nov 2019 08:06:46 +0000 (16:06 +0800)]
Merge pull request #31859 from rzarzynski/wip-crimson-drop_dup_failed

crimson/osd/osd_operation.h: clean up duplicative check.

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31252 from wjwithagen/wjw-doc-ceph_volume_zfs_inventory
Jan Fajerski [Tue, 26 Nov 2019 07:58:31 +0000 (08:58 +0100)]
Merge pull request #31252 from wjwithagen/wjw-doc-ceph_volume_zfs_inventory

doc/ceph-volume: initial docs for zfs/inventory and zfs/api

5 years agoMerge pull request #31821 from mgfritch/c-v-scan-help
Jan Fajerski [Tue, 26 Nov 2019 06:46:48 +0000 (07:46 +0100)]
Merge pull request #31821 from mgfritch/c-v-scan-help

ceph-volume: minor clean-up of `simple scan` subcommand help

5 years agoceph-daemon: add additional debug logging 31837/head
Michael Fritch [Sun, 24 Nov 2019 18:00:37 +0000 (11:00 -0700)]
ceph-daemon: add additional debug logging

Adds additional detail before invoking subprocess for the
`run`, `shell, `enter`, and `logs` commands

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31567 into master
Sage Weil [Tue, 26 Nov 2019 03:54:16 +0000 (21:54 -0600)]
Merge PR #31567 into master

* refs/pull/31567/head:
common: move gen_rand_alphanumeric() helpers into common
test: add unit tests for gen_rand_alphanumeric helpers

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
5 years agoMerge PR #31781 into master
Sage Weil [Tue, 26 Nov 2019 03:49:31 +0000 (21:49 -0600)]
Merge PR #31781 into master

* refs/pull/31781/head:
cmake/modules: look for GNU make first instead of BSD make
cmake: support parallel build for rocksdb

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31579 into master
Sage Weil [Tue, 26 Nov 2019 03:49:18 +0000 (21:49 -0600)]
Merge PR #31579 into master

* refs/pull/31579/head:
cmake: add cppcheck and iwyu static analysis targets

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoMerge PR #31775 into master
Patrick Donnelly [Tue, 26 Nov 2019 00:45:57 +0000 (16:45 -0800)]
Merge PR #31775 into master

* refs/pull/31775/head:
mds: remove the incorrect comments

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #31762 into master
Patrick Donnelly [Tue, 26 Nov 2019 00:43:28 +0000 (16:43 -0800)]
Merge PR #31762 into master

* refs/pull/31762/head:
mgr/ssh: improve logging for mds removal
mgr/volumes: move up 'confirm' validation

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
5 years agoosd/SnapMirror: no need to record purged_snaps every epoch 31866/head
Sage Weil [Mon, 25 Nov 2019 19:31:26 +0000 (13:31 -0600)]
osd/SnapMirror: no need to record purged_snaps every epoch

These keys were a mirror of the mon's purged_epoch keys.  We were writing
them, but never looking at them.  We only need the per-pool keys that
are indexed by snapid for lookups, so we should stop storing the per-epoch
records.

Note that the OSDSuperblock has the purged_snaps_last that serves as our
position/cursor for ingesting the mon keys.

Fixes: https://tracker.ceph.com/issues/42012
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocls/rbd: improve efficiency of mirror image status queries 31865/head
Jason Dillaman [Mon, 25 Nov 2019 19:28:57 +0000 (14:28 -0500)]
cls/rbd: improve efficiency of mirror image status queries

The removal of remote mirror image status records no longer
(accidentally) searches through nearly the full omap database and
getting the status of a single image no longer involves duplicate
lookups (to pull the fsid keys and then to read the data).

Fixes: https://tracker.ceph.com/issues/42576
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #28625 from zhangsw/rgw-fix-get-object
Casey Bodley [Mon, 25 Nov 2019 19:22:54 +0000 (14:22 -0500)]
Merge pull request #28625 from zhangsw/rgw-fix-get-object

rgw: ignore If-Unmodified-Since if If-Match exists, and ignore If-Modified-Since if If-None-Match exists.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoosd/PeeringState: clear LAGGY and WAIT states on exiting Started 31864/head
Sage Weil [Mon, 25 Nov 2019 19:15:24 +0000 (13:15 -0600)]
osd/PeeringState: clear LAGGY and WAIT states on exiting Started

These flags were not getting cleared except in recheck_readable(), which
meant that a flag from a prior interval could bleed into a new interval.
More dangerously, in a mixed-version cluster, one interval might include
all octopus+ OSDs while the next might include a pre-octopus OSD, bypassing
most of the laggy recheck code.  This could lead to a stalled request
and/or requeue ordering bug when release_object_locks() looked at
is_laggy() and put a lock waiter on the waiting_for_readable list.

Fixes: https://tracker.ceph.com/issues/42978
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-volume: minor clean-up of `simple scan` subcommand help 31821/head
Michael Fritch [Fri, 22 Nov 2019 18:56:29 +0000 (11:56 -0700)]
ceph-volume: minor clean-up of `simple scan` subcommand help

Fixes: https://tracker.ceph.com/issues/43017
Signed-off-by: Michael Fritch <mfritch@suse.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 agomgr/orchestrator: include container_image in 'service ls' output 31828/head
Sage Weil [Tue, 5 Nov 2019 18:08:55 +0000 (12:08 -0600)]
mgr/orchestrator: include container_image in 'service ls' output

Rearrange the columns a bit too.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: include container_image_name and container_image_id in 'ls' output
Sage Weil [Tue, 5 Nov 2019 18:08:33 +0000 (12:08 -0600)]
ceph-daemon: include container_image_name and container_image_id in 'ls' output

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon/options: default to ceph/ceph:latest-master-devel (for now)
Sage Weil [Fri, 22 Nov 2019 22:29:58 +0000 (16:29 -0600)]
common/options: default to ceph/ceph:latest-master-devel (for now)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocrimson/osd/osd_operation.h: clean up duplicative check. 31859/head
Radoslaw Zarzynski [Mon, 25 Nov 2019 15:27:38 +0000 (16:27 +0100)]
crimson/osd/osd_operation.h: clean up duplicative check.

`seastar::future<T>::available()` already verifies whether
a future instance stores exception inside. It's unnecessary
to ensure that with further call to `failed()`.

This tiny clean-up removes the duplicative check in
`with_blocking_future()`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.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 agocmake/modules: look for GNU make first instead of BSD make 31781/head
Deepika Upadhyay [Fri, 22 Nov 2019 14:21:55 +0000 (19:51 +0530)]
cmake/modules: look for GNU make first instead of BSD make

  * BuildDPDK.cmake, BuildSPDK.cmake:
      * give priority to build with gmake
      * throw error if make not found

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agocmake: support parallel build for rocksdb
Deepika Upadhyay [Fri, 22 Nov 2019 14:17:16 +0000 (19:47 +0530)]
cmake: support parallel build for rocksdb

* cmake/modules/BuildRocksDB.cmake: if "make" detected
use concurrent processing, by passing the jobserver to
sub-make using `$(MAKE)`

Signed-off-by: Deepika Upadhyay <dupadhya@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>