Merge pull request #11383 from stiopaa1/mds_fsmap_passSharedPtrByConstRef

mds/FSMap: pass shared_ptr by const ref

Merge pull request #11290 from trociny/wip-17017

rbd-mirror HA: move librbd::image_watcher::Notifier to librbd::object_watcher

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

Merge pull request #11260 from runsisi/wip-fix-mirror-image-disable

librbd: fix rollback if failed to disable mirroring for image

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

Merge pull request #11301 from liewegas/wip-bluestore-buffered-write

os/bluestore: allow default to buffered write

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

Merge pull request #11370 from ceph/wip-krbd-unmap-options

rbd: expose rbd unmap options

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

Merge pull request #11255 from dzafman/wip-scrub-boundary

osd: fix scrub boundary to not include a SnapSet

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

Merge pull request #11377 from xiexingguo/xxg-wip-bluestore-1008

os/bluestore: drop inline_dirty from struct ExtentMap

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

os/bluestore: narrow scope of 'pos'

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

Merge pull request #11281 from jcsp/wip-17466

mds: handle bad standby_for_fscids in fsmap

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

os/bluestore: get rid of multiple call to dirty_blob()

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

Merge pull request #10722 from stiopaa1/mon_moncap_addMoveToStrings

mon/MonCap.h: add std::move for std::string

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

Merge pull request #10916 from jordan41177/fix-17169

mon: OSDMonitor: fix the check error of pg creating

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

Merge pull request #10720 from wjwithagen/wip-wjw-freebsd-socket-shutdown

msg/simple/Accepter.cc: replace shutdown() with selfpipe event in poll() (FreeBSD)

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

Merge pull request #10601 from stiopaa1/mon_monclient_subwantRemoveCount

mon/MonClient.h: remove repeated searching of map

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

Merge pull request #11145 from atheism/msg-async-fix-specifier

msg: fix format specifier for unsigned value id

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

mds/FSMap: pass shared_ptr by const ref

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

os/bluestore: fix raw blob encoded size

The maximum length of fixed fields of bluestore_blob_t shall be:

uint64_t sbid                       ///< 8 bytes
uint32_t compressed_length_orig     ///< 4 bytes
uint32_t compressed_length          ///< 4 bytes
uint32_t flags                      ///< 4 bytes
uint8_t csum_type                   ///< 1 byte
uint8_t csum_chunk_order            ///< 1 byte
unused_t unused;                    ///< 2 bytes

8 + 4 + 4 + 4 + 1 + 1 + 2 = 24

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

os/bluestore: add counter to trace number of garbage collection reads

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

os/bluestore: kill dead lines to keep code clean

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

Merge pull request #11379 from zealoussnow/fix-dead-link

doc: fix dead link "Hardware Recommendations"

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

doc: fix dead link "Hardware Recommendations"

Signed-off-by: Leo Zhang <nguzcf@gmail.com>

os/bluestore: drop inline_dirty from struct ExtentMap

We don't need this member as we can simply clear inline_bl
to mark it as dirty.

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

Merge pull request #10057 from Yan-waller/yj-wip-rgwradosccremover-0701

rgw: minor cleanup

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

Merge pull request #10674 from ceph/wip-rgw-no-empty-amzrqid

rgw/rest: don't print empty x-amz-request-id

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #10849 from zhangsw/master

rgw: remove a redundant judgement when listng objects.

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

os/bluestore: allow default to buffered write

Add config option to buffered writes (in the absense of
a client WILLNEED hint).  Set the config option to false,
though, so that the default behavior is unchanged.

2Q should do a half-decent job of preventing this from
pushing actually-hot data from the cache when it's
enabled, but we'll need to do more testing first.

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

Merge pull request #11353 from dillaman/wip-17423

librbd: API changes to support separate data pool

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

rbd: expose rbd unmap options

Reuse rbd map -o infrastructure to expose rbd unmap options in
a similar fashion.  Currently it's just one bool option, but we may
need more in the future.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

rbd: fix up terminology in help texts

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #11361 from batrick/fs-rm-formatting

mon: add missing space in warning message

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

Merge pull request #11364 from badone/wip-_lsb_release_-dead-declarations

osd: Remove unused '_lsb_release_' declarations

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

Merge pull request #11349 from liewegas/wip-compressor

compressor: fixes and tests; disable zlib isal (it's broken)

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

Merge pull request #11366 from xiexingguo/xxg-wip-bluestore-1007

os/bluestore: simplify blob status checking for small writes

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

unittest_compression: naming nit

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

unittest_compression: restore zlib_isal setting

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

Merge pull request #11236 from renhwztetecs/renhw-wip-cephfs-journal-tool

tool/cephfs: displaying "list" in journal event mode

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

Merge pull request #10021 from rzarzynski/wip-rgw-swift-auth-errors

rgw: handle Swift auth errors in a way compatible with new Tempests.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

os/bluestore: make randomizing value process of kvpair faster

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

os/bluestore: fsck() on idempotent mkfs() request

E.g., if the fsck() found something during the first mkfs() try,
it can still be caught by the following retry.

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

os/bluestore: fix comment

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

osd: Remove unused '_lsb_release_' declarations

_lsb_release_set and _lsb_release_parse declarations still exist despite their
definitions being removed some time ago.

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

os/bluestore: sanity check iterator of BufferSpace::_rm_buffer()

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

os/bluestore: simplify blob status checking for small writes

If a blob is marked as compressed and still mutable, something
is wrong.

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

Merge pull request #11302 from asheplyakov/rados-doc-fixup

doc: fix librados example programs

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

mon: add missing space in warning message

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

unittest_compression: subsume plugin test

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

unittest_compression: subsume _zlib and _snappy test cases

This includes zlib and isal interop.

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

unittest_compressor: smaller big test

Just so it runs a bit faster!

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

compressor/zlib: disable ISA-L

This fails the unit tests.  Do not reenable until it is fixed!

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

compressor/zlib: add compressor_zlib_isal config option to disable ISA-L

We dynamically enable this if the necessary processor features are present.
Allow this probing to be disabled explicitly.

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

compressor/snappy: fix decompress buffer sizing for large buffers

4 bytes is enough for small buffers, but fails for larger buffers because
snappy encodes the length as a varint.  8 is enough.

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

unittest_compressor: unified compression tests, parameterized by plugin

This obsoletes the per-plugin plugin tests, which are tedious anyway.

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

rbd: utilize new API methods for image id and block name prefix

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

librbd: new API methods to retrieve image id and block name prefix

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

librbd: relocate image option processing to create state machine

Replace the individual image option parameters with the ImageOptions
wrapper and extract the options within the state machine itself.
This will simplify adding support for the data pool and other options
in the future.

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

librbd: add data pool option to API and config

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

cls_rbd: fix compiler warning due to feature bit macro type change

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

Merge pull request #11326 from dillaman/wip-17416

rbd-mirror: improve resiliency of stress test case

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

Merge pull request #11327 from dillaman/wip-17422

librbd: cls_rbd updates for separate data pool

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

Merge pull request #11329 from atheism/rgw-b64-remove-ostr

rgw: remove unused variable "ostr" in rgw_b64.h and fix the comment

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

Merge pull request #11351 from ifed01/wip-bluestore-misc2

os/bluestore: Fix invalid compression statfs caused by clone op

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

Merge pull request #11350 from liewegas/wip-bluestore-compression

os/bluestore: fix up compression tests and debug output

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

os/bluestore: Fix invalid compression statfs caused by clone op

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

Merge pull request #11317 from liewegas/wip-bluestore-aios

os/bluestore: fix has_aios

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

ceph_test_objectstore: adjust SyntheticMatrixCsumVsCompression parameters

- larger writes
- test both codecs
- use smaller min_alloc_size so that it's easier to write compressed data
- don't bother with compression off; other matrices cover that.

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

os/bluestore: clean up compression debug output

The previous output was impossible to interpret properly.

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

ceph_test_objectstore: limit entropy in 'random' data so it can compress

Both zlib and snappy weren't able to do anything with the current data.

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

os/bluestore: fix build error

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

Merge pull request #11346 from ifed01/wip-bluestore-misc

os/bluestore: misc cleanup and test fixes

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

Merge pull request #11328 from liewegas/wip-bluestore-more-types

os/bluestore: pack a few more in-memory types

test/store_test: BluestoreStatFSTest fixes for issues introduced with bluestore_compression_min_blob_size adjustment

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

os/bluestore: some cleanup around garbage collector

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

Merge pull request #11344 from xiexingguo/xxg-wip-bluestore-1006

os/bluestore: fix write_big counter and some more cleanups

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

os/bluestore: fix comment

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

os/bluestore: simplify bluestore_gc_merge_data checking

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

os/bluestore: fix counter of l_bluestore_write_big_bytes

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

os/bluestore: more cleanups on _do_write_small()

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

os/bluestore: add _dump_transaction to reduce code redundancy

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

os/bluestore: upgrade wal_seq to std::atomic

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

Merge pull request #11336 from liewegas/wip-bluestore-spanning-map

os/bluestore: switch spanning_blob_map to std::map

Merge pull request #11340 from yehudasa/wip-13286

rgw-admin: allow unsetting user's email

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

Merge pull request #11334 from ceph/wip-make-dist-tag

make-dist: set rpm_release correctly for release builds

Reviewed-by: Alfredo Deza <adeza@redhat.com>

rgw: remove user email index using helper function

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

rgw:user email can modify to empty

Fixes: http://tracker.ceph.com/issues/13286
Signed-off-by: Weijun Duan <duanweijun@h3c.com>

make-dist: set rpm_release correctly for release builds

Similar to autobuild-ceph 17591db, only try to set rpm_release if there
is a release part to the git describe output (i.e. if it's not at a
version tag)

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

os/bluestore: switch spanning_blob_map to std::map

The intrusive map overhead on Blob is expensive when a tiny fraction of
Blobs actually end up in the spanning_blob_map.  Let's pay the extra
allocation overhead (for the map node holding the BlobRef) for those rare
cases.

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

Merge pull request #11127 from SirishaGuduru/multitenancy-doc-change

Changed config parameter "rgw keystone make new tenants" in radosgw multitenancy

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

Merge pull request #10159 from mhackett/wip-mhackett-16604

doc: add rgw_enable_usage_log option in Rados Gateway admin guide

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

Merge pull request #10641 from weiqiaomiao/wqm-wip-rgw-s3api

doc/radosgw: fix description of response elements 'Part'

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

Merge pull request #11286 from yehudasa/wip-16930

rgw: don't fail if lost race when setting acls

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

rgw: remove unused variable "ostr" in rgw_b64.h and fix the comment

Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>

Merge pull request #11319 from markhpc/wip-bluestore-optimize-size

os/bluestore: optimize intrusive sets for size.

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

Merge pull request #11313 from ceph/wip-krbd-lock-on-read-option

rbd: recognize lock_on_read option

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

os/bluestore: simplify BufferSpace writing_map / list

We were tracking buffers by seq.  In reality, though, we
won't have very many buffers that have in flight IO to
the same blob at the same time, so we can get by with
just a list here.  We can rely on the fact that the
list will be sorted (seq's increase, and we put new
buffers at the end).

This saves us a memory allocation.  No change in size of
BufferSpace and Blob (std::list -> intrusive::list).

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

unittest_bluestore_types: more type sizeofs

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

Merge pull request #11264 from liewegas/wip-bluestore-blob-split

os/bluestore: try to split blobs instead of spanning them

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

os/bluestore: make Buffer smaller

160 -> 152 bytes

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

cls_rbd: add initial support for separate data pools

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

librbd: new RBD_FEATURE_DATA_POOL feature bit

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

Merge pull request #11323 from liewegas/wip-bluestore-more-types

unittest_bluestore_types: a few more types for sizeof

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