]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agocmake: add run_cmake-check.sh 6787/head
Orit Wasserman [Thu, 3 Dec 2015 11:32:03 +0000 (12:32 +0100)]
cmake: add run_cmake-check.sh

currently only check to cmake build process

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #6750 from theanalyst/doc/mailmap/jewel
Loic Dachary [Fri, 11 Dec 2015 09:47:01 +0000 (10:47 +0100)]
Merge pull request #6750 from theanalyst/doc/mailmap/jewel

mailmap: Jewel updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6872 from dachary/wip-osd-typo
Loic Dachary [Fri, 11 Dec 2015 08:46:41 +0000 (09:46 +0100)]
Merge pull request #6872 from dachary/wip-osd-typo

doc: osd: s/schedued/scheduled/

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: YankunLi affiliation 6750/head
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:15:41 +0000 (18:45 +0530)]
mailmap: YankunLi affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Nishtha Rai affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:15:13 +0000 (18:45 +0530)]
mailmap: Nishtha Rai affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: John Coyle affiliation
Abhishek Lekshmanan [Fri, 11 Dec 2015 07:41:28 +0000 (13:11 +0530)]
mailmap: John Coyle affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Conflicts:
.organizationmap
Trivial merge conflict as upstream had an additional entry

9 years agomailmap: Jashan Kamboj affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:14:32 +0000 (18:44 +0530)]
mailmap: Jashan Kamboj affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Adam Kupczyk affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:14:04 +0000 (18:44 +0530)]
mailmap: Adam Kupczyk affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Jacek J. Lakis affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:13:37 +0000 (18:43 +0530)]
mailmap: Jacek J. Lakis affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: runsisi affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:13:09 +0000 (18:43 +0530)]
mailmap: runsisi affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Zeqiang Zhuang affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:11:19 +0000 (18:41 +0530)]
mailmap: Zeqiang Zhuang affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: You Ji affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:10:30 +0000 (18:40 +0530)]
mailmap: You Ji affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Wenjun Huang affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:09:23 +0000 (18:39 +0530)]
mailmap: Wenjun Huang affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Wei Luo affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:08:43 +0000 (18:38 +0530)]
mailmap: Wei Luo affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Sangdi Xu name normalization
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:06:56 +0000 (18:36 +0530)]
mailmap: Sangdi Xu name normalization

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Robin H. Johnson name normalization
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:06:11 +0000 (18:36 +0530)]
mailmap: Robin H. Johnson name normalization

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Guang Yang name normalization
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:05:36 +0000 (18:35 +0530)]
mailmap: Guang Yang name normalization

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agoMerge pull request #6783 from yuyuyu101/wip-13961
Sage Weil [Fri, 11 Dec 2015 02:29:18 +0000 (21:29 -0500)]
Merge pull request #6783 from yuyuyu101/wip-13961

osd: KeyValueStore: don't queue NULL context

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6892 from kylinstorage/wip-fix-rbd-tracepoint
Josh Durgin [Fri, 11 Dec 2015 01:24:02 +0000 (17:24 -0800)]
Merge pull request #6892 from kylinstorage/wip-fix-rbd-tracepoint

librbd: fix tracepoint parameter in diff_iterate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6878 from manens/pybind_rados_ioctx_snap_rollback
Josh Durgin [Thu, 10 Dec 2015 19:58:16 +0000 (11:58 -0800)]
Merge pull request #6878 from manens/pybind_rados_ioctx_snap_rollback

pybind: Implementation of rados_ioctx_snapshot_rollback

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6889 from kylinstorage/wip-fix-merge-diff
Josh Durgin [Thu, 10 Dec 2015 19:18:31 +0000 (11:18 -0800)]
Merge pull request #6889 from kylinstorage/wip-fix-merge-diff

librbd: fix merge-diff for >2GB diff-files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6888 from prallabh/master
Yehuda Sadeh [Thu, 10 Dec 2015 17:50:22 +0000 (09:50 -0800)]
Merge pull request #6888 from prallabh/master

rgw: fix a glaring syntax error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agolibrbd: fix merge-diff for >2GB diff-files 6889/head
Yunchuan Wen [Thu, 10 Dec 2015 14:13:38 +0000 (22:13 +0800)]
librbd: fix merge-diff for >2GB diff-files

from http://tracker.ceph.com/issues/14030

Fixes: #14030
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
9 years agorgw: fix a glaring syntax error 6888/head
Pavan Rallabhandi [Thu, 10 Dec 2015 12:18:22 +0000 (17:48 +0530)]
rgw: fix a glaring syntax error

syntactical error is causing rgw not to start

Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
9 years agoImplementation of rados_ioctx_snapshot_rollback 6878/head
Florent Manens [Wed, 9 Dec 2015 21:37:56 +0000 (22:37 +0100)]
Implementation of rados_ioctx_snapshot_rollback

Signed-off-by: Florent Manens <florent@beezim.fr>
9 years agoMerge pull request #6858 from jcsp/wip-cephfs-auth-doc
Yan, Zheng [Thu, 10 Dec 2015 08:30:13 +0000 (16:30 +0800)]
Merge pull request #6858 from jcsp/wip-cephfs-auth-doc

doc: note that cephfs auth stuff is new in jewel

9 years agoMerge pull request #6768 from marcan/cython
Josh Durgin [Wed, 9 Dec 2015 23:45:17 +0000 (15:45 -0800)]
Merge pull request #6768 from marcan/cython

pybind: port the rbd bindings to Cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
9 years agoMerge pull request #6877 from dillaman/wip-14001
Josh Durgin [Wed, 9 Dec 2015 21:49:33 +0000 (13:49 -0800)]
Merge pull request #6877 from dillaman/wip-14001

librbd: fix test case race condition for journaling ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: fix test case race condition for journaling ops 6877/head
Jason Dillaman [Wed, 9 Dec 2015 21:21:04 +0000 (16:21 -0500)]
librbd: fix test case race condition for journaling ops

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoRevert "LifeCycle feature"
Yehuda Sadeh [Wed, 9 Dec 2015 19:34:08 +0000 (11:34 -0800)]
Revert "LifeCycle feature"

It's not there yet. Created a branch with a few fixes, will need to go
through some more revisions.

This reverts commit 7d48f62f5c86913d8f00b44d46a04a52d338907c.

9 years agoMerge pull request #6331 from chenji-kael/wip-lifecycle
Daniel Gryniewicz [Wed, 9 Dec 2015 14:09:10 +0000 (09:09 -0500)]
Merge pull request #6331 from chenji-kael/wip-lifecycle

LifeCycle feature

9 years agoMerge pull request #6871 from dachary/wip-14027-scrub-load
Loic Dachary [Wed, 9 Dec 2015 12:55:51 +0000 (13:55 +0100)]
Merge pull request #6871 from dachary/wip-14027-scrub-load

tests: --osd-scrub-load-threshold=2000 for more consistency

Reviewed-by: Xinze Chi <xinze@xsky.com>
9 years agotests: --osd-scrub-load-threshold=2000 for more consistency 6871/head
Loic Dachary [Wed, 9 Dec 2015 00:41:42 +0000 (01:41 +0100)]
tests: --osd-scrub-load-threshold=2000 for more consistency

In a test environment, consistency is more important than
performances. Effectively disable the test that would postpone a scrub
depending on the load average. It is assumed that a machine with a load
average higher than 2000 won't be useable anyway.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agopybind/rbd.pyx: misc typo bugfixes 6768/head
Hector Martin [Wed, 9 Dec 2015 09:47:40 +0000 (18:47 +0900)]
pybind/rbd.pyx: misc typo bugfixes

9 years agopybind/rbd.pyx: PyString -> PyBytes
Hector Martin [Wed, 9 Dec 2015 09:07:50 +0000 (18:07 +0900)]
pybind/rbd.pyx: PyString -> PyBytes

9 years agodoc: osd: s/schedued/scheduled/ 6872/head
Loic Dachary [Wed, 9 Dec 2015 00:36:31 +0000 (01:36 +0100)]
doc: osd: s/schedued/scheduled/

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6830 from vumrao/wip-12112-vumrao
Josh Durgin [Tue, 8 Dec 2015 23:30:09 +0000 (15:30 -0800)]
Merge pull request #6830 from vumrao/wip-12112-vumrao

rbd: add --object-size option, deprecate --order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6857 from dachary/wip-13986-test-pg-scrub
Loic Dachary [Tue, 8 Dec 2015 16:03:10 +0000 (17:03 +0100)]
Merge pull request #6857 from dachary/wip-13986-test-pg-scrub

tests: osd-scrub-snaps.sh to display full osd logs on error

Reviewed-by: Xinze Chi <xinze@xsky.com>
9 years agodoc: note that cephfs auth stuff is new in jewel 6858/head
John Spray [Tue, 8 Dec 2015 14:10:18 +0000 (14:10 +0000)]
doc: note that cephfs auth stuff is new in jewel

+ bonus whitespace fixes to the code blocks to
get them to render properly

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agotests: osd-scrub-snaps.sh to display full osd logs on error 6857/head
Loic Dachary [Tue, 8 Dec 2015 12:54:58 +0000 (13:54 +0100)]
tests: osd-scrub-snaps.sh to display full osd logs on error

This generates a large output but is the only way to get more
information about race conditions that turn out to show up frequently.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6850 from H3C/wip-zcl-ceph-mds
John Spray [Tue, 8 Dec 2015 12:31:40 +0000 (12:31 +0000)]
Merge pull request #6850 from H3C/wip-zcl-ceph-mds

ceph-mds:add --help/-h

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6848 from H3C/wip-zcl-layout-rst
John Spray [Tue, 8 Dec 2015 11:47:22 +0000 (11:47 +0000)]
Merge pull request #6848 from H3C/wip-zcl-layout-rst

doc:file must be empty when writing layout fields of file use "setfattr"

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agorbd: add --object-size option 6830/head
Vikhyat Umrao [Mon, 7 Dec 2015 16:48:13 +0000 (22:18 +0530)]
rbd: add --object-size option

Object size can be specified when creating an image with the --order option,
as a number of bits in the size.

This patch is adding new option --object-size. This new option will specify
object size directly for example --object-size 2M.

It would be easier to use. --order is still present for backwards compatibility.
For simplicity, we are rounding up the object size to the nearest power of 2.

Fixes #12112

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agoceph-mds:add --help/-h 6850/head
Cilang Zhao [Tue, 8 Dec 2015 09:00:58 +0000 (04:00 -0500)]
ceph-mds:add --help/-h

When use ceph-mds --hlep/-h, the usage will be showed

Signed-off-by: Cilang Zhao <zhao.cilang@h3c.com>
9 years agodoc:file must be empty when writing layout fields of file use "setfattr" 6848/head
Cilang Zhao [Tue, 8 Dec 2015 08:45:34 +0000 (03:45 -0500)]
doc:file must be empty when writing layout fields of file use "setfattr"

When the layout fields of a file are modified, this file must be empty, otherwise an error would occur.

Signed-off-by:Cilang Zhao zhao.cilang@h3c.com

9 years agoMerge remote-tracking branch 'ceph/jewel'
Loic Dachary [Tue, 8 Dec 2015 08:03:55 +0000 (09:03 +0100)]
Merge remote-tracking branch 'ceph/jewel'

9 years agoMerge pull request #6844 from dachary/wip-13997-centos-libunwind-jewel
Loic Dachary [Tue, 8 Dec 2015 07:52:58 +0000 (08:52 +0100)]
Merge pull request #6844 from dachary/wip-13997-centos-libunwind-jewel

build/ops: enable CR in CentOS 7

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agobuild/ops: enable CR in CentOS 7 6844/head
Loic Dachary [Tue, 8 Dec 2015 07:02:56 +0000 (08:02 +0100)]
build/ops: enable CR in CentOS 7

To get libunwind from the CR repositories until CentOS 7.2.1511 is released.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6842 from badone/wip-13997
Loic Dachary [Tue, 8 Dec 2015 06:47:06 +0000 (07:47 +0100)]
Merge pull request #6842 from badone/wip-13997

tests: centos7 needs the Continuous Release (CR) Repository enabled for

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: centos7 needs the Continuous Release (CR) Repository enabled for 6842/head
Brad Hubbard [Tue, 8 Dec 2015 06:05:37 +0000 (16:05 +1000)]
tests: centos7 needs the Continuous Release (CR) Repository enabled for
libunwind

Fixes: #13997
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoLifeCycle feature 6331/head
Ji Chen [Wed, 21 Oct 2015 02:10:39 +0000 (10:10 +0800)]
LifeCycle feature
As same as amazon S3 interface,"PUT Bucket lifecycle" and
"DELETE Bucket lifecycle" have been implemented,
"GET Bucket lifecycle" not realized yet as S3cmd has not
realize it also.
The feature`s main point is to remove expire file per day.
Files transfer from hot layer to cold layer is not supported.
ToDo:Maybe to transfer from replicate pool to EC pool or
from ssd to sata pool will be valuable.

Now put all buckets which should do lifecycle into shard
objects in .rgw.lc pool.

lifecycle config file format:
<LifecycleConfiguration>
    <Rule>
        <ID>sample-rule</ID>
        <Prefix></Prefix>
        <Status>enable</Status>
        <Expiration>
           <Days>1</Days>
        </Expiration>
    </Rule>
</LifecycleConfiguration>

Signed-off-by: Ji Chen <insomnia@139.com>
9 years agoMerge pull request #6818 from trociny/fix-cmake
Josh Durgin [Tue, 8 Dec 2015 00:06:18 +0000 (16:06 -0800)]
Merge pull request #6818 from trociny/fix-cmake

cmake: update for recent rbd changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6837 from dreamhost/wip-test-cephtool-filenames
Josh Durgin [Mon, 7 Dec 2015 23:52:47 +0000 (15:52 -0800)]
Merge pull request #6837 from dreamhost/wip-test-cephtool-filenames

qa/workunits/cephtool/test.sh: false positive fail on /tmp/obj1.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: false positive fail on /tmp/obj1. 6837/head
Robin H. Johnson [Mon, 7 Dec 2015 22:41:12 +0000 (14:41 -0800)]
qa/workunits/cephtool/test.sh: false positive fail on /tmp/obj1.

If /tmp/obj1 happened to exist already, and was not writable by the
testing user, then this test failed!

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agoMerge pull request #6838 from stiopaa1/Wreorder_ceph_context
Josh Durgin [Mon, 7 Dec 2015 23:21:16 +0000 (15:21 -0800)]
Merge pull request #6838 from stiopaa1/Wreorder_ceph_context

common/ceph_context.cc:fix order of initialisers

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6831 from fullerdj/wip-14010
Josh Durgin [Mon, 7 Dec 2015 23:01:01 +0000 (15:01 -0800)]
Merge pull request #6831 from fullerdj/wip-14010

qa/krbd: Expunge generic/247

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6793 from dzafman/wip-hist-les-fix
David Zafman [Mon, 7 Dec 2015 22:56:03 +0000 (14:56 -0800)]
Merge pull request #6793 from dzafman/wip-hist-les-fix

osd: Allow repair of history.last_epoch_started using config

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agocommon/ceph_context.cc:fix order of initialisers 6838/head
Michal Jarzabek [Mon, 7 Dec 2015 22:36:16 +0000 (22:36 +0000)]
common/ceph_context.cc:fix order of initialisers

Fix order of member initialisers causing [-Wreorder] warning.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge branch 'unlinkcallbyrmbucket'
Yehuda Sadeh [Mon, 7 Dec 2015 19:54:49 +0000 (11:54 -0800)]
Merge branch 'unlinkcallbyrmbucket'

Conflicts:
src/rgw/rgw_bucket.cc

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw:dont update entrypoint when removing bucket
Aran85 [Wed, 30 Sep 2015 01:29:26 +0000 (09:29 +0800)]
rgw:dont update entrypoint when removing bucket

when removing bucket,we unlink the bucket bucket but we don't want
to update the entrypoint here.Because the update_entrypoint's default
value is true,so we need to indicate it to false.

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
9 years agoMerge pull request #6735 from rzarzynski/wip-rgw-clean-putmetabucket
Yehuda Sadeh [Mon, 7 Dec 2015 19:10:24 +0000 (11:10 -0800)]
Merge pull request #6735 from rzarzynski/wip-rgw-clean-putmetabucket

rgw: remove unused variable in RGWPutMetadataBucket::execute

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6829 from LenzGr/master
Yehuda Sadeh [Mon, 7 Dec 2015 19:09:41 +0000 (11:09 -0800)]
Merge pull request #6829 from LenzGr/master

doc: Fixed incorrect name of a "List Multipart Upload Parts" Response Entity

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6774 from ceph/wip-rgw-cap-fix
Yehuda Sadeh [Mon, 7 Dec 2015 18:42:18 +0000 (10:42 -0800)]
Merge pull request #6774 from ceph/wip-rgw-cap-fix

rgw: add a missing cap type

9 years agoqa/krbd: Expunge generic/247 6831/head
Douglas Fuller [Mon, 7 Dec 2015 17:18:26 +0000 (09:18 -0800)]
qa/krbd: Expunge generic/247

xfstests generic/247 exercises XFS DIO and AIO to detect races. Some
races apparently exist in the XFS code as this is a known issue within
XFS. Expunge this test because it is not specifically relevant to krbd
and not a specific krbd issue.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
9 years agoMerge pull request #6805 from zaitcev/cmake-pluginregistry
Orit Wasserman [Mon, 7 Dec 2015 15:16:26 +0000 (16:16 +0100)]
Merge pull request #6805 from zaitcev/cmake-pluginregistry

cmake: Add common/PluginRegistry.cc to CMakeLists.txt

9 years agodoc: Fixed incorrect name of a "List Multipart Upload Parts" Response Entity 6829/head
Lenz Grimmer [Mon, 7 Dec 2015 14:54:49 +0000 (15:54 +0100)]
doc: Fixed incorrect name of a "List Multipart Upload Parts" Response Entity

Fixed incorrect name of a "List Multipart Upload Parts" Response Entity:
"InitiatedMultipartUploadsResult" -> "ListPartsResult"

Fixes: #14003
Signed-off-by: Lenz Grimmer <lenz@grimmer.com>
9 years agocmake: update for recent rbd changes 6818/head
Mykola Golub [Sun, 6 Dec 2015 19:55:20 +0000 (21:55 +0200)]
cmake: update for recent rbd changes

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #6816 from drunkard/doc
Loic Dachary [Mon, 7 Dec 2015 09:02:02 +0000 (10:02 +0100)]
Merge pull request #6816 from drunkard/doc

doc: rst style fix for pools document

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6820 from mikulely/add-umcloud-affiliation
Loic Dachary [Mon, 7 Dec 2015 08:52:05 +0000 (09:52 +0100)]
Merge pull request #6820 from mikulely/add-umcloud-affiliation

Add UMCloud affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoUpdate Jiaying Ren affinity 6820/head
Jiaying Ren [Mon, 7 Dec 2015 08:07:27 +0000 (16:07 +0800)]
Update Jiaying Ren affinity

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
9 years agoUpdate Rongze Zhu affinity
Jiaying Ren [Mon, 7 Dec 2015 08:04:29 +0000 (16:04 +0800)]
Update Rongze Zhu affinity

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
9 years agoMerge pull request #6655 from jcsp/wip-inode-claim
Gregory Farnum [Mon, 7 Dec 2015 05:09:56 +0000 (21:09 -0800)]
Merge pull request #6655 from jcsp/wip-inode-claim

tools: add cephfs-table-tool 'take_inos'

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #6567 from jcsp/wip-layout-restrict
Gregory Farnum [Mon, 7 Dec 2015 05:05:30 +0000 (21:05 -0800)]
Merge pull request #6567 from jcsp/wip-layout-restrict

mds: add 'p' flag in auth caps to control setting pool in layout

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6601 from jcsp/wip-13777-caps
Gregory Farnum [Mon, 7 Dec 2015 05:03:25 +0000 (21:03 -0800)]
Merge pull request #6601 from jcsp/wip-13777-caps

mon: don't require OSD W for MRemoveSnaps

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: rst style fix for pools document 6816/head
Drunkard Zhang [Mon, 7 Dec 2015 02:45:03 +0000 (10:45 +0800)]
doc: rst style fix for pools document

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
9 years agodeb,rpm: package buffer_fwd.h
Sage Weil [Sun, 6 Dec 2015 14:24:17 +0000 (09:24 -0500)]
deb,rpm: package buffer_fwd.h

Introduced by 206b8e2cc6157451d5c7548e294461408e0b0c8f.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6803 from dachary/wip-13975-systemd-flock
Loic Dachary [Sat, 5 Dec 2015 17:42:08 +0000 (18:42 +0100)]
Merge pull request #6803 from dachary/wip-13975-systemd-flock

build/ops: systemd ceph-disk unit must not assume /bin/flock

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
9 years agoMerge pull request #6811 from smithfarm/wip-submitting-jewel
Loic Dachary [Sat, 5 Dec 2015 17:11:53 +0000 (18:11 +0100)]
Merge pull request #6811 from smithfarm/wip-submitting-jewel

SubmittingPatches: there is no next; only jewel

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoSubmittingPatches: there is no next; only jewel 6811/head
Nathan Cutler [Sat, 5 Dec 2015 16:18:12 +0000 (17:18 +0100)]
SubmittingPatches: there is no next; only jewel

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #6792 from smithfarm/wip-index-20151202
Loic Dachary [Sat, 5 Dec 2015 01:36:26 +0000 (02:36 +0100)]
Merge pull request #6792 from smithfarm/wip-index-20151202

Wip index 20151202

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6795 from ceph/pybind-rados-exec
Josh Durgin [Sat, 5 Dec 2015 01:31:30 +0000 (17:31 -0800)]
Merge pull request #6795 from ceph/pybind-rados-exec

pybind: support ioctx:exec

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoAdd common/PluginRegistry.cc to CMakeLists.txt 6805/head
Pete Zaitcev [Fri, 4 Dec 2015 22:05:27 +0000 (15:05 -0700)]
Add common/PluginRegistry.cc to CMakeLists.txt

Else this happens:

  [ 15%] Linking CXX executable ceph-authtool
  libcommon.a(ceph_context.cc.o): In function `CephContext::CephContext(unsigned int, int)':
  ceph_context.cc:(.text+0x2620): undefined reference to `ceph::PluginRegistry::PluginRegistry(CephContext*)'
  libcommon.a(ceph_context.cc.o): In function `CephContext::~CephContext()':
  ceph_context.cc:(.text+0x3db0): undefined reference to `ceph::PluginRegistry::~PluginRegistry()'
  collect2: error: ld returned 1 exit status
  src/CMakeFiles/ceph-authtool.dir/build.make:120: recipe for target 'src/ceph-authtool' failed
  make[2]: *** [src/ceph-authtool] Error 1
  CMakeFiles/Makefile2:331: recipe for target 'src/CMakeFiles/ceph-authtool.dir/all' failed

The ceph_context.cc is the only user of PluginRegistry at
present, so adding it without conditionals should be correct.

Signed-Off-By: Pete Zaitcev <zaitcev@redhat.com>
9 years agodoc/dev/index.rst: wholesale refactor 6792/head
Nathan Cutler [Thu, 3 Dec 2015 17:48:36 +0000 (18:48 +0100)]
doc/dev/index.rst: wholesale refactor

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agopybind: support ioctx:exec 6795/head
Noah Watkins [Fri, 4 Dec 2015 02:17:20 +0000 (18:17 -0800)]
pybind: support ioctx:exec

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
9 years agocommon/Makefile: ship common/event_socket.h
Sage Weil [Fri, 4 Dec 2015 21:09:11 +0000 (16:09 -0500)]
common/Makefile: ship common/event_socket.h

Broken in commit 5eb64dd324a0e0ec609acf2b178c02dee901aa5d.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuild/ops: systemd ceph-disk unit must not assume /bin/flock 6803/head
Loic Dachary [Fri, 4 Dec 2015 20:11:09 +0000 (21:11 +0100)]
build/ops: systemd ceph-disk unit must not assume /bin/flock

The flock command may be installed elsewhere, depending on the
system. Let the PATH search figure that out.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agotest: use sequential journal_tid for object cacher test
Josh Durgin [Thu, 26 Nov 2015 04:24:30 +0000 (20:24 -0800)]
test: use sequential journal_tid for object cacher test

This matches the real usage by librbd.

Fixes: #13877
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 9331e031bd2a719463920581a47c13f0606e9971)

9 years agoMerge pull request #6788 from dachary/wip-13878-ec-pool
Dan Mick [Fri, 4 Dec 2015 18:19:20 +0000 (11:19 -0700)]
Merge pull request #6788 from dachary/wip-13878-ec-pool

test/librados/test.cc: clean up EC pools' crush rules too

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #6665 from trociny/wip-librbd-journal
Josh Durgin [Fri, 4 Dec 2015 17:20:03 +0000 (09:20 -0800)]
Merge pull request #6665 from trociny/wip-librbd-journal

rbd: journal: configuration via conf, cli, api and some fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6800 from dillaman/wip-13969
Josh Durgin [Fri, 4 Dec 2015 17:13:51 +0000 (09:13 -0800)]
Merge pull request #6800 from dillaman/wip-13969

librbd: fix known test case race condition failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: wait for mocked requests to complete 6800/head
Jason Dillaman [Fri, 4 Dec 2015 15:37:25 +0000 (10:37 -0500)]
tests: wait for mocked requests to complete

Fixes: #13969
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6641 from aclamk/wip-log-alloc-predictor
Sage Weil [Fri, 4 Dec 2015 15:37:48 +0000 (10:37 -0500)]
Merge pull request #6641 from aclamk/wip-log-alloc-predictor

common: log: predict log message buffer allocation size

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6642 from 0003ydlom/decode_reorder
Sage Weil [Fri, 4 Dec 2015 15:34:44 +0000 (10:34 -0500)]
Merge pull request #6642 from 0003ydlom/decode_reorder

osd: move newest decode version of MOSDOp and MOSDOpReply to the front

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: do not complete AIO callbacks within caller's thread context
Jason Dillaman [Fri, 4 Dec 2015 15:25:24 +0000 (10:25 -0500)]
librbd: do not complete AIO callbacks within caller's thread context

Avoid rare, racy issues when individual requests associated with an AIO
completion can complete prior to marking the completion as ready-to-fire.
Pre-calculate the expected number of individual requests to avoid the
potential re-entrant callback.

Fixes: #13969
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6696 from Ved-vampir/wip_common_plugin
Sage Weil [Fri, 4 Dec 2015 15:19:11 +0000 (10:19 -0500)]
Merge pull request #6696 from Ved-vampir/wip_common_plugin

common: add generic plugin infrastructure

Reviewed-by: Varada Kari <varada.kari@sandisk.com>
9 years agoMerge pull request #6779 from ceph/wip-librados-xattr
Sage Weil [Fri, 4 Dec 2015 15:15:54 +0000 (10:15 -0500)]
Merge pull request #6779 from ceph/wip-librados-xattr

librados: avoid malloc(0) (which can return NULL on some platforms)

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6759 from liewegas/wip-bdev-probe
Sage Weil [Fri, 4 Dec 2015 15:14:34 +0000 (10:14 -0500)]
Merge pull request #6759 from liewegas/wip-bdev-probe

osd: make backend and block device code a bit more generic

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
9 years agoMerge pull request #6686 from stiopaa1/namespace_buffer
Sage Weil [Fri, 4 Dec 2015 15:13:47 +0000 (10:13 -0500)]
Merge pull request #6686 from stiopaa1/namespace_buffer

common: use namespace instead of subclasses for buffer

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6535 from mslovy/wip-crc-cache-tracker
Sage Weil [Fri, 4 Dec 2015 15:13:07 +0000 (10:13 -0500)]
Merge pull request #6535 from mslovy/wip-crc-cache-tracker

common: buffer: add cached_crc and cached_crc_adjust counts to perf dump

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6058 from guangyy/wip-pg-query
Sage Weil [Fri, 4 Dec 2015 15:10:19 +0000 (10:10 -0500)]
Merge pull request #6058 from guangyy/wip-pg-query

osd: dump number of missing objects for each peer with pg query

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