Merge pull request #4918 from SUSE/wip_ceph_spec_directories_not_owned_by_a_package

ceph.spec.in: fix:Add missing directories breaking suse rpm build

Reviewed-by: Boris Ranto <branto@redhat.com>

ceph.spec.in: fix:Add missing directories breaking build

SUSE builds on OBS are failing with the missing dir entries:

    /usr/share/ceph
    /usr/lib/ceph

On suse these correspond to:

    %dir %{_datarootdir}/ceph/
    %dir %{_libexecdir}/ceph/

Signed-off-by: Owen Synge <osynge@suse.com>

Merge pull request #4969 from ceph/wip-frag-asok

mds: add dirfrag split/merge asok commands

Merge pull request #5025 from majianpeng/librbd-remove-iohint

librbd: If objectmap tell object exist, don't send alloc_hint w/ write command

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

librbd: If objectmap tell object exist, don't send alloc_hint w/ write command.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #4929 from wonzhq/tracked-op

common: tracked op fixes

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

Merge pull request #4249 from wonzhq/rmattr

osd: return with ENOENT if object doesn't exist during rmattr

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

Merge pull request #5002 from SUSE/wip_fixes_to_rcceph

Fixes to rcceph script

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

Merge pull request #4983 from yuyuyu101/wip-setallochint-option

librbd: Add option to allow disabling issuing alloc hint

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

Merge pull request #4993 from ceph/wip-12064

mon: only send MMonMetadata to peer mons that support it

Reviewed-by: Joao Eduardo Luis <joao@suse.de>

Merge pull request #5005 from maxime1992/master

doc: Document include/str_list.h

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

doc: Document include/str_list.h
Fixes: #12050.
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>
Signed-off-by: Kévin CARADANT <kevin.caradant@gmail.com>
Signed-off-by: Gabriel SENTUCQ <perso@kazhord.fr>
Signed-off-by: Maxime ROBERT <maxime.robert1992@gmail.com>

Merge pull request #5017 from JordanDorne/master

doc: Replace requries with requires in python API doc

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

doc: Replace requries with requires in python API doc
Fixes: #12076
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>

Merge pull request #4989 from ltoto2/master

 doc: Adding a link to documentation on admin socket

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

doc: Adding a link to documentation on admin socket

Fixes: #11845
Signed-off-by: Thomas Laumondais <thomas.laumondais@gmail.com>

Bug fix to ceph systemV compatability script.

Was failing with more than one OSD / MON deamon on a single node.
Fixes suse bugzilla #927862

Signed-off-by: Owen Synge <osynge@suse.com>

Merge pull request #5011 from robin974/master

doc: Fixes a missing dot

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

Merge pull request #5006 from Claire1293/master

doc: dev/differences-from-posix

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

Merge pull request #4987 from Aeryax/master

doc: Replaced "disk or drive" by "disk" in ceph-disk.rs

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

doc: Fixes a missing dot

Fixes: #12072
Signed-off-by: Robin Tang <robintang974@gmail.com>

Merge pull request #5008 from jr31/master

doc: Unify ID format

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

Merge pull request #5007 from Cleminou/master

doc: Fixes a missing word in a printed string

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

doc: dev/differences-from-posix
Fixes: #11108
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>

doc: Unify ID format

Fixes: #12071
Signed-off-by: Jean-Rémi Deveaux <jeanremi.deveaux@gmail.com>

doc: Fixes a missing word in a printed string

Fixes: #11106
Signed-off-by: Clement Lebrun <clement.lebrun.31@gmail.com>

Merge pull request #5004 from arthurgorjux/master

doc: Remove `` before and after 'ceph -s' in titles

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

doc: Replaced "disk or drive" by "disk" in ceph-disk.rs
Fixes: #12062
Signed-off-by: Gabriel SENTUCQ <perso@kazhord.fr>

Merge pull request #5003 from Oxygen31/master

doc : Change of "create" in "add"

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

Merge pull request #4954 from JevonQ/add-iov-support-in-libcephfs

libcephfs: add ceph_p{read,write}v

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

doc: Remove `` before and after 'ceph -s' in titles
Fixes: #12059
Signed-off-by: Arthur Gorjux <arthurgorjux@gmail.com>

doc : Change of "ceph-deploy mon create {ceph-node}" with "ceph-deploy mon add {ceph-node}" in "Quick-ceph-deploy.rst"

Fixes : #10293

Signed-off-by : Germain CHIPAUX <germain.chipaux@gmail.com>

Merge pull request #4986 from nicolasyong/master

doc: Modification of a sentence

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

doc: Modification of a sentence.

Fixes : #12057

Signed-off-by: Nicolas Yong <nicolas.yong93@gmail.com>

Merge pull request #4988 from kevincaradant/master

doc: ceph-deploy man page: typo

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

Fixes to rcceph script

 - only start OSDs if mon daemons are also present
 - adds support for mask and unmask
 - removes support for cluster with non default cluster name,
   as this was very limited and inconsistent
 - Reapplied from a patch as could not cherry-pick
   66cb46c411d874be009c225450eea5021cf1219b from Mon Jan 12
   as this produced issues with src/gmock

Signed-off-by: Owen Synge <osynge@suse.com>

Merge pull request #4931 from yuyuyu101/wip-perf-msgr

PerfMsgr: A tool to benchmark messenger module

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

Merge pull request #4994 from liewegas/wip-mon-fixes

mon: fix warning, and get_bucket_utilization

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

Merge pull request #3566 from majianpeng/librbd-cache-iohint

Librbd cache iohint

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

Merge branch 'next'

Merge remote-tracking branch 'origin/wip-11579' into next

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

Merge branch 'next'

librbd: flush operations need to acquire owner lock

Cache writeback operations will expect the owner lock to be held.

Fixes: #11938
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #4990 from ilc/f22-build

Fix the build on Fedora 22.

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

Merge branch 'next'

Merge remote-tracking branch 'origin/wip-11537' into next

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

Merge pull request #4992 from maxime1992/master

doc: Change the type of list in doc

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

mon/OSDMonitor: fix get_bucket_utilization return value

Broken in cc5f144a51d10f30e71b96c888a8d2a125e7c9b1.

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

mon: only send MMonMetadata to peer mons that support it

Avoid sending this to mons that don't support the feature or else they
will reset the connection and we'll go into a busy reconnect loop.

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

configure.ac: Fix JUnit 4 detection on Fedora 22.

This allows the build to detect JUnit 4 on Fedora 22, by adding
junit.jar as a valid jar name for JUnit 4.

Signed-off-by: Ira Cooper <ira@samba.org>

doc: Change the type of list in doc
Fixes: #12061.
Signed-off-by: Maxime ROBERT <maxime.robert1992@gmail.com>

Merge pull request #4975 from mikulely/master

Fix typos in librados example code

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

doc: ceph-deploy man page: typo #12063
Replace is initial monitor hostname with is the initial monitor hostname
Fixes : #12063
Signed-off-by: CARADANT Kevin <kevin.caradant@gmail.com>

Fix typos in librados example code

Signed-off-by: Jiaying Ren <mikulely@gmail.com>

Merge pull request #4985 from yannick-ad/master

doc: replace a sentence by another

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

Merge pull request #4979 from GaelFG/patch-1

doc: Fixes the description of the purpose of a cache pool

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

Merge pull request #4984 from LucasFantinel/master

doc: Wrong restriction for a daemon's ID

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

doc: replace a sentence by another
Fixes: #12060
Signed-off-by: Yannick Atchy-Dalama <yannick.atchy.dalama@gmail.com>

doc: Purpose of a cache pool

Completing the description of the cache purpose.
Fixes : #11096
Signed-off-by: Gael Fenet-Garde <gael.fenet.garde@gmail.com>

doc: Wrong restriction for a daemon's ID

Fixes: #12058
Signed-off-by: Fantinel Lucas <lucas.fantinel@gmail.com>

Merge pull request #4920 from SUSE/wip_ceph_spec_mandir

The file lists in spec files do expect that man pages are built so we better explicitly state that intention in spec file.

Merge pull request #4974 from SUSE/wip_ceph_spec_buildep_python_sphinx

We need this in master to make fedora and rhel7 builds work.

librbd: Add option to allow disabling issuing alloc hint

For HDD osd backend, a alloc hint is good for local filesystem to ensure
extent continuous. But for SSD, the available capacity is useful and
precious, user may not expect lots of capacity is used by reserving.
Then ssd is good for random rw.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

ceph_spec buildep python sphinx for fedora

Fedora, suse as well as centos >= 7 and rhel >= 7
use the same name for python-sphinx so add these
conditionals.

Note: Until OBS supports EPEL I cant test builds on
centos and rhel so this extention of build deps is
untested by Owen Synge.

Signed-off-by: Owen Synge <osynge@suse.com>

Merge pull request #4948 from vumrao/wip-rbd-11822

[rbd] support G/T units in rbd create/resize

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Sage Weil <sweil@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #3894 from rzarzynski/wip-rgw_swift_account_metadata

rgw: add support for metadata on Swift account

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

Bug fix for man file packaging.

Always compile and install man pages when making rpm.

Signed-off-by: Owen Synge <osynge@suse.com>

Merge pull request #4833 from liewegas/wip-11500

allow very small cursh weights for osds

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

Merge pull request #4971 from theanalyst/doc/pgp-num

doc: explain about pgp num

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

Merge pull request #4968 from tchaikov/wip-update-ceph-deploy-manpage

doc: sync ceph-deploy's man page with the code

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

[rbd] support G/T units in rbd create/resize

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>

doc: explain about pgp num

Explain the significance of pgp num & how it differs from pg num.

Fixes: #10035
Reported-by: Loic Dachary <loic@dachary.org>
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>

Bug fix for man file packaging.

explicitly included man pages.

Original fix used %{_mandir}/*/* but this could potentially lead to ambiguity
as ceph rpm spec file contains many man pages for different packages.

Signed-off-by: Owen Synge <osynge@suse.com>

Merge pull request #4967 from ceph/wip-tarball-11758

qa: update to newer Linux tarball

qa: update to newer Linux tarball

This should make newer gcc releases happier in their default configuration.
kernel.org is now distributing tarballs as .xz files so we change to that
as well when decompressing (it is supported by Ubuntu Precise so we should
be all good).

Fixes: #11758
Signed-off-by: Greg Farnum <gfarnum@redhat.com>

doc: sync ceph-deploy's man page with the code

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

Merge pull request #4964 from ceph/wip-12019

qa: use "sudo rmdir" to remove test data of multiple_rsync.sh

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

qa: use "sudo rmdir" to remove test data of multiple_rsync.sh

Fixes: #12019
Signed-off-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #4959 from ceph/wip-crush-compat

Add crush_compat.h to eliminate ad hoc diff between kernel and userspace

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

doc/messenger: Add doc for ceph_perf_server/client

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Merge pull request #4956 from oritwas/fix-cmake-2

cmake: add missing RadosDump.cc, RadosImport.cc and PoolDump.cc

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

libcephfs: add ceph_p{read,write}v

Fix comments raised by John Spray

Signed-off-by: Jevon Qiao <qiaojianfeng@unitedstack.com>

crush: add crush_compat.h

Move all the cruft that is necessary to compile shared files both in
kernel and userspace into a new crush_compat.h.  Also add a stub for
div64_s64() and limits for linux fixed width types.

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

crush: eliminate ad hoc diff between kernel and userspace

- map->choose_tries is not in the kernel
- 64-bit/64-bit in the kernel needs a special helper for 32-bit
  architectures, crush_compat.h provides a stub
- INT64_MIN is not in the kernel, crush_compat.h provides S64_MIN
- use dprintk inside DEBUG_INDEP sections

No functional changes.

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

Merge pull request #4826 from xinxinsh/wip-fix

os/DBObjectMap:move iterator to first record of object otherwise iter->valid is always false

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

mds: add dirfrag split/merge asok commands

Analogous to those from the old-style mds tell.  Also
add an 'ls' that gives you the frags in the same format
that frag_t::parse expects them, so that it's a bit
less obscure to use.

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

crush: shared files should use kernel-doc

This reverts mapper.c hunks of 830752a52841 ("doc: fix doxygen
warnings").  It is shared with the kernel and uses kernel-doc for
in-code documentation.  If doxygen warnings are an issue, we should
probably just exclude the 7 shared files in Doxyfile - we don't have
@file in these files or EXTRACT_ALL/EXTRACT_STATIC in Doxyfile, which
means these files are essentially skipped as there is no C++ stuff in
them.

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

crush: fix style issues in shared files

Fix some recently introduced style issues in crush_ln_table.h,
crush.[ch], hash.[ch], and mapper.[ch].  These files are shared with
the kernel, so we need to at least not introduce anything new -
checkpatch is pretty unhappy as it is.

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

crush: move safe arithmetic functions to buider.c

Given that crush_{addition,multiplication}_is_unsafe() are only used
for compiling maps, they have no business in crush.c which is shared
with the kernel.

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

libcephfs: add test for ceph_p{read,write}v

Add test in src/test/libcephfs/test.cc for ceph_preadv and ceph_pwritev interfaces.

Signed-off-by: Jevon Qiao <qiaojianfeng@unitedstack.com>

cmake: add missing RadosDump.cc, RadosImport.cc and PoolDump.cc

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

libcephfs: add ceph_p{read,write}v

Add interfaces in libcephfs to enable users to read/write data via iovec structure.

Signed-off-by: Jevon Qiao <qiaojianfeng@unitedstack.com>

 objectstore/store_test.cc : add tests for DBObjectMap::get_keys

Signed-off-by: xinxin shu <xinxin.shu@intel.com>

os/DBObjectMap : fix recurcive lock in get_keys

1. get_keys obtain header lock of oid
2. get iterator with get_iterator(oid), in get_iterator, it also want to get header lock of oid

Signed-off-by: xinxin shu <xinxin.shu@intel.com>

os/DBOjectMap : iter->valid is always false if we do not initialize the iterator with init(), seek_to_first will initialize this iterator

Signed-off-by: xinxin shu <xinxin.shu@intel.com>

Merge pull request #4690 from branch-predictor/wip-radosbench-memjuggle

tools: improve the performance of rados and rest_bench

Don't delete, recreate and re-fill buffers in rados bench. Fixes the high CPU usage by rados bench on fast SSDs
and ramdisks/memstore.

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

Merge pull request #4950 from SUSE/wip-osd-spelling

osd_types.{cc,h}: fix three typos in comments

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

osd_types.{cc,h}: fix three typos in comments

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

Merge pull request #4758 from xinxinsh/wip-kv-dump-transaction

dump keyvaluestore transaction to a file

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>

Merge pull request #4940 from swamireddy/wip-v094-mailmap

mailmap: Yuri Weinstein affiliation

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