doc: Fixed the picture on page http://ceph.com/docs/master/cephfs/

Fixes: #9174
Signed-off-by Valentin Thomas <valentin.arshanes.thomas@gmail.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>

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>

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.

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>

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>

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>

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>

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>

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

Signed-off-by: Orit Wasserman <owasserm@redhat.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>

Merge pull request #4947 from oritwas/fix-cmake

cmake: Remove rados_sync.cc, rados_import.cc and rados_export.cc deleted files

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

Remove rados_sync.cc, rados_import.cc and rados_export.cc deleted files

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

mon: add 'PGs' column to 'ceph osd df'

Fixes: #11882
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #4752 from wuxingyi/wip-11749

rgw: fix data corruption when race condition

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

Merge pull request #4900 from abhidixit/trans_id

Transaction Id added in response for S3 and Swift requests

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

mailmap: Yuri Weinstein affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

Merge pull request #4726 from tchaikov/wip-11680-check-empty-crushmap

mon: check new crush for unknown name/type

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

Merge pull request #4932 from dzafman/wip-cot-import

test, tools: Improve ceph-objectstore-tool import error handling and …

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

Merge pull request #4933 from dachary/wip-releases

doc: add v0.94.2 to the release timeline

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

doc: add v0.94.2 to the release timeline

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

test, tools: Improve ceph-objectstore-tool import error handling and add tests

Signed-off-by: David Zafman <dzafman@redhat.com>

Merge pull request #4926 from dzafman/wip-omaptool

ceph-osdomap-tool: Fix argument handling

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

PerfMsgr: Add usage helper info

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

Merge pull request #4914 from liewegas/wip-mon-pg-by-osd

mon: fix pg_by_osd in PGMap

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

PerfMsgr: Make Server worker threads configurable

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

PerfMsgr: Add tips for running ceph_perf_msgr

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

debian, rpm: Add ceph_perf_msgr_* to build file

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

PerfMsgr: Add messenger perf tools

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

Merge pull request #4930 from ceph/wip-11959

qa: use "sudo cp" in multiple_rsync.sh

qa: use "sudo cp" in multiple_rsync.sh

VirtualBox has some files with weird
permissions in its /usr/lib, which was
tripping up this usually-safe operation
when run as an unprivileged user.

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

Merge pull request #4921 from dachary/wip-11952-test-ceph-disk

tests: ceph-disk tests need to install pip > 6.1

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

ceph-osdomap-tool: Fix argument handling

Signed-off-by: David Zafman <dzafman@redhat.com>

mon/PGMap: fix pgmap stat adjustment during map_pg_creates()

PGMonitor::map_pg_creates() is the only caller that passes sumonly=true,
which is necessary to avoid modifying creating_pgs while it is iterating
over it. However, everything else we *do* want to update--especially the
osd counts.

Rename the arg and skip only the creating bit.

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

Merge pull request #4863 from ceph/wip-9964-nosharding

rados import/export (minus pgls sharding)

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

test: Add --dry-run and --no-overwrite testing of rados import

Signed-off-by: David Zafman <dzafman@redhat.com>

tools/rados: dry-run/no-overwrite args for import

These were supported by the old objectstoretool
hook into RadosImport: wire them up here too.

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

tools: better error message in objectstoretool

...for the case where someone exports a pool
with "rados export" and then tries to import
it into a PG.

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

test: Switch ceph-objectstore-tool import-rados to rados import

Signed-off-by: David Zafman <dzafman@redhat.com>

tools: remove objectstoretool's rados-import

Same functionality now exposed as "rados import".

This removes objectstoretool's librados dependency.

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

tools: remove old rados_sync code

This is the code that used to sit behind the
old import/export commands that have been
disabled for some time.

Replaced by the new import/export commands.

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

tools: implement rados import/export

New PoolDump (export) class to dump pool contents
in format compatible with ceph-objectstore-tool,
and wire up RadosImport class (import).

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

tools: refactor RadosImport to pass ioctx

Callers from rados.cc will already have an ioctx,
whereas objectstoretool passes in a pool name.

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

tools: remove RadosDump::debug in favour of dout

This attribute was a hangover from objectstore-tool

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

tools: add support for pool exports in RadosImport

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

tools: clean up errors in ceph-objectstore-tool

We use negative error codes everywhere else, should
use them here too.  Also add a couple of strategically
placed prints.

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

tools: refactor objectstore tool

...to expose the definitions of the object dump
format (RadosDump) for use in rados import/export.

The serialized->RADOS code is now RadosImport, and
the serialized->ObjectStore code is ObjectStoreTool.

This is a step toward #9964, which should use the
same on serialization format as the existing
objectstore-tool dumps.

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

Merge pull request #4922 from dachary/wip-releases

doc: add v9.0.1 to the release timeline

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

doc: add v9.0.1 to the release timeline

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

doc/release-notes: v0.94.2

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

doc/release-notes: v9.0.1

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

tests: ceph-disk tests need to install pip > 6.1

Otherwise it will not be able to use the wheelhouse.

http://tracker.ceph.com/issues/11952 Fixes: #11952

Signed-off-by: Loic Dachary <loic@dachary.org>

Merge pull request #4915 from ceph/wip-cot-list

tools: For ec pools list objects in all shards if the pgid doesn't sp…

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