doc: dev/differences-from-posix
Fixes: #11108
Signed-off-by: Claire MASSOT <claire.massot93@gmail.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>

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>

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>

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>

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>

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>

Merge remote-tracking branch 'gh/next'

Merge pull request #4910 from dachary/wip-11932-non-regression-typo

tests: ceph_erasure_code_non_regression s/stipe/stripe/

Merge pull request #4873 from liewegas/wip-rgw-civetweb-port

rgw: strip off port from HTTP_HOST when determining bucket from URL

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

Merge pull request #4838 from ceph/wip-10950

#10950: Fix confusing errors using "mds rm"

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

Merge pull request #4835 from ceph/wip-11746

tools: chunk reads in Dumper

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

Merge pull request #4825 from tchaikov/wip-drop-ignored-mdsbeacon

mon: drop ignored mdsbeacon

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>

tests: erasure-code non regression tests must skip isa on i386

When the isa plugin is not present, the isa plugin payloads are not
tested. When that happens, remember that it was intentional by storing
the path that would have been tested so that the inventory is complete.

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

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

rgw: fix data corruption when race condition

We should delete the object in the multipart namespace lastly to prevent a previous upload
wrongly deleting objects belong to the following upload.

Fixes: #11749
Signed-off-by: wuxingyi <wuxingyi@letv.com>

Merge pull request #4707 from stiopaa1/IosFwdNew

Removed unnecessary inclusion of iostream in several files

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

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

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

mon/PGMap: access num pgs by osd

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

mon/PGMap: fix pg_by_osd

Broken since it was introduced in 7a04762fe09661cc2ac98a034626912ec0583116.

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

rgw: remove trailing :port from host for purposes of subdomain matching

Some clients (ahem, CrossFTP) include the :port in the HTTP_HOST header.
Strip it out.

Switch req_info field to a std::string and avoid copying it in preprocess.

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

Merge pull request #4775 from yuyuyu101/wip-async-crc-decouple

AsyncMessenger: Make send/receive logic independent

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

tests: ceph_erasure_code_non_regression s/stipe/stripe/

Synchronize withe the ceph-erasure-code-corpus submodule in which all
file names were modified to fix the typo.

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

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

Merge pull request #4815 from dachary/wip-9720-erasure-code-corpus-variants

tests: sync ceph-erasure-code-corpus to verify jerasure variants

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>

Merge pull request #4908 from dachary/wip-11931-parallel-tests

tests: automake 1.11 needs parallel-tests

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

tests: automake 1.11 needs parallel-tests

Prior to automake 1.13 the default behavior was serial-tests meaning
tests from make check were run one after the other and their output sent
to stdout/stderr. From automake 1.13 up the default became
parallel-tests which logs the output of each individual test in a
separate .log file and allows them to run in parallel.

http://lists.gnu.org/archive/html/automake/2012-12/msg00038.html

Enable parallel-tests so that tests can always run in parallel, even
with automake 1.11 which is the version found in CentOS 6.5 and Ubuntu
12.04 precise.

A nice side effect of always having the logs in separate files is that
tests do not need to worry about being too verbose because their output
will only be read for diagnostic purposes.

http://tracker.ceph.com/issues/11931 Fixes: #11931
http://tracker.ceph.com/issues/11906 Fixes: #11906

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

Removed unnecessary inclusion of iostream

In several files the iostream wasn't being used, so it got removed.
In other files the iostream inclusion was replaced by including iosfwd
(for forward declarations), which is much smaller header than iostream,
  so in theory should reduce compilation time.
To make this work some of the functions must have been moved from .h to .cc file.
3 functions also needed to have inline removed - this shouldn't affect
performance in any way: two of them are
probably too long to have been inlined anyway and the third one is for
error reporting, so probably won't be called too often.

test/Makefile-client.am: added linker libs

This was required to avoid linker error when linking
src/test/cls_rbd/test_cls_rbd.cc file. Makefile was specyfing
libcommon.a as a part of a linker command even though this wasn't
required and wasn't being linked against. When inline functions from
buffer.h were moved to buffer.cc(and inline was removed) the
libcommon.a library became necessary. This wouldn't link without also
including additional libraries(CRYPTO_LIBS and EXTRA_LIBS)

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

Merge pull request #4879 from SUSE/wip-master-specfile-cleanup

ceph.spec.in: remove duplicate BuildRequires

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

Merge pull request #4784 from ceph/wip-10794

ceph-objectstore-tool improvements

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

Merge pull request #4903 from theanalyst/doc/arch-watch-notify

doc: architecture minor fixes in watch notify

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

doc: architecture minor fixes in watch notify

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>

ceph.spec.in: remove duplicate BuildRequires

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

Transaction Id added in response
Signed-off-by: Abhishek Dixit dixitabhi@gmail.com

Merge pull request #4880 from SUSE/wip-master-specfile-cleanup2

ceph.spec.in: move specific BuildRequires to where they belong

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

Merge pull request #4893 from dachary/wip-11272-ceph-disk-false-negative

tests: ceph-disk.sh test zap gitbuilder false negative

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

Merge pull request #4888 from dachary/wip-11905-test-isa

tests: skip isa tests if the plugin is not available

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

tests: ceph-disk.sh test zap gitbuilder false negative

When looking for an error message and testing ceph disk zap, use grep -q
to not display the error message that will be mistaken for a real error
by the gitbuilder parser.

http://tracker.ceph.com/issues/11272 Refs: #11272

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

tests: skip isa tests if the plugin is not available

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

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

tests: use erasure_code_plugin_exists from ceph-helpers.sh

Instead of the local plugin_exists helper that does the same.

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

tests: implement erasure_code_plugin_exists in ceph-helpers.sh

Return 0 if the erasure code *plugin* is available, 1 otherwise.

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

Merge pull request #4713 from dachary/wip-10358-erasure-code-k-1-m-1

ceph osd erasure-code-profile set myprofile k=1 should fail

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>