Merge pull request #11821 from trociny/wip-test_notify

test/librbd: in test_notify set object-map and fast-diff features by default

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

Merge pull request #11840 from yangdongsheng/rbd_mirror_options

rbd-mirror: configuration overrides for hard coded timers

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

Merge pull request #11973 from ceph/wip-17898-ceph-disk-flake8

ceph-disk: fix flake8 errors

Reviewed-by: Dan Mick <dmick@redhat.com>

Merge pull request #11971 from dachary/wip-17898-flake8

tests: pin flake8 to avoid behavior changes

Reviewed-by: Nathan Cutler <ncutler@suse.cz>

ceph-disk: fix flake8 errors

flake8 3.1.1 surfaces the following issues:

ceph_disk/main.py:173:1: E305 expected 2 blank lines after class or
function definition, found 1
ceph_disk/main.py:5011:1: E305 expected 2 blank lines after class or
function definition, found 1

Fixes: http://tracker.ceph.com/issues/17898
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #11954 from stiopaa1/mds_MDCache_removeUnneededClear

mds/MDCache.h: remove unneeded call to clear func

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

Merge pull request #11912 from SUSE/wip-17747-followup

doc: drop --journal-check from ceph-mds man page

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

tests: pin flake8 to avoid behavior changes

Fixes: http://tracker.ceph.com/issues/17898
Signed-off-by: Loic Dachary <loic@dachary.org>

Merge pull request #11967 from wjwithagen/wip-wjw-buffer-splice

common/buffer.cc: raw_pipe depends on splice(2)

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

Merge pull request #11914 from tchaikov/wip-17857

ReplicatedPG::failed_push: release read lock on failure

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

common/buffer.cc: raw_pipe depends on splice(2)

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

Merge pull request #11919 from liewegas/wip-bluestore-cache-meta

os/bluestore: bluestore_cache_meta_ratio = .5

Reviewed-by: Mark Nelson <mnelson@redhat.com>

os/bluestore: precondition enough to write two 256mb buffers

We now match the new bluestore_rocksdb_options.

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

os/bluestore: bluestore_cache_meta_ratio = .5

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

rbd-mirror: configuration overrides for hard coded timers

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

Merge pull request #11842 from ceph/wip-cmake

cmake: librbd cleanup

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

ReplicatedPG::failed_push: release read lock on failure

and requeue the blocked ops.

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

cmake:librbd: move common to the end of linked libraries

so the linked libraries are able to find the symbols in libcommon.
and do not `list(APPEND librbd ...)` anymore, which is wrong and not
necessary. librbd does not depends on krbd.

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

cmake: move ContextCompletion.cc into rbd_internal

- ContextCompletion.cc is used by TrimRequest.cc which is included by
  rbd_internal, it's more natural to put ContextCompletion.cc into
  rbd_internal also. as rbd_internal is the only consumer of this
  translation unit.
- librbd/internal.cc is not referencing any symbols from util.cc, so
  remove this include. and also, do not add
  $<TARGET_OBJECTS:common_util_obj> to librbd.

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

cmake: let rbd_internal depend on librbd-tp

as librbd/AioCompletion.cc includes "tracing/librbd.h", which is offered
by librbd-tp.

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

Merge pull request #11906 from tchaikov/wip-11829

ceph-detect-init: FreeBSD introduction of bsdrc

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

ceph-detect-init: FreeBSD introduction of bsdrc

ceph-detect-init/ceph_detect_init/freebsd/__init__.py
    New file

ceph_detect_init/__init__.py: Only test FreeBSD after it is not Linux

    If we do it the other way around it will not work during testing on FreeBSD
    because it will always have platform.system() == FreeBSD
    So first test for Linux, and only then check to see if it is FreeBSD.

ceph-detect-init/tests/test_all.py: add tests for FreeBSD
ceph-detect-init/run-tox.sh: ReEnable to run test for FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11844 from liupan1111/master

os/bluestore: speedup the performance of multi-replication flow by switc…

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

Merge pull request #11799 from KerLiu/fixdupassignment

osd/OSDMap.cc: fix duplicated assignment for new_blacklist_entries

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

Merge pull request #11378 from ryneli/watch_notify_add_timeout

librados: add timeout to watch/notify

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

mds/MDCache.h: remove unneeded call to clear func

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>

librados: add timeout parameter to rados_watch

Signed-off-by: Ryne Li <lizhenqiangsnake@gmail.com>

Merge pull request #10221 from Yan-waller/yj-wip-testrados-0709

test/rados: remove unused bufferlist variable

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11941 from liewegas/wip-envlibrados

qa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install

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

Merge pull request #9357 from Aran85/wip-assert-build-push

osd/PGBackend: build_push_op segment fault

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

Merge pull request #11800 from bassamtabbara/wip-make-leveldb-optional

mon: support for building without leveldb + mon mkfs bug fix

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

Merge pull request #11664 from sysnote/wip-17719

mon: fix "OSDs marked OUT wrongly after monitor failover"

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #10196 from xiaoxichen/fix_16609

log/LogClient: fill seq & who for syslog and graylog

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

BlueStore: speedup the performance of multi-replication flow by
switching the callback order in bluestore.

In Bluestore ack callback and commit callback are queued one by one in
the function "BlueStore;:_txc_finish_kv". Therefore, just only one callback
is needed to call, in order to improve performance. We do this by switching
the callback order in bluestore, and the callback work can be done in
sub_op_modify_commit and doesn't need to do it again in sub_op_modify_applied.

Signed-off-by: Pan Liu <pan.liu@istuary.com>

Merge pull request #11805 from tchaikov/wip-deprecate-readdir-r

deprecate readdir_r() with readdir()

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

Merge pull request #11824 from xiexingguo/xxg-wip-kill-pg-splitting

osd: kill PG_STATE_SPLITTING

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #11874 from wido/osd-no-scrub-recovery

osd: Add config option to disable new scrubs during recovery

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

Merge pull request #11880 from cbodley/wip-ms-type-random

msg: seed random engine used for ms_type="random"

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

Merge pull request #11898 from liewegas/wip-filestore-hashindex

os/filestore/HashIndex: fix list_by_hash_* termination on reaching end

Reviewed-by: Samuel Just <sjust@redhat.com>

qa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install

On trusty we see

 WARNING: The following packages cannot be authenticated!
   librados-dev
 E: There are problems and -y was used without --force-yes

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

Merge pull request #11907 from badone/wip-pipe-socket-typos

msg: Fix typos in socket creation error message

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>

Merge pull request #11392 from Oloremo/keystone_docs

Update keystone doc about v3 options

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

Merge pull request #11925 from ktdreyer/doc-infernalis-eol

doc: add infernalis EOL date

doc: add infernalis EOL date

Remove the estimated Infernalis EOL date, and add the actual EOL date.

As discussed on the ceph-devel mailing list, we decided to say that this
infernalis EOL date is the same date that we made the first Jewel
release available.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #11924 from liewegas/wip-balloc

unittest_bit_alloc: fix type

Merging before make check because it clearly breaks the build and the build part is done
Reviewed-by: Dan Mick <dmick@redhat.com>

unittest_bitalloc: fix type

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

Merge pull request #11922 from liewegas/wip-mempool-bluestore

mempool: changes for bitmap allocator

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>

Merge pull request #11920 from ifed01/wip-bluestore-tmp

os/bluestore: remove build warning in a better way

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

mempool changes for bitmap allocator

[with bstore_balloc -> bluestore_alloc rename by sage]

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>

Merge pull request #11839 from liewegas/wip-mempool-buffer

buffer: put buffers in buffer_{data,meta} mempools

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>

Merge pull request #11834 from liewegas/wip-bluestore-mempool

os/bluestore: move bluefs into its own mempool

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>

buffer: put data and metadata in a mempool

Note that for raw_combined we leak some metadata into the data pool.

Also, we do not account for non-raw metadata or anything else in buffer.h,
as that would pollute the ABI and public interface.

Drop the namespace ceph in buffer.cc (which serves no real purpose) as it
confuses the MEMPOOL_DEFINE_* macros (they cannot be used inside a
namespace).

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

mempool: add [de]allocate_aligned

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

osd: move pg logs into osd mempool

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

osd/PG: move peering evt into pool

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

osd: move ReplicatedPG into mempool

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

mempool: create an osd mempool

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

mempool: attach mempool asok commands to all ccts

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

mempool: move to libcommon

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

include/mempool: align shard_t to cacheline

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

include/mempool: adjust factory name

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

mempool: drop unused factory type

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

include/mempool: fix allocate() debug_mode check

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

Merge pull request #7784 from ceph/wip-da-SCA-20160219

Coverity and SCA fixes

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

Merge pull request #11830 from adamemerson/wip-crush-unlocked

crush: remove the crush_lock

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

Merge pull request #11910 from xiexingguo/xxg-wip-bluestore-1111

os/bluestore: some more cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

os/bluestore: remove build warning in a better way

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #11915 from ifed01/wip-bluestore-fix-test

os/test/store_test: fix legacy bluestore cache settings application

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

Merge pull request #11905 from xiexingguo/xxg-wip-kill-boost-warn

os/bluestore: fix compiler warnings

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

Merge pull request #11896 from ifed01/wip-bluestore-cleanup

os/bluestore: cleanup around Blob::ref_map

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

Merge pull request #11710 from ceph/wip-jlayton-fsync

Fix long stalls when calling ceph_fsync()

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

Merge pull request #11293 from liewegas/wip-mon-markout

mon: preserve osd weight when marking osd out, then in

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

os/test/store_test: fix legacy bluestore cache settings application

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

os/bluestore: make Blob::ref_map private

Signed-off-by: Igor Fedotov <ifedotov@minratis.com>

os/bluestore: start using Blob::get_ref over the code

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

client: rename flush_caps() with no arguments to flush_caps_sync()

Per Greg's recommendation, change the name of this function to better
indicate what it does now that we always request a journal flush on
the last cap flush.

Also, add a comment above the function to better explain why we do this.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

client: request journal flush after flushing caps in syncfs

Ensure that we ask the MDS to flush the journal on the last cap flush
from sync_fs and umount codepaths.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

mds: only update change_attr and btime when client sets appropriate feature flags

The kernel client lags the userland code a bit, and feature support for
addr2 is not quite ready. Still, we want to allow the client to set the
new flags field in a cap request before then so it can get better fsync
performance.

When we go to update the cap fields, grab the features from the peer,
and verify that the appropriate flags are set before we apply updates
to the btime and change_attr.

Also, just have the function return early if dirty is 0, since it's
a no-op in that case, and turn the comment above the function into
an assertion.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

client: wire up the CHECK_CAPS_SYNCHRONOUS flag

Ensure that the client will request an immediate journal flush from the
MDS when we'll end up waiting on the flush response. This patch should
fix the fsync codepath, but we may need something similar for syncfs.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

client: change no_delay flag to a flags field

In a later patch, we'll want to have the client set the sync flag in
the cap flush, to hint to the MDS that it should process it immediately.

We could add a second bool, but let's instead do what the kernel client
does which is to have a flags field. With that, the existing no_delay
bool becomes CHECK_CAPS_NODELAY.

We'll add other flags in subsequent patches.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

mds: do mds log flush if CLIENT_CAPS_SYNC is set

If the client has set the sync flag in a cap update, then it
is indicating that it's waiting on the reply. Ensure that we flush
the journal in that case.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

doc: drop --journal-check from ceph-mds man page

References: http://tracker.ceph.com/issues/17747
Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #11790 from jcsp/wip-mclientcaps

client: remove unneeded layout on MClientCaps

Reviewed-by: Jeff Layton <jlayton@redhat.com>

Merge pull request #11789 from jcsp/wip-17798

mds: require MAY_SET_POOL to set pool_ns

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

Merge pull request #11783 from jcsp/wip-17796

mds: enable rmxattr on pool_namespace attrs

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

Merge pull request #11739 from SUSE/wip-17747

mds: remove "--journal-check" help text

Merge pull request #11692 from stiopaa1/mds_flock_addConstToMemFun

mds/flock: add const to member functions

Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug

osdc: After write try merge bh.

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

osd: Add config option to disable new scrubs during recovery

The osd_scrub_during_recovery config option allows for configuring
if the OSD will schedule a new scrub while recovery is active.

When set to false no new scrubs will be initiated by the OSD while
there are recovery threads active on that OSD.

Signed-off-by: Wido den Hollander <wido@42on.com>

Merge pull request #10853 from wido/docs-mon-pool-settings

doc: Add MON docs about pool flags and pool removal config settings

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

doc: Add MON docs about pool flags and pool removal config settings

Signed-off-by: Wido den Hollander <wido@42on.com>

msg: Fix typos in socket creation error message

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

os/bluestore: remove dead assert

This assert will never fire, hence it can be safely removed.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

os/bluestore: make Extent deleter as independent disposer

Duplicated definition of lambas of same function is not good.
Also switching ExtentMap::rm() to use the new disposer to
keep pace with others.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

rbd-mirror: remove unused comment

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

os/bluestore: fix compiler warnings

As follows:

/home/jenkins-build/build/workspace/ceph-pull-requests/build/boost/include/boost/intrusive/pointer_plus_bits.hpp: In member function ‘bool BlueStore::ExtentMap::encode_some(uint32_t, uint32_t, ceph::bufferlist&, unsigned int*)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/build/boost/include/boost/intrusive/pointer_plus_bits.hpp:76:7: warning: ‘dummy’ is used uninitialized in this function [-Wuninitialized]
       n = pointer(uintptr_t(p) | (uintptr_t(n) & Mask));
       ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/os/bluestore/BlueStore.cc:1779:10: note: ‘dummy’ was declared here
   Extent dummy(offset);

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #11902 from ceph/wip-krbd-mons-fix

krbd: kernel client expects ip[:port], not an entity_addr_t

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

Merge pull request #11903 from dmick/master

README: hint at where to look to diagnose test failures

README: hint at where to look to diagnose test failures

Signed-off-by: Dan Mick <dan.mick@redhat.com>

Merge pull request #11895 from xiexingguo/xxg-wip-bluestore-blob-range

os/bluestore: readability improvements and doxygen fix

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