Merge pull request #11786 from leseb/dmcrypt-cluster-name

ceph-disk: ability to use a different cluster name with dmcrypt

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #12433 from liupan1111/wip-fix-rbd-nbd-log-sock

rbd-nbd: create admin socket only for map command

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #12797 from chendave/wip_error_message

ceph.in: Fix couple of minor issues on the messages

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #13449 from xiaoxichen/mdlog_jlat

mds/MDLog.cc Fix perf counter type for jlat

Merge pull request #13350 from Jing-Scott/fix-swift-ver-error-code

rgw: fix error code of inexistence of versions location in swift api

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #13301 from wjwithagen/wip-wjw-freebsd-manpage-location

doc: Have install put manpages in the FreeBSD correct location

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #13200 from smithfarm/wip-17193-reenable-test

tests: re-enable cephfs python tests on kclient

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>

doc: Have install put manpages in the FreeBSD correct location

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #13452 from tchaikov/wip-suite-repo-for-workunit

qa/tasks/workunit: use the suite repo for cloning workunit

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

rbd-nbd: no need create asok file for unmap and list-mapped commands.

Fixes: http://tracker.ceph.com/issues/17951
Signed-off-by: Pan Liu <liupan1111@gmail.com>

Merge pull request #13457 from craig08/wip-18954

ceph-disk: Fix getting wrong group name when --setgroup in bluestore

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #13443 from Liuchang0812/cleanup-common

common: add override in common and misc

Reviewed-by: Kefu Chai <kchai@redhat.com>

ceph-disk: Fix getting wrong group name when --setgroup in bluestore

ceph-disk prepare --setgroup <GROUP NAME> will be wrong when using with
bluestore

Signed-off-by: craigchi <craig10624@gmail.com>

Merge pull request #13454 from joscollin/joscollin-fix

os/FuseStore: include <functional> header in src/os/FuseStore.h for gcc 7.x

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

os/FuseStore: include <functional> header in src/os/FuseStore.h for gcc 7.x

This is done as per the Header Dependency Changes in gcc 7.
https://gcc.gnu.org/gcc-7/porting_to.html

Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge pull request #13416 from dillaman/wip-rbd-mirror-cleanup

rbd-mirror: track images via global image id

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

qa/tasks/workunit: use the suite repo for cloning workunit

as "workunits" reside in ceph/qa/workunits, it's more intuitive to
respect suite-repo option when cloning workunits.

Signed-off-by: Kefu Chai <kchai@redhat.com>

common: add override for common submodule and misc

Fixes: http://tracker.ceph.com/issues/18922
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

Merge pull request #13406 from vumrao/wip-vumrao-18486

osd/Pool: Disallow enabling 'hashpspool' option to a pool without  '--yes-i-really-mean-it'

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

Merge pull request #13370 from dreamhost/wip-18887

msg/simple/Pipe: support IPv6 QoS.

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #13260 from wjwithagen/wip-wjw-freebsd-getopt-2

tools/scripts:"FreeBSD getopt is not compatible, use the one from packages"

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #12144 from ifed01/wip-bluestore-no-blobdepth

os/bluestore: add new garbage collector

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

Merge pull request #13390 from Liuchang0812/remove-header

os/bluestore: some cleanup

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

Merge pull request #13398 from liewegas/wip-pgnls-snaps

osd: drop support for listing objects at a given snap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #13407 from liewegas/wip-osd-msgs

osd: change a few messages at level 0 and 1; change default level to 1/5

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

mds/MDLog.cc Fix perf counter type for jlat

jlat (journal latency) should be PERFCOUNTER_TIME | PERFCOUNTER_LONGRUNAVG
instead of PERFCOUNTER_U64

Current code with PERFCOUNTER_U64 make PerfCounters::tinc return
directly thus jlat will always be zero.

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>

Merge pull request #13235 from liewegas/wip-pg-split-interval

osd: have clients resend ops on pg split

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #13445 from liewegas/wip-rgw-thrash

qa/suites/rgw/thrash: add osd thrashing tests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #13434 from mikulely/cleanup-rgw-auth

rgw: cleanup unused var in rgw/rgw_rest_s3.cc

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #13412 from yuyuyu101/wip-rdma-log

msg/async/rdma: add log to show correct destruct queuepair

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

qa/suites/rgw/thrash: add rgw with osd trashing test

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

qa/suites/rgw/multifs: drop redundant civetweb override

This probably breaks the frontend/apache.yaml case.

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

Merge pull request #13441 from Liuchang0812/cleanup-rgw

rgw: add override in rgw subsystem

Merge pull request #13438 from Liuchang0812/cleanup-mds

mds: add override in mds subsystem

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #13431 from tchaikov/wip-cython-cephfs-without-librados

pybind: cephfs should be built without librados / python-rados

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #13439 from Liuchang0812/cleanup-osd

osd: add override in osd subsystem

Reviewed-by: Sage Weil <sage@redhat.com.

Merge pull request #13436 from Liuchang0812/cleanup-mgr

mgr: add override in mgr subsystem

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

Merge pull request #13440 from Liuchang0812/cleanup-mon

mon: add override in mon subsystem

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

Merge pull request #13442 from Liuchang0812/cleanup-librados

librados: add override for librados

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

Merge pull request #13421 from dillaman/wip-18935

qa/workunits/rbd: resolve potential rbd-mirror race conditions

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

librados: add override for librados

Fixes: http://tracker.ceph.com/issues/18922
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

mgr: add override in mgr subsystem

Fixes: http://tracker.ceph.com/issues/18922
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

mds: add override in mds subsystem

Fixes: http://tracker.ceph.com/issues/18922
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

osd: add override in osd subsystem

Fixes: http://tracker.ceph.com/issues/18922
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

mon: add override in mon subsystem

Fixes: http://tracker.ceph.com/issues/18922
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

rgw: add override in rgw subsystem

Fixes: http://tracker.ceph.com/issues/18922
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

Merge pull request #13317 from ktdreyer/wip-doc-ms-bind-ipv6-exclusive

doc: clarify that "ms bind ipv6" disables IPv4

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>

rgw: cleanup unused var in rgw/rgw_rest_s3.cc

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>

Merge pull request #13424 from dachary/wip-crush-dprintk

crush: fix dprintk compilation

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

rgw: fix error code of inexistence of versions location in swift api

when the versions location of container does not exist and uploading the same
object two more times to the container, it will return 412 rather than 404
in openstack swift. Meanwhile, if the dest bucket owner is not consistent with
src bucket owner, it will return 412.

http://tracker.ceph.com/issues/18880
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>

pybind: cephfs: do not link against librados

otherwise python-cephfs might fail to build with followin error:

Scanning dependencies of target cython3_cephfs
/usr/bin/ld: cannot find -lrados
collect2: error: ld returned 1 exit status

Link Error: Ceph FS library not found

and apparently, cephfs *can* be built without librados. it's only
dependency is libcephfs.

Signed-off-by: Kefu Chai <kchai@redhat.com>

pybind: cephfs: add docstring for LibCephFS's __init__()

Signed-off-by: Kefu Chai <kchai@redhat.com>

pybind: fix the cstr(auth_id, ..) call

so cstr() prints the right error message if auth_id does not look right.

Signed-off-by: Kefu Chai <kchai@redhat.com>

ceph.spec: python-cephfs no longer depends on python-rados

instead, it "Recommends" python-rados. as "Recommends:" is not supported on
older distros, only enable this on SuSE.

because python-cephfs *can* be used without python-rados. the
constructor of LibCephFS accepts a ceph.conf *or* a rados.Rados
instance.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crush: fix dprintk compilation

The syntax error was not noticed because dprintk is a macro
and the code is discarded by default.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

test: fix unused function warnings due to explicit template instantiation

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: async mirror image refresh state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

cls/rbd: async versions for dir_list and mirror_image_list

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: improved state tracking within object watcher

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: preliminary support to track multiple remote peer image sources

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: utilize global image id as internal unique key

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

test: added missing IoCtx copy/assignment methods in librados_test_stub

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #13089 from jcsp/wip-18600

#18600: Clear out tasks that don't make sense from multimds suite

Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #13093 from batrick/client-deadcode

client: remove dead log code

Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #13272 from jcsp/wip-18830

mds: fix bad iterator dereference reported by coverity

Reviewed by: Yan, Zheng <zyan@redhat.com>

Merge pull request #13347 from david-z/wip-straymanager-reuse-deleted-inode

mds/StrayManager: avoid reusing deleted inode in StrayManager::_purge_stray_logged

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #13417 from liewegas/wip-find-dups

script/find_dups_in_pg_log: scrip to find dup requests due to short pg logs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #13419 from dmick/wip-17826

ceph_common.sh: fix syntax error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

qa/workunits/rbd: resolve potential rbd-mirror race conditions

Fixes: http://tracker.ceph.com/issues/18935
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

ceph_common.sh: fix syntax error

Introduced by 299b7d06ac18c5cd30b8b65c7d25df9fc00287db
Fixes: http://tracker.ceph.com/issues/17826
Signed-off-by: Dan Mick <dan.mick@redhat.com>

Merge pull request #13311 from asheplyakov/master-18820

ceph-osd: --flush-journal: sporadic segfaults on exit

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

Merge pull request #13307 from songbaisen/s12

osd:  add is_split check before _start_split

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

Merge pull request #13326 from xiexingguo/wip-firstn

crush: do is_out test only if we do not collide

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <loic@dachary.org>

Merge pull request #13328 from wonzhq/fix-rec-stat

osd: fix stat sum update of recovery pushing

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #13353 from wonzhq/wip-failed-push

osd: fix the setting of soid in sub_op_push

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

script/find_dups_in_pg_log: scrip to find dup requests due to short pg logs

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

Merge pull request #13389 from trociny/wip-rbd-nbd-unused_old_format

rbd-nbd: no need to check image format any more

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #13248 from rzarzynski/wip-rgw-18796

rgw: improve handling of illformed Swift's container ACLs.

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #12810 from zhangsw/fix-rgw-datasync-errorlog

rgw: error_code in error log is not right when data sync fails.

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #13394 from tchaikov/wip-18838

cmake: link consumers of libclient with libcommon

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #11128 from tchaikov/wip-16091

mon/MonClient: hunt monitors in parallel

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

msg/async/rdma: add log to show correct destruct queuepair

Signed-off-by: Haomai Wang <haomai@xsky.com>

mon/MonClient: remove unnecessary helper functions

refactor _reopen_session() by removing wrapper around it.

Signed-off-by: Kefu Chai <kchai@redhat.com>

mon/MonClient: remove unnecessary include

Signed-off-by: Kefu Chai <kchai@redhat.com>

mon/monclient: hunt for multiple monitor in parallel

* add an option "mon_client_hunt_parallel" for the maxmimum number of parallel
  hunting sessions.

Fixes: http://tracker.ceph.com/issues/16091
Signed-off-by: Steven Dieffenbach <sdieffen@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>

mon/MonClient: mark monc_lock a mutable

so we can label the getters of MonClient with the `const` specifier.

Signed-off-by: Kefu Chai <kchai@redhat.com>

mon/MonClient: use __func__ for function names

Signed-off-by: Steven Dieffenbach <sdieffen@redhat.com>

client: move monc->set_want_keys() before monc->init()

if monc's tick connect to the mon before monc.set_want_keys() is called,
monc won't ask for the key for MDS service, and hence will fail to
build_authorizer() for MDS service. this change ready us for the
feature of monc-connect-to-mon-in-parallel.

Signed-off-by: Kefu Chai <kchai@redhat.com>

auth: AuthClientHandler::init() pass parameter by const ref

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #13149 from liewegas/wip-list-objects

librados: remove legacy object listing API, clean up newer api

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #13409 from xiexingguo/wip-fix-throttler-name

os/bluestore: add "_" prefix for internal methods

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

osd: fix backoff vs reset race

In OSD::ms_handle_reset, we clear session->con before removing any
backoffs.  That means we have to check if con has been cleared after any
call to have_backoff, lest we race with ms_handle_reset and it removes the
backoffs but we don't realize our client session is disconnected.

Introduce a helper to do both these checks in a safe way, simplifying
callers while we're at it.

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

osd/Session: fix race between have_backoff() and clear_backoffs()

We may return a raw pointer that is about to get deallocated by
clear_backoffs().  Fix by returning a reference, preventing the free.

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

osd: rename backoff config options

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

osd: manage backoffs per-pg; drop special split logic

Switch backoffs to be owned by a specific spg_t.  Instead of wonky split
logic, just clear them.  This is mostly just for convenience; we could
conceivably only clear the range belonging to children (just to stay
tidy--we'll never get a request in that range) but why bother.

The full pg backoffs are still defined by the range for the pg, although
it's a bit redundant--we could just as easily do [min,max).  This way we
get readable hobject ranges in the messages that go by without having to
map to/from pgids.

Add Session::add_backoff() helper to keep Session internals out of PG.h.

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

osdc/Objecter: manage backoffs per-spg_t

A backoff [range] is defined only within a specific spg_t; it does not
pass anything to children on split, or to another primary.

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

messages/MOSDBackoff: add spg_t to message

and make it an MOSDFastDispatchOp.

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

osdc/Objecter: recalculate target_* on every _calc_target call

Any time we are asked to calculate the target we should apply the
pool tiering parameters.  The previous logic of only doing so when the
target hadn't been calculated didn't make a whole lot of sense, and broke
our update of *pi that is needed to get the correct pg_num for the target
pool.  This didn't really matter for old clusters that take the raw pg,
but for luminous and beyond we need the exact spg_t which requires a
correct pg_num.

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

osdc/Objecter: simplify pgid translation

All callers now pass in an explicit pgid, including pg listing.  Since
we resend ops on split, there is not need to do any translation here,
even for the jewel and kraken osds that can handle a full hash value.

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

osdc/Objecter: use overlay pg_pool_t for subsequent calculations

We use pi for pg_num and other values below; we need to update accordingly
if we follow the overlay.

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