Merge remote-tracking branch 'gh/jewel'

Merge branch 'wip-rados-bench'

rados: Add units to rados bench output

Fixes: #12248
Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7386 from liewegas/wip-features

osd: skip redirect encoding if we can

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

Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph

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

Merge branch 'gelf-logging-backend' of git://github.com/irq0/ceph

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

scripts/run-coverity: fix upload process

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

Merge pull request #7357 from zhengbinh3c/master

osd: fix memory leak in ReplicatedPG.cc error path

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

Merge pull request #7362 from xiexingguo/xxg-wip-fixbs

osd: BlueStore: fix fsck and blockdevice read-relevant issue

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

Merge pull request #7468 from liewegas/wip-test-fuse

qa/workunits/objectstore/test_fuse.sh: fix root check

Merge pull request #7476 from tchaikov/wip-include-expat-in-source

rgw: do not include "expat.h" in header file

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

Merge pull request #7479 from roidayan/fix_xio_compilation

msg/xio: fix compilation

ceph_test_objectstore: fix warning

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

os/bluestore/KernelDevice: explicit on ctor

This was lost in the wip-spdk merge.

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

Merge pull request #7467 from liewegas/wip-scrub-start

osd: fix scrub start hobject

Merge branch 'wip-spdk' of git://github.com/yuyuyu101/ceph

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

Merge remote-tracking branch 'me/wip-lockdep'

Merge pull request #7438 from ifed01/wip-pgbackend-cleanup

osd: cleanup OSD/PGBackend interface a bit

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

Merge pull request #7480 from trociny/fix-journal-commit_position_task

journal: reset commit_position_task_ctx pointer after task complete

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

script/run-coverity: fix user

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

journal: reset commit_position_task_ctx pointer after task complete

Otherwise, schedule_commit_task() would never schedule the next task
and the commit position would not be committed until shutdown.

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

Merge remote-tracking branch 'gh/wip-da-SCA-20150910'

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

xio: fix compilation

Signed-off-by: Roi Dayan <roid@mellanox.com>

Merge pull request #7473 from yehudasa/wip-14516

rgw-admin: document orphans commands in usage

Merge pull request #7451 from wjin/fix

msg/async: fix array boundary

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

rgw: do not include "expat.h" in heade file

Building Ceph without the Expat development library currently results in
the following build error:

~/ceph> ./configure --without-fuse --without-tcmalloc --without-radosgw
...
~/ceph> make
...
CXX ceph_dencoder-rgw_dencoder.o
In file included from rgw/rgw_dencoder.cc:6:0:
rgw/rgw_acl_s3.h:9:19: fatal error: expat.h: No such file or directory

The ceph-dencoder binary is built with rgw_dencoder.cc, which includes
rgw_acl_s3.h, which in turn includes expat.h. However, configure.ac
currently only checks for Expat as part of radosgw.

but we don't need expat.h for testing the encoding of rgw structs, so
move "#include <expat.h>" into the source file to avoid this dependency.
and as a side effect, this also speed up the compilation.

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

BlueStore: fix wrong action scope of enode

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

Merge pull request #7472 from badone/wip-ceph-disk-typo

ceph-disk: Fix trivial typo

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

BlueStore: add error handling for clone

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

BlueStore: add error handling for clone_range

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

BlueStore: fix wrong decode logic of nid_max

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

BlueStore: fix unhandled return code from blockdevice APIs

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

BlueStore: try to scan as many errors as possible

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

BlueStore: fix duplicated counting of errors

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

BlueStore: fix enode verification logic

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

BlueStore: add a guard for collection loading

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

BlueStore: add a guard for overlay loading

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

Merge pull request #6813 from manens/pybind_rados_snapshot_read

pybind: Implementation of Ioctx.set_read to allow read from snapshots

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

rgw-admin: document orphans commands in usage

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

ceph-disk: Fix trivial typo

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

msg: ignore request_redirect_t encode/decode when we not need

Signed-off-by: Xinze Chi <xinze@xsky.com>

Merge pull request #7445 from xiexingguo/xxg-wip-mem

osd: memstore: fix blocksize for statfs

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

qa/workunits/objectstore/test_fuse.sh: fix root check

$EUID not defined everywhere.

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

os/memstore: disable lockdep on Collection::lock

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

os/kstore: disable lockdep on Collection::lock

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

os/bluestore: disable lockdep on Collection::lock

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

os/filestore/CollectionIndex: disable lockdep on access_lock

This overflows the lockdep table when there are too many PGs. This
code is static so I'm not worried about new locking bugs.

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

common/RWLock: alloc lockdep to be disabled

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

lockdep: dump lock names if we run out of IDs

..just in case we are doing something silly, like misnaming locks.

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

os/bluestore: fix typo (again)

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

os/bluestore: fix typo

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

Merge pull request #7400 from yuyuyu101/wip-13938

librbd: Avoid create two threads per image

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

Merge pull request #7409 from dillaman/wip-librbd-watch-notify

tests: improve simulation of watch/notify handling

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

Merge pull request #6562 from Aran85/authedpermcheck

rgw: fix the condition of  authenticated user's permit check .

osd/PG: fix scrub start object

This was changed in 05d79faa512210b0f0a91640d18db33b887a6e73 but it needs
to be more precise to avoid breaking BlueStore's assertions (that the
start position is within the collection range).

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

Merge pull request #7291 from majianpeng/vstart.sh

vstart.sh: If use '-n' delete related source rather than consider '-k'.

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

osd/ECTransaction: Removing unused local

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

osd/PGBackend: PGBackend interface cleanup - make some interface methods pure virtual instead of assertion usage.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #7397 from tchaikov/wip-kill-warnings

build: kill warnings

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

configure: remove unused lines

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

BlueStore: use special symbol to distinguish backend type

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

NVMEDevice: use the only aio thread to process task

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

NVMEDevice: add buffer write support

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

BlueStore: add logger to record state transition latency

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

NVMEDevice: add perf counter for queue time

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

BlueStore: allow nvme driver read from path

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

NVMEDevice: no need to detach nvme device

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

NVMEDevice: add polling time perf counter

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

NVMEDevice: add flush perf counter calculate

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

RocksDB: add block cache size option to RocksDB

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

NVMEDevice: let perf counter do early

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

NVMEDevice: make flush wait for all write completed

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

NVMEDevice: delay nvme aio thread start in case of logger is null

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

NVMEDevice: let aio_write submit request FIFO

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

NVMEDevice: impl read_buffered method

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

NVMEDevice: adjust indent

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

BlockDevice: Move KernelDevice reap ioc to BlockDevice

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

NVMEDevice: add log message to reminder potential failed reason

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

NVMEDevice: use stringify instead of std::to_string

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

NVMEDevice: disable flush command now

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

NVMEDevice: add perf counter

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

NVMEDevice: adjust request/task memory pool size

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

NVMEDevice: don't try to acquire lock always

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

NVMEDevice: make aio thread pause when idle

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

NVMEDevice: add retry support

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

NVMEDevice: add flush support

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

NVMEDevice: fix multi ops in one IOContext bug

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

NVMEDevice: Fix typo

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

KernelDevice: Remove redundancy lines

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

NVMEDevice: make controller global shared

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

NVMEDevice: reorder signal in case of signaled thread modify IOContext

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

BlueFS: Use num_pending instead of pending_aios

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

BlockDevice: initialize backend_priv

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

NVMEDevice: make read/write all async

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

NVMEDevice: Fix static method

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

NVMEDevice: SPDK only permit submit/poll within one thread

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

NVMEDevice: fix unknown serial number problem

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

NVMEDevice: wrap C header file

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

Makefile: let spdk/dpdk libraries linked in upper layer

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

NVMEDevice: add spdk/pci.h

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