Merge pull request #13895 from guihecheng/rgw_file-fix

rgw_file: fix reversed return value of getattr

Merge pull request #14045 from guihecheng/rgw_file-fix-retcode

rgw_file: fix non-negative return code for open operation

Merge pull request #14049 from yangdongsheng/rbd_cleanup

cleanup: rbd: fix a typo in comment

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

Merge pull request #13936 from ZVampirEM77/cleanup-rgw-doc

doc: fix typos in radosgw-admin usage

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

Merge pull request #13559 from voidbag/wip-fix-_open_super_meta

os/bluestore: fix bug in _open_super_meta()

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

Merge pull request #13718 from aclamk/wip-bs-indexed-bitshift

os/bluestore: cleanup, got rid of table reference of 1<<x

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

Merge pull request #13769 from wangzhengyong/wip-noid

os/bluestore: "noid" is not always necessary in clone op

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #13804 from xiaoxichen/fix_adminsocket

pybind/ceph_daemon: use small chunk for recv

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

Merge pull request #13814 from liupan1111/wip-fix-remove-when-full

rados: allow "rados purge" to delete objects when osd is full

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

Merge pull request #13822 from Liuchang0812/wip-event-center-bug

msg/async: fix crash that writing char to nonblock-fd gets EAGAIN in EventCenter::wakeup

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

Merge pull request #13853 from tchaikov/wip-19134

mon/MonClient: don't return zero global_id

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

Merge pull request #13899 from jcsp/wip-19245

mds: fix handling very fast delete ops

Merge pull request #14007 from badone/wip-api-doc-code-fixes

docs: Fix problems with example code

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

Merge pull request #14028 from tchaikov/wip-kill-gcc-warning

os/bluestore: silence gcc warning

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

Merge pull request #13969 from tchaikov/wip-ceph-disk-manpage-formatting

man/8/ceph-disk: fix formatting

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

rgw_file: fix non-negative return code for open operation

The nfs-ganesha expects a negative retcode for errors.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>

Merge pull request #13988 from guihecheng/rgw_file-fix-rename

rgw_file: fix double unref on rgw_fh for rename

Merge pull request #14033 from wjin/clean

mon/PGMonitor: rm nonused function

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

mon/PGMonitor: rm nonused function

Signed-off-by: Wei Jin <wjin.cn@gmail.com>

os/bluestore: silence gcc warning

src/os/bluestore/BitAllocator.h:410:8: warning: ‘virtual bool
BitMapAreaIN::child_check_n_lock(BitMapArea*, int64_t, bool)’ was
hidden    [-Woverloaded-virtual]
 bool child_check_n_lock(BitMapArea *child, int64_t required, bool
lock) {
      ^~~~~~~~~~~~~~~~~~
 /var/ceph/ceph/src/os/bluestore/BitAllocator.h:489:8: warning:   by
 ‘BitMapAreaLeaf::child_check_n_lock’ [-Woverloaded-virtual]
  bool child_check_n_lock(BitMapZone* child, int64_t required, bool
  lock);
       ^~~~~~~~~~~~~~~~~~

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

Merge pull request #13917 from nikitych/add-oracle-distros

ceph-detect-init: Adds Oracle Linux Server and Oracle VM Server detect

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

Merge pull request #14006 from ShiqiCooperation/master

test/unittest_bluefs: remove unused variable

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

Merge pull request #14005 from liupan1111/wip-fix-resize-issue

rbd-nbd: update size only when NBD_SET_SIZE successful

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

Merge pull request #13922 from gregsfortytwo/wip-pg-unsigned-warning

osd: fix a signed/unsigned warning in PG

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

Merge pull request #13946 from LiumxNL/wip-170313

osd: don't share osdmap with objecter when preboot

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

Merge pull request #13911 from liewegas/wip-bluestore-fix-flush

os/bluestore: fix bugs in bluefs and bdev flush

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

Merge pull request #12364 from dillaman/wip-rbd-mirror-notifications

rbd-mirror: replace remote pool polling with add/remove notifications

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

Merge pull request #12970 from VictorDenisov/snapshot_namespace_index

librbd: add SnapshotNamespace to ImageCtx

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

Merge pull request #14019 from singler/wip-cleanup-create_new_fs

mon/MDSMonitor: remove create_new_fs from header

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

Merge pull request #13684 from shashalu/rgw-admin-init-bucket-for-sync

rgw: fix init_bucket_for_sync retcode

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

mon/MDSMonitor: remove create_new_fs from header

create_new_fs was refactored and moved earlier. This removes a left
over header entry.

Signed-off-by: Henrik Korkuc <henrik@kirneh.eu>

Merge pull request #14012 from optimistyzy/0317_2

bluestore,NVMEDevice: minor error for get slave core

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

bluestore,NVMEDevice: minor error for get slave core

The second parameter should set to 1 to skip master core.

Signed-off-by: Ziye Yang <optimistyzy@gmail.com>

Merge pull request #13646 from mslovy/wip-fix-test-pidfile

test: fix test_pidfile

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

docs: Fix problems with example code

Current code generates warnings and, in some cases, doesn't compile.

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

test: Invalid local variables and it is in an infinite loop

Signed-off-by: shiqi <1454927420@qq.com>

rbd-nbd: only set size to new_size when NBD_SET_SIZE successfully.

Signed-off-by: Pan Liu <liupan1111@gmail.com>

rgw_file: fix double unref on rgw_fh for rename

Skip unref after unlink to fix the problem.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>

rgw: fix init_bucket_for_sync retcode

init_bucket_for_sync error retcode should be negative

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>

rbd-mirror: move replayer admin socket hook to anonymous namespace

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

rbd-mirror: refresh local images after acquiring leader role

The local image id set should be up-to-date when attempting to
determine which images need to be deleted.

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

rbd-mirror: utilize the mirroring watcher to receive update notifications

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

rbd-mirror: templatize Threads helper class for mock tests

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

Merge pull request #13953 from linuxbox2/wip-rmdir-check

rgw_file: implement reliable has-children check (unlink dir)

Merge pull request #13951 from smithfarm/wip-drop-obsolete-bt

tests: drop obsolete Perl scripts

Merge pull request #13944 from liupan1111/wip-fix-nbd-issues

rbd-nbd: don't ignore --read-only option in BLKROSET ioctl

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

Merge pull request #13893 from hrchu/rgw-admin-api-doc

doc: Update adminops.rst

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

Merge pull request #13688 from theanalyst/fix/rgw/http-client-dout-msg

rgw: http_client clarify the debug msg function call

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

Merge pull request #13985 from ebozag/master

doc: Fixes a typo.

Reviewed-by: John Wilkins <jowilkin@redhat.com>

Merge pull request #13761 from zhangsw/cleanup-rgw-unlinkobj

rgw: correct the debug info when unlink instance failed.

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

rgw_file:  remove unused rgw_key variable

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

rgw_file:  rgw_readdir:  return dot-dirs only when *offset is 0

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

rgw_file: implement reliable has-children check (unlink dir)

Bug report and discussion provided by
Gui Hecheng <guihecheng@cmss.chinamobile.com> in nfs-ganesha upstream
github.  Briefly, while a reliable check is potentially costly,
it is necessary.

Fixes: http://tracker.ceph.com/issues/19270
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #13408 from zhangsw/fix-rgw-loglevel

rgw: change loglevel to 5 in user's quota sync.

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

Merge pull request #14001 from Adirl/rdma-cm-1

msg/async/rdma: Introduce Device.{cc,h}

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

Merge pull request #13930 from drunkard/master

doc: fix a typo

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

Merge pull request #13958 from wangzhengyong/have_output

mon: drop useless assignment statements

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

msg/async/rdma: Introduce Device.{cc,h}

Later on, multidevice support will be added and Device class will be the
main RDMA class (instead of Infiniband as it is today).

Issue: 995322
Change-Id: I060d849de21c8f847dd11ecd3edf1ddfb79b0820
Signed-off-by: Amir Vadai <amir@vadai.me>

msg/async/rdma: Change port num into int to be printed properly

Issue: 995322
Change-Id: If3095f2cc257cfe110652adca4a6175644c0230e
Signed-off-by: Amir Vadai <amir@vadai.me>

cleanup: rbd: fix a typo in comment

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

Merge pull request #13986 from dillaman/wip-19081

librbd: image create validates that pool supports overwrites

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

Merge pull request #13905 from yuyuyu101/wip-fix-assert

msg/async/rdma: fix outstanding queuepair when destruct RDMAStack

Reviewed-by: Adir lev <adirl@mellanox.com>

librbd: Add snapshot namespace to snapshot-name index in ImageCtx

The essence of this huge change is to have two keys for indexing
snap ids in ImageCtx. It used to be a map of (snap_name -> snap_id)
now it's (snap_namespace, snap_name) -> snap_id. Therefore now snapshots
can have the same name if they are in different namespaces.
All the remaining changes are a consequece of this change of
ImageCtx.snap_ids field. The only exception is: we assume that you can't
rename snapshots from GroupSnapshotNamespaces. So rename operation
always assumes UserSnapshotNamespace.

Signed-off-by: Victor Denisov <denisovenator@gmail.com>

doc: typo fix in rados/operations/crush-map

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>

Merge pull request #13983 from gaurav36/bug-19273-fix-typo

rbd: fix typo in Kernel.cc

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

librbd: image create validates that pool supports overwrites

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

librbd: clean up debug messages within image create state machine

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

Merge pull request #13628 from jcsp/wip-19075

mds: extend 'p' auth cap to cover all vxattr stuff

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

Merge pull request #13807 from jcsp/wip-19118

mds: try to avoid false positive heartbeat timeouts

doc: Fixes a typo.

Signed-off-by: Edwin F. Boza <eboza@espol.edu.ec>

librbd: removed legacy state machine callbacks from CreateRequest

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

doc: Fixes a typo.

Signed-off-by: Edwin F. Boza <eboza@espol.edu.ec>

Merge pull request #13913 from wangzhengyong/release

os/bluestore/Allocator: drop unused return value in release function

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

rbd: fix typo in Kernel.cc

Fixes: http://tracker.ceph.com/issues/19273
Reported-by: Shinobu Kinjo <shinobu@redhat.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>

Merge pull request #13928 from oritwas/wip-rgw-19195

rgw: use rgw_zone_root_pool for region_map like is done in hammer

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

Merge pull request #13977 from runsisi/wip-fix-rbd-py

pybind: fix docstring for librbd Python binding

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

Merge pull request #13976 from tchaikov/wip-fix-docs-links

doc: fix the links to http://ceph.com/docs

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

doc: fix the links to http://ceph.com/docs

they should point to http://docs.ceph.com/docs/master/.. instead

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

pybind: fix docstring for librbd Python binding

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

Merge pull request #13817 from ceph/wip-vstart-rgw-help

vstart: add --help documentation for rgw_num

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

man/8/ceph-disk: fix formatting

so the "optional argument" and "subcommands" subsections can be more
consistent with other man pages in ceph.

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

Merge pull request #13935 from chuang-he/fix_mutex_locker_of_compressor

compressor: fix Mutex::Locker used is not correct

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #13945 from ceph/wip-selinux-psched

selinux: Allow ceph daemons to read net stats

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

vstart: --help usage for rgw_num, mgr_num, mon, mds, osd

Signed-off-by: Ali Maredia <amaredia@redhat.com>

Merge pull request #13949 from cbodley/wip-15618

rgw: clear old zone short ids on period update

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

Merge pull request #13948 from cbodley/wip-rgw-data-sync-versioned

rgw: data sync includes instance in rgw_obj_index_key

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

Merge pull request #13586 from Liuchang0812/wip-add-override-in-rgw

rgw: add override in header files mostly

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

Merge pull request #12793 from zhangsw/fix-rgw-abortmultipart

rgw: AbortMultipart request returns NoSuchUpload error if the meta obj doesn't exist

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

Merge pull request #13900 from oritwas/wip-rgw-19231

fix upgrate from hammer when zone doesn't have zoneparams

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

Merge pull request #13354 from Liuchang0812/wip-18828

rgw: don't return skew time error in pre-signed url

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #13798 from tchaikov/wip-brag-count-mds

brag: count the number of mds in fsmap not in mdsmap

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

rbd-nbd: should set read_only when --readonly is set.

Signed-off-by: Pan Liu <liupan1111@gmail.com>

rbd-nbd: fixed typo and format in help info.

Signed-off-by: Pan Liu <liupan1111@gmail.com>

Merge branch 'wip-omap-getkeys-mds'

qa/suites/fs/basic: vary omap osd-side limit

Ensure that the omap looping paths are exercised.

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

mds/CDir: set sane max keys per op

Set default to 16384, which is > than the max frag size of 10000.  We will
loop if there are more.

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

mds/CDir: fetch dir omap in batches as needed

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

mds/SessionMap: use pmore for loading sessions

Keep the result size check for a while since older OSDs won't populate
the pmore field for us.  Eventually we can remove it.

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

Merge pull request #13812 from idryomov/wip-krbd-feature-disable-msg

rbd: spell out image features unsupported by the kernel

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

mon: drop useless assignment statements

Signed-off-by: wangzhengyong@cmss.chinamobile.com