]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agospec.in: sphinx -b man needs sphinx > 1.0 (part 2) 4287/head
Loic Dachary [Tue, 7 Apr 2015 09:47:28 +0000 (11:47 +0200)]
spec.in: sphinx -b man needs sphinx > 1.0 (part 2)

Instead of listing the operating system versions that do not require the
python-sphinx10 package, switch to listing the operating system versions that
require the python-sphinx10 package. It's easier to maintain because
there only are a few.

Signed-off-by: Loic Dachary <ldachary@rehdat.com>
10 years agoMerge pull request #4238 from ceph/wip-9580
Loic Dachary [Mon, 6 Apr 2015 10:15:38 +0000 (12:15 +0200)]
Merge pull request #4238 from ceph/wip-9580

ceph-disk: make journal setup conditional on osd backend

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4244 from dachary/wip-9580 4238/head
Sage Weil [Mon, 6 Apr 2015 00:25:05 +0000 (17:25 -0700)]
Merge pull request #4244 from dachary/wip-9580

tests for ceph-disk: make journal setup conditional on osd backend

10 years agotests: add ceph-disk.sh activate for memstore 4244/head
Loic Dachary [Wed, 1 Apr 2015 14:36:09 +0000 (16:36 +0200)]
tests: add ceph-disk.sh activate for memstore

Add a test for the activation of the memstore objectstore and verify
that it works without specifying a journal.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: move rados put/get tests in a function
Loic Dachary [Wed, 1 Apr 2015 14:31:05 +0000 (16:31 +0200)]
tests: move rados put/get tests in a function

Add the test_pool_read_write function to share the rados put / get test
that demonstrate the osd that has been created can actually be used. Use
it from the both the regular device and dmcrypt tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-disk.sh dmcrypt tests use test_setup_dev_and_run
Loic Dachary [Wed, 1 Apr 2015 13:01:25 +0000 (15:01 +0200)]
tests: ceph-disk.sh dmcrypt tests use test_setup_dev_and_run

Instead of duplicating the device construction / destruction logic for
dmcrypt tests, use test_setup_dev_and_run to do it. It is now able to
recover from devmapper leftover which may occur when a cryptsetup test
fails.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: merge ceph-disk.sh activate dmcrypt functions
Loic Dachary [Wed, 1 Apr 2015 12:58:43 +0000 (14:58 +0200)]
tests: merge ceph-disk.sh activate dmcrypt functions

The activate_dmcrypt_plain_dev_body and activate_dmcrypt_dev_body
functions are almost identical, merge them and differentiate with an
argument.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: add test_setup_dev_and_run to ceph-disk.sh
Loic Dachary [Wed, 1 Apr 2015 12:54:10 +0000 (14:54 +0200)]
tests: add test_setup_dev_and_run to ceph-disk.sh

Move test_activate_dev to test_setup_dev_and_run and make it
run the function given in argument. test_activate_dev calls
test_setup_dev_and_run and no longer needs to implement device
allocation or destruction.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: improve ceph-disk.sh setup/teardown
Loic Dachary [Wed, 1 Apr 2015 12:44:17 +0000 (14:44 +0200)]
tests: improve ceph-disk.sh setup/teardown

Address all possible failure cases, when ceph-disk.sh completes or when
it starts with leftover from a previous interrupted run. It is assumed
that ceph-disk.sh will crash at any point.

* umount all mount points that belong to ceph-disk.sh (check the
  absolute path of the directory)
* dmsetup remove all device mapper nodes found to hold a loop device
  that ceph-disks.sh no longer uses
* losetup --detach all loop devices that ceph-disks.sh no longer uses

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: do not use -e in ceph-disk.sh
Loic Dachary [Wed, 1 Apr 2015 12:38:29 +0000 (14:38 +0200)]
tests: do not use -e in ceph-disk.sh

The tests explicitly return on error when relevant. Add two error cases:

* detect when the allocation of a loop device fails.
* in the outer loop, return immediately if one of the test fails

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: reduce ceph-disk.sh verbosity
Loic Dachary [Wed, 1 Apr 2015 12:35:34 +0000 (14:35 +0200)]
tests: reduce ceph-disk.sh verbosity

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4256 from dachary/wip-dumpling-release-notes
Sage Weil [Sun, 5 Apr 2015 17:35:26 +0000 (10:35 -0700)]
Merge pull request #4256 from dachary/wip-dumpling-release-notes

doc/release-notes: final dumpling v0.67.12 release notes

10 years agoMerge pull request #4263 from dachary/wip-man-install
Kefu Chai [Fri, 3 Apr 2015 02:25:36 +0000 (10:25 +0800)]
Merge pull request #4263 from dachary/wip-man-install

rhel 6 needs python-sphinx10

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoman: using sphinx-1.0-build if no sphinx-build 4263/head
Loic Dachary [Thu, 2 Apr 2015 23:46:36 +0000 (01:46 +0200)]
man: using sphinx-1.0-build if no sphinx-build

On RHEL 6 and CentOS 6 sphinx 1.0+ which is required to build man pages
is packaged as sphinx10 instead of sphinx and the binary is
sphinx-1.0-build instead of sphinx-build.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agospec.in: sphinx -b man needs sphinx > 1.0
Loic Dachary [Thu, 2 Apr 2015 23:38:15 +0000 (01:38 +0200)]
spec.in: sphinx -b man needs sphinx > 1.0

It is used to build the man pages.

Signed-off-by: Loic Dachary <ldachary@rehdat.com>
10 years agoMerge pull request #4115 from dzafman/wip-dzmanfix
Loic Dachary [Thu, 2 Apr 2015 23:33:07 +0000 (01:33 +0200)]
Merge pull request #4115 from dzafman/wip-dzmanfix

doc, mon: Add ceph osd pool get <poolname> all to man page

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4262 from dachary/wip-man-install
Loic Dachary [Thu, 2 Apr 2015 22:55:55 +0000 (00:55 +0200)]
Merge pull request #4262 from dachary/wip-man-install

man: add conf.py to the list of distributed files

10 years agoman: add conf.py to the list of distributed files 4262/head
Loic Dachary [Thu, 2 Apr 2015 22:22:01 +0000 (00:22 +0200)]
man: add conf.py to the list of distributed files

Otherwise packages won't build as it's not included in the tarbal.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4260 from nilamdyuti/wip-doc-ceph-object-gateway
Loic Dachary [Thu, 2 Apr 2015 21:25:14 +0000 (23:25 +0200)]
Merge pull request #4260 from nilamdyuti/wip-doc-ceph-object-gateway

Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway docs

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4149 from objoo/mailmap-for-hammer-2
Loic Dachary [Thu, 2 Apr 2015 21:19:01 +0000 (23:19 +0200)]
Merge pull request #4149 from objoo/mailmap-for-hammer-2

mailmap for hammer / master 2nd batch

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Ian Kelling affiliation 4149/head
Yann Dupont [Wed, 25 Mar 2015 21:00:45 +0000 (22:00 +0100)]
mailmap: Ian Kelling affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Vartika Rai affiliation
Yann Dupont [Wed, 25 Mar 2015 20:57:41 +0000 (21:57 +0100)]
mailmap: Vartika Rai affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Alexandre Marangone affiliation
Yann Dupont [Wed, 25 Mar 2015 20:55:41 +0000 (21:55 +0100)]
mailmap: Alexandre Marangone affiliation

(probably a previous typo)

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Steve Capper affiliation
Yann Dupont [Wed, 25 Mar 2015 20:48:07 +0000 (21:48 +0100)]
mailmap: Steve Capper affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Simon Guinot affiliation
Yann Dupont [Wed, 25 Mar 2015 20:41:05 +0000 (21:41 +0100)]
mailmap: Simon Guinot affiliation

(somewhat reverse 2afe1e3c4419fb0638d6ed21a83d8204675cd29e )

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Simon Guinot <simon.guinot@sequanux.org>
10 years agomailmap: Yazen Ghannam affiliation
Yann Dupont [Wed, 25 Mar 2015 20:39:35 +0000 (21:39 +0100)]
mailmap: Yazen Ghannam affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Lee Revell affiliation
Yann Dupont [Mon, 23 Mar 2015 21:41:21 +0000 (21:41 +0000)]
mailmap: Lee Revell affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Zhi (David) Zhang affiliation
Yann Dupont [Mon, 23 Mar 2015 21:31:43 +0000 (21:31 +0000)]
mailmap: Zhi (David) Zhang affiliation
And name normalization

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Bosse Klykken affiliation
Yann Dupont [Mon, 23 Mar 2015 21:23:33 +0000 (21:23 +0000)]
mailmap: Bosse Klykken affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Dmitry Yatsushkevich affiliation
Yann Dupont [Mon, 23 Mar 2015 21:21:04 +0000 (21:21 +0000)]
mailmap: Dmitry Yatsushkevich affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Greg Farnum affiliation
Yann Dupont [Mon, 23 Mar 2015 21:17:04 +0000 (21:17 +0000)]
mailmap: Greg Farnum affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Boris Ranto affiliation
Yann Dupont [Mon, 23 Mar 2015 21:14:46 +0000 (21:14 +0000)]
mailmap: Boris Ranto affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Fix .gitignore for man directory 4115/head
David Zafman [Thu, 2 Apr 2015 18:45:13 +0000 (11:45 -0700)]
doc: Fix .gitignore for man directory

Caused by: 301fe6cbf2c8b04d0650fe60de65c3cdc7a8ac95

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Add ceph osd pool get <poolname> all to man page
David Zafman [Fri, 20 Mar 2015 22:34:14 +0000 (15:34 -0700)]
doc: Add ceph osd pool get <poolname> all to man page

Caused by: ea6192116cb1af4b8f4964cf7d5c69f164680205

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agomon: Add MIN_READ_RECENCY_FOR_PROMOTE to ONLY_TIER_CHOICES
David Zafman [Fri, 20 Mar 2015 22:56:16 +0000 (15:56 -0700)]
mon: Add MIN_READ_RECENCY_FOR_PROMOTE to ONLY_TIER_CHOICES

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Updates the radosgw man page with some changes. 4260/head
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:53:14 +0000 (23:23 +0530)]
doc: Updates the radosgw man page with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates simple gateway configuration file with some changes.
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:51:26 +0000 (23:21 +0530)]
doc: Updates simple gateway configuration file with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates gateway installation doc with some changes.
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:48:26 +0000 (23:18 +0530)]
doc: Updates gateway installation doc with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge branch 'wip-doc-ceph-object-gateway' of https://github.com/nilamdyuti/ceph...
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:35:22 +0000 (23:05 +0530)]
Merge branch 'wip-doc-ceph-object-gateway' of https://github.com/nilamdyuti/ceph into wip-doc-ceph-object-gateway

10 years agodoc: Updates the configuration of mod_proxy_fcgi in terms of localhost
Nilamdyuti Goswami [Thu, 2 Apr 2015 14:12:54 +0000 (19:42 +0530)]
doc: Updates the configuration of mod_proxy_fcgi in terms of localhost
tcp and unix domain socket.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in the simple gateway configuration doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:56:08 +0000 (19:26 +0530)]
doc: Corrects syntax highlighting in the simple gateway configuration doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in gateway installation doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:51:46 +0000 (19:21 +0530)]
doc: Corrects syntax highlighting in gateway installation doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates the simple gateway configuration doc with configuration for
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:19:58 +0000 (16:49 +0530)]
doc: Updates the simple gateway configuration doc with configuration for
mod_proxy_fcgi instead of mod_fastcgi.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:14:38 +0000 (16:44 +0530)]
doc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
installation doc.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4142 from ceph/wip-no-more-dot-8
Loic Dachary [Thu, 2 Apr 2015 15:42:23 +0000 (17:42 +0200)]
Merge pull request #4142 from ceph/wip-no-more-dot-8

doc: generate man pages in man/Makefile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Updates the configuration of mod_proxy_fcgi in terms of localhost
Nilamdyuti Goswami [Thu, 2 Apr 2015 14:12:54 +0000 (19:42 +0530)]
doc: Updates the configuration of mod_proxy_fcgi in terms of localhost
tcp and unix domain socket.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4220 from jdurgin/wip-librados-global-flags
Loic Dachary [Thu, 2 Apr 2015 14:02:55 +0000 (16:02 +0200)]
Merge pull request #4220 from jdurgin/wip-librados-global-flags

Revert "librados: remove the unused flags."

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Corrects syntax highlighting in the simple gateway configuration doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:56:08 +0000 (19:26 +0530)]
doc: Corrects syntax highlighting in the simple gateway configuration doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in gateway installation doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:51:46 +0000 (19:21 +0530)]
doc: Corrects syntax highlighting in gateway installation doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates the simple gateway configuration doc with configuration for
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:19:58 +0000 (16:49 +0530)]
doc: Updates the simple gateway configuration doc with configuration for
mod_proxy_fcgi instead of mod_fastcgi.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:14:38 +0000 (16:44 +0530)]
doc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
installation doc.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4201 from tchaikov/xlist-iterator
Loic Dachary [Thu, 2 Apr 2015 10:49:30 +0000 (12:49 +0200)]
Merge pull request #4201 from tchaikov/xlist-iterator

xlist: add compare operator for iterator

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc/release-notes: final dumpling v0.67.12 release notes 4256/head
Loic Dachary [Thu, 2 Apr 2015 09:52:47 +0000 (11:52 +0200)]
doc/release-notes: final dumpling v0.67.12 release notes

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4068 from dachary/wip-opensuse
Loic Dachary [Thu, 2 Apr 2015 09:32:09 +0000 (11:32 +0200)]
Merge pull request #4068 from dachary/wip-opensuse

tests: add OpenSUSE 13.2 dockerfile

Reviewed-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4221 from xiaoxichen/rbd_discard_skip
Josh Durgin [Wed, 1 Apr 2015 17:35:58 +0000 (10:35 -0700)]
Merge pull request #4221 from xiaoxichen/rbd_discard_skip

Add rbd_discard_skip_zeroing flag

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4213 from xiaoxichen/wip-new-rocksdb
Sage Weil [Wed, 1 Apr 2015 17:05:03 +0000 (10:05 -0700)]
Merge pull request #4213 from xiaoxichen/wip-new-rocksdb

RocksDB configuration

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4208 from dmitryya/ceph_argparse_improvement
Kefu Chai [Wed, 1 Apr 2015 13:38:55 +0000 (21:38 +0800)]
Merge pull request #4208 from dmitryya/ceph_argparse_improvement

ceph_argparse: Remove code duplication and generalize ceph_argparse_with* routines

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoAdd rbd_skip_partial_discard flag 4221/head
Xiaoxi Chen [Mon, 30 Mar 2015 11:56:59 +0000 (19:56 +0800)]
Add rbd_skip_partial_discard flag

If we want to discard a range of an object, we will zero(use fallocate
to punch a hole) the range now. In general this introduce some overhead(extra writes).

If the filesystem ontop of RBD holding lots of small files, this
behavior will bring big performance penalty.

Adding a flag that allow user to control if they want to zero the
range.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoceph-disk: follow ceph-osd hints when setting up journal
Sage Weil [Wed, 1 Apr 2015 00:19:32 +0000 (17:19 -0700)]
ceph-disk: follow ceph-osd hints when setting up journal

- If the journal is required, require it.
- If the journal is not allowed, do not allow one to be specified
- If the journal is not wanted, to not set one up by default when none is
provided.

See #9580

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-osd: add --check-wants-journal, --check-allows-journal
Sage Weil [Tue, 31 Mar 2015 20:49:35 +0000 (13:49 -0700)]
ceph-osd: add --check-wants-journal, --check-allows-journal

Completes OSD side of #9580

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-osd: fix usage
Sage Weil [Tue, 31 Mar 2015 20:44:08 +0000 (13:44 -0700)]
ceph-osd: fix usage

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4235 from ceph/wip-rbd-unit-tests
Josh Durgin [Tue, 31 Mar 2015 19:36:18 +0000 (12:36 -0700)]
Merge pull request #4235 from ceph/wip-rbd-unit-tests

tests: exercise all RBD features during unit testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4232 from ceph/fix-make-conf
Josh Durgin [Tue, 31 Mar 2015 19:34:00 +0000 (12:34 -0700)]
Merge pull request #4232 from ceph/fix-make-conf

Fix make conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4236 from ceph/wip-verify-mds-journal-makefile
Gregory Farnum [Tue, 31 Mar 2015 19:27:34 +0000 (12:27 -0700)]
Merge pull request #4236 from ceph/wip-verify-mds-journal-makefile

mds: update Makefile for removed script

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: update Makefile for removed script 4236/head
John Spray [Tue, 31 Mar 2015 19:15:28 +0000 (20:15 +0100)]
mds: update Makefile for removed script

Oversight in "mds: remove verify-mds-journal.sh script"

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoceph_argparse: generalize ceph_argparse_with* routines 4208/head
Dmitry Yatsushkevich [Fri, 27 Mar 2015 22:34:24 +0000 (15:34 -0700)]
ceph_argparse: generalize ceph_argparse_with* routines

Remove code duplication by generalizing ceph_argparse_with{int,float,longlong}
routines - make one template function for those cases.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agorbd cli: remove erroneous arg for ceph_argparse_witharg
Dmitry Yatsushkevich [Wed, 25 Mar 2015 20:42:06 +0000 (13:42 -0700)]
rbd cli: remove erroneous arg for ceph_argparse_witharg

Remove erroneous arg for ceph_argparse_witharg call when '--io-pattern' parsed:
the name look up will point the compiler to bool ceph_argparse_witharg(
    std::vector<const char*> &args,
    std::vector<const char*>::iterator &i, std::string *ret, ...) when compiler
is resolving this function call. The &err argument will be wrongly interpreted
as a char * variable to be compared with the argument name pointed by i.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agotests: exercise all RBD features during unit test 4235/head
Jason Dillaman [Tue, 31 Mar 2015 18:28:54 +0000 (14:28 -0400)]
tests: exercise all RBD features during unit test

The librbd unit tests currently only test the old image format. Ensure
the new format and its possible features are also tested.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agomake: fix with_rbd guard 4232/head
Noah Watkins [Tue, 31 Mar 2015 17:46:10 +0000 (10:46 -0700)]
make: fix with_rbd guard

FileJournal needs stuff from blkdev.c in libcommon.

./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::_open_block_device()':
/home/nwatkins/src/ceph/src/os/FileJournal.cc:139: undefined reference to `get_block_device_size(int, long*)'
/home/nwatkins/src/ceph/src/os/FileJournal.cc:161: undefined reference to `block_device_support_discard(char const*)'
./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::do_discard(long, long)':
/home/nwatkins/src/ceph/src/os/FileJournal.cc:1587: undefined reference to `block_device_discard(int, long, long)'

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agomake: add with_rbd guard
Noah Watkins [Tue, 31 Mar 2015 17:43:49 +0000 (10:43 -0700)]
make: add with_rbd guard

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #4231 from ceph/wip-rm-verify-mds
Gregory Farnum [Tue, 31 Mar 2015 17:08:53 +0000 (10:08 -0700)]
Merge pull request #4231 from ceph/wip-rm-verify-mds

mds: remove verify-mds-journal.sh script

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: remove verify-mds-journal.sh script 4231/head
John Spray [Tue, 31 Mar 2015 16:45:21 +0000 (17:45 +0100)]
mds: remove verify-mds-journal.sh script

This invokes the MDS in a way that it no longer understands,
and is unused.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4211 from ceph/wip-11120
Gregory Farnum [Tue, 31 Mar 2015 16:26:04 +0000 (09:26 -0700)]
Merge pull request #4211 from ceph/wip-11120

osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size

Reviewed-by: John Spray <jspray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4225 from Fale/patch-1
Kefu Chai [Tue, 31 Mar 2015 16:05:51 +0000 (00:05 +0800)]
Merge pull request #4225 from Fale/patch-1

doc: fix the architecture diagram in cephfs.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: fix the architecture diagram in cephfs.rst 4225/head
Fabio Alessandro Locati [Tue, 31 Mar 2015 08:33:59 +0000 (10:33 +0200)]
doc: fix the architecture diagram in cephfs.rst

Signed-off-by: Fabio Alessandro Locati <fabio@locati.cc>
10 years agoMerge pull request #4215 from ceph/wip-11258
John Spray [Tue, 31 Mar 2015 13:23:19 +0000 (14:23 +0100)]
Merge pull request #4215 from ceph/wip-11258

Wip 11258

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoSet disableDataSync to false 4213/head
Xiaoxi Chen [Mon, 30 Mar 2015 07:56:07 +0000 (15:56 +0800)]
Set disableDataSync to false

If datasync is disabled, we may potentially lose data
on power failure.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoUpdate RocksDB configuration to make it more clear
Xiaoxi Chen [Fri, 27 Mar 2015 08:08:10 +0000 (16:08 +0800)]
Update RocksDB configuration to make it more clear

Add some performance critial configurations

Also group and polish the description of each configuration
to make it more clear, changed the default from 0 to actual
value.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)]
Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock
src/osd/ReplicatedPG.cc

10 years agolibrados: define C++ global flags from the C constants 4220/head
Josh Durgin [Mon, 30 Mar 2015 22:29:17 +0000 (15:29 -0700)]
librados: define C++ global flags from the C constants

This will help prevent drift in the future. It also makes it clear
that the flags are supposed to have the same values.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agotest: add librados global op flags test
Josh Durgin [Mon, 30 Mar 2015 21:33:19 +0000 (14:33 -0700)]
test: add librados global op flags test

Just verify that the read gets the right data, to demonstrate that
passing a flag doesn't cause problems.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoos/KeyValueDB: skip experimental check for test_init
Sage Weil [Mon, 30 Mar 2015 22:12:55 +0000 (15:12 -0700)]
os/KeyValueDB: skip experimental check for test_init

We don't want to spit out the warning twice, and we don't have cct
anyway.

Also test_init is annoying; we should try to kill it.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoRevert "librados: remove the unused flags."
Josh Durgin [Mon, 30 Mar 2015 18:03:44 +0000 (11:03 -0700)]
Revert "librados: remove the unused flags."

This reverts commit 4bd2bd6bb89b70167de2f142008540238f682f6d.

These constants are the only way these flags are exposed through the C
interface. C users can't include librados.hpp.  Ideally we would have
only one version of these (just the C ones), but the C++ ones came
first and need to stay for backwards compatibility.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3878 from ceph/wip-dirty-pg-keys
Sage Weil [Mon, 30 Mar 2015 18:18:56 +0000 (11:18 -0700)]
Merge pull request #3878 from ceph/wip-dirty-pg-keys

osd: coalesce into single omap_setkeys for normal writes

Tested-by: Andreas Bluemle <andreas.bluemle@itxperts.de>
Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4212 from zhouyuan/isal_2.13
Loic Dachary [Mon, 30 Mar 2015 18:17:38 +0000 (20:17 +0200)]
Merge pull request #4212 from zhouyuan/isal_2.13

erasure-code: Update ISA-L to 2.13

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4160 from ceph/wip-rocksdb
Sage Weil [Mon, 30 Mar 2015 17:57:07 +0000 (10:57 -0700)]
Merge pull request #4160 from ceph/wip-rocksdb

update rocksdb

10 years agomark kinetic experimental 4160/head
Sage Weil [Mon, 30 Mar 2015 16:33:16 +0000 (09:33 -0700)]
mark kinetic experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomark rocksdb experimental
Sage Weil [Mon, 30 Mar 2015 16:33:00 +0000 (09:33 -0700)]
mark rocksdb experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4131 from t-miyamae/wip-mshec-documentation-h2
Loic Dachary [Mon, 30 Mar 2015 12:37:08 +0000 (14:37 +0200)]
Merge pull request #4131 from t-miyamae/wip-mshec-documentation-h2

erasure code: add shec's documentation / change default layout

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: fix out-of-order messages 4215/head
Yan, Zheng [Mon, 30 Mar 2015 09:35:59 +0000 (17:35 +0800)]
mds: fix out-of-order messages

When MDS is no longer laggy, it should process deferred messages
first, then process newly received messages.

Fix: #11258
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4183 from stiopaa1/OSDMonTrailingSpaces
Kefu Chai [Mon, 30 Mar 2015 08:43:37 +0000 (16:43 +0800)]
Merge pull request #4183 from stiopaa1/OSDMonTrailingSpaces

mon/OSDMonitor: remove trailing whitespaces

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoerasure-code: Update ISA-L to 2.13 4212/head
Yuan Zhou [Mon, 30 Mar 2015 05:39:31 +0000 (13:39 +0800)]
erasure-code: Update ISA-L to 2.13

ISA-L 2.13 brings better performance on Avoton (20%). There's no impact on Xeon
platform. The details are in the release notes.

There's a new API ec_encode_data_update() for incremental encoding
and decoding. The other highlevel API keeps the same as in 2.10

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agoosdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size 4211/head
Yan, Zheng [Mon, 30 Mar 2015 03:22:09 +0000 (11:22 +0800)]
osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size

Fixes:11120
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4209 from ceph/wip-java
Gregory Farnum [Sat, 28 Mar 2015 18:02:52 +0000 (11:02 -0700)]
Merge pull request #4209 from ceph/wip-java

fix rhel linking error

Backport: giant, firefly, dumpling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agojava: libcephfs_jni.so is in /usr/lib64 on rhel 4209/head
Noah Watkins [Sat, 28 Mar 2015 02:34:12 +0000 (19:34 -0700)]
java: libcephfs_jni.so is in /usr/lib64 on rhel

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agojava: dump extra info for ftruncate assertion
Noah Watkins [Sat, 28 Mar 2015 02:09:15 +0000 (19:09 -0700)]
java: dump extra info for ftruncate assertion

Nightly ran and encountered a situation in which fstat following
ftruncate reported a size not equal to the truncated size.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion
Gregory Farnum [Fri, 27 Mar 2015 18:35:30 +0000 (11:35 -0700)]
Merge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion

mds: fixed the ceph get mdsmap assertion.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4173 from ceph/wip-mds-kill-session
Gregory Farnum [Fri, 27 Mar 2015 18:29:19 +0000 (11:29 -0700)]
Merge pull request #4173 from ceph/wip-mds-kill-session

Wip mds kill session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
10 years agoMerge pull request #4168 from ceph/wip-11226-dir-fx
Gregory Farnum [Fri, 27 Mar 2015 18:28:31 +0000 (11:28 -0700)]
Merge pull request #4168 from ceph/wip-11226-dir-fx

RFC client: Hold on to exclusive caps on directories we "own"

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4177 from ceph/wip-11226-extra
Gregory Farnum [Fri, 27 Mar 2015 18:27:58 +0000 (11:27 -0700)]
Merge pull request #4177 from ceph/wip-11226-extra

Wip 11226 extra

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