]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agolibrbd: improved ImageWatcher duplicate message detection 3758/head
Jason Dillaman [Thu, 19 Feb 2015 19:43:15 +0000 (14:43 -0500)]
librbd: improved ImageWatcher duplicate message detection

Added a unique client id to announcement messages so that duplicate
lock release / acquired / requested messages can be detected and
ignored by the client.  Also fixed an issue processing the result
code for async operations.

Fixes: #10898
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add test instances for watch/notify messages
Jason Dillaman [Thu, 19 Feb 2015 17:33:39 +0000 (12:33 -0500)]
librbd: add test instances for watch/notify messages

Ensure that the librbd watch/notify messages are tested
for backwards compatibility.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: minor cleanup of ImageWatcher messages
Jason Dillaman [Thu, 19 Feb 2015 02:56:34 +0000 (21:56 -0500)]
librbd: minor cleanup of ImageWatcher messages

Moved all RPC messages to their own classes to facilitate cleaner
version control and backward compatibility.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3756 from ceph/wip-10899
Josh Durgin [Wed, 18 Feb 2015 16:55:13 +0000 (08:55 -0800)]
Merge pull request #3756 from ceph/wip-10899

librbd: fixed ImageWatcher recursive locking issues

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: fixed ImageWatcher recursive locking issues 3756/head
Jason Dillaman [Wed, 18 Feb 2015 16:10:57 +0000 (11:10 -0500)]
librbd: fixed ImageWatcher recursive locking issues

It was possible for ImageWatcher to attempt to re-acquire held locks
via context callbacks.  This issue affected resizing/flattening when
no work was required and rescheduling a watch upon two successive
failures.

Fixes: #10899
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3749 from ceph/wip-10900
Josh Durgin [Tue, 17 Feb 2015 05:58:56 +0000 (21:58 -0800)]
Merge pull request #3749 from ceph/wip-10900

test/librbd/fsx.c: disable RBD object map for krbd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3747 from ceph/wip-10892
Sage Weil [Tue, 17 Feb 2015 01:50:22 +0000 (17:50 -0800)]
Merge pull request #3747 from ceph/wip-10892

osd: clear obc cache on_shutdown

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agotest/librbd/fsx.c: disable RBD object map for krbd 3749/head
Jason Dillaman [Tue, 17 Feb 2015 01:44:04 +0000 (20:44 -0500)]
test/librbd/fsx.c: disable RBD object map for krbd

RBD object map requires exclusive lock support, which is not
yet available in the kernel client.

Fixes: #10900
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoosd: clear obc cache on_shutdown 3747/head
Sage Weil [Tue, 17 Feb 2015 01:08:43 +0000 (17:08 -0800)]
osd: clear obc cache on_shutdown

Fixes: #10892
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3746 from nwl/rgw-docs
Loic Dachary [Mon, 16 Feb 2015 23:31:11 +0000 (00:31 +0100)]
Merge pull request #3746 from nwl/rgw-docs

doc: RGW is "built on top of librgw" changed to "librados"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: RGW is "built on top of librgw" changed to "librados" 3746/head
Neil Levine [Mon, 16 Feb 2015 22:54:09 +0000 (14:54 -0800)]
doc: RGW is "built on top of librgw" changed to "librados"

Signed-off-by: Neil Levine <levine@yoyo.org>
10 years agoMerge branch 'hammer'
Josh Durgin [Mon, 16 Feb 2015 22:30:27 +0000 (14:30 -0800)]
Merge branch 'hammer'

10 years agoMerge branch 'wip-librbd-snaps-object-map' into hammer
Josh Durgin [Mon, 16 Feb 2015 22:27:44 +0000 (14:27 -0800)]
Merge branch 'wip-librbd-snaps-object-map' into hammer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: enforce write ordering with snapshot
Jason Dillaman [Sat, 14 Feb 2015 06:24:44 +0000 (01:24 -0500)]
librbd: enforce write ordering with snapshot

The md_lock is now held for reading when scheduling write/discards.
Since snap_create now holds the lock for writing and flushes all
pending IO, write/discard operations will now be consistent for a
given request across objects.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: use separate files for snapshot object maps
Jason Dillaman [Sat, 7 Feb 2015 14:13:10 +0000 (09:13 -0500)]
librbd: use separate files for snapshot object maps

Instead of relying on the built-in object snapshot support,
create a separate object map object for each image snapshot.
This will allow a future repair utility to rebuild the object
map for an image's snapshots.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: added IoCtx::write_full implementation
Jason Dillaman [Sat, 7 Feb 2015 14:57:36 +0000 (09:57 -0500)]
librados_test_stub: added IoCtx::write_full implementation

Mapped IoCtx::write_full to existing test method used by the
ObjectWriteOperation::write_full API method. Also added missing
cls_log implementation for debugging.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge branch 'wip-librbd-object-map-crc' into hammer
Josh Durgin [Mon, 16 Feb 2015 21:33:30 +0000 (13:33 -0800)]
Merge branch 'wip-librbd-object-map-crc' into hammer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: skip invalidating an invalid object map
Jason Dillaman [Wed, 4 Feb 2015 07:50:57 +0000 (02:50 -0500)]
librbd: skip invalidating an invalid object map

If the object map is already flagged as invalid, avoid
attempting to set the invalid object map flag again.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: added CRC validation to object map
Jason Dillaman [Wed, 4 Feb 2015 07:44:50 +0000 (02:44 -0500)]
cls_rbd: added CRC validation to object map

Added a footer to the object map which stores a header CRC and
and data CRCs for each 4KB chunk.  Updates to the object map only
require recomputing the CRC to the affected 4KB chunk.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3739 from athanatos/wip-10840
Sage Weil [Mon, 16 Feb 2015 17:08:11 +0000 (09:08 -0800)]
Merge pull request #3739 from athanatos/wip-10840

PG,ReplicatedPG: make missing_digests local to scrub_compare_maps

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3738 from athanatos/wip-10830
Sage Weil [Mon, 16 Feb 2015 17:00:20 +0000 (09:00 -0800)]
Merge pull request #3738 from athanatos/wip-10830

osd/: include version_t in extra_reqids with promote

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3737 from athanatos/wip-10768
Sage Weil [Mon, 16 Feb 2015 16:55:32 +0000 (08:55 -0800)]
Merge pull request #3737 from athanatos/wip-10768

ReplicatedPG::on_change: requeue in_progress_async_reads close to last

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3694 from ceph/wip-10784
Samuel Just [Mon, 16 Feb 2015 15:47:15 +0000 (07:47 -0800)]
Merge pull request #3694 from ceph/wip-10784

Fix 10784: librbd: image has watchers - not removing

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3735 from ceph/wip-da-fix-xio-configure
Kefu Chai [Mon, 16 Feb 2015 12:14:43 +0000 (20:14 +0800)]
Merge pull request #3735 from ceph/wip-da-fix-xio-configure

fix configure to reflect the missing libs for xio

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3716 from t-miyamae/wip-mshec-fix10839
Loic Dachary [Mon, 16 Feb 2015 08:44:25 +0000 (09:44 +0100)]
Merge pull request #3716 from t-miyamae/wip-mshec-fix10839

erasure-code: remove tests for when init() is not called in shec

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: remove tests for when init() is not called in shec (#10839) 3716/head
t-miyamae [Thu, 12 Feb 2015 06:45:02 +0000 (15:45 +0900)]
tests: remove tests for when init() is not called in shec (#10839)

init2_1, init2_2, init2_3 are equivalent to init_1 and also removed.
encode_6, decode_6, create_ruleset_3 are null argument tests,
but the arguments are references of C++, so also removed.

Signed-off-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
10 years agoMerge pull request #3732 from Abioy/patch-1
Loic Dachary [Sun, 15 Feb 2015 15:09:11 +0000 (16:09 +0100)]
Merge pull request #3732 from Abioy/patch-1

rm some useless codes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agorm some useless codes 3732/head
Yongyue Sun [Sat, 14 Feb 2015 10:37:19 +0000 (18:37 +0800)]
rm some useless codes

tls is not used here

Signed-off-by: Yongyue Sun <abioy.sun@gmail.com>
10 years agoMerge pull request #3720 from dachary/wip-10800-shec-experimental
Loic Dachary [Fri, 13 Feb 2015 17:35:48 +0000 (18:35 +0100)]
Merge pull request #3720 from dachary/wip-10800-shec-experimental

erasure-code: mark the shec plugin as experimental

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoerasure-code: mark the shec plugin as experimental 3720/head
Loic Dachary [Thu, 12 Feb 2015 14:50:21 +0000 (15:50 +0100)]
erasure-code: mark the shec plugin as experimental

Reject the creation of an erasure code profile including plugin=shec
unless --enable-experimental-unrecoverable-data-corrupting-features=shec
is set.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: fix unused variable warning
Loic Dachary [Thu, 12 Feb 2015 14:41:44 +0000 (15:41 +0100)]
tests: fix unused variable warning

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agocommon: capture check_experimental_feature_enabled message
Loic Dachary [Thu, 12 Feb 2015 14:34:40 +0000 (15:34 +0100)]
common: capture check_experimental_feature_enabled message

Implement check_experimental_feature_enabled so that it returns the
message instead of unconditionally displaying it via derr. It allows the
caller to display it in another context.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3727 from POPSuL/patch-2
Kefu Chai [Fri, 13 Feb 2015 12:25:54 +0000 (20:25 +0800)]
Merge pull request #3727 from POPSuL/patch-2

README.md: fix the indent of a command line usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoREADME.md: fix the indent of a command line usage 3727/head
Viktor Suprun [Thu, 12 Feb 2015 23:17:22 +0000 (09:17 +1000)]
README.md: fix the indent of a command line usage

Spaces replaced with tab

Signed-off-by: Viktor Suprun <popsul1993@gmail.com>
10 years agoMerge pull request #3725 from XinzeChi/wip-kvstore-op
Haomai Wang [Fri, 13 Feb 2015 07:29:51 +0000 (15:29 +0800)]
Merge pull request #3725 from XinzeChi/wip-kvstore-op

cleanup: delete useless member variable

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agocleanup: delete useless member variable 3725/head
Xinze Chi [Fri, 13 Feb 2015 09:05:06 +0000 (09:05 +0000)]
cleanup: delete useless member variable

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agoMerge pull request #3717 from ceph/wip-decoding-oldest-snap
Gregory Farnum [Fri, 13 Feb 2015 06:25:31 +0000 (22:25 -0800)]
Merge pull request #3717 from ceph/wip-decoding-oldest-snap

mds: fix decoding of InodeStore::oldest_snap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoPG,ReplicatedPG: make missing_digests local to scrub_compare_maps 3739/head
Samuel Just [Thu, 12 Feb 2015 22:54:10 +0000 (14:54 -0800)]
PG,ReplicatedPG: make missing_digests local to scrub_compare_maps

We don't want/need to carry this state between scrub stages, so lets
remove the tempation by simply making it a local to scrub_compare_maps.

This caused a bug where we would attempt to write out the
missing_digests from the previous chunk during all future chunks, which
caused trouble.

Fixes: 10840
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge remote-tracking branch 'origin/wip-10785' into hammer
Josh Durgin [Thu, 12 Feb 2015 23:57:12 +0000 (15:57 -0800)]
Merge remote-tracking branch 'origin/wip-10785' into hammer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/ImageWatcher.cc

10 years agoMerge pull request #3723 from concubidated/master
Sage Weil [Thu, 12 Feb 2015 22:44:19 +0000 (14:44 -0800)]
Merge pull request #3723 from concubidated/master

Docs: OSD name, not id, needs to be given to remove an item from crush map

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoDocs: OSD name, not id, needs to be given to remove an item from the CRUSH map. 3723/head
Tyler Brekke [Thu, 12 Feb 2015 22:37:17 +0000 (14:37 -0800)]
Docs: OSD name, not id, needs to be given to remove an item from the CRUSH map.
Include command for deleteing bucket from the CRUSH map.

Signed-off-by: Tyler Brekke <tbrekke@redhat.com>
10 years agomds: fix decoding of InodeStore::oldest_snap 3717/head
Yan, Zheng [Thu, 12 Feb 2015 12:24:45 +0000 (20:24 +0800)]
mds: fix decoding of InodeStore::oldest_snap

There is no ENCODE_START/FINISH block when encoding inode that
embedded in dentry. So we can't use encoding version to check
if the buffer contains InodeStore::oldest_snap. Instead, we check
if the buffer iterator reaches end of buffer.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3698 from dachary/wip-10836-erasure-code-corpus
Loic Dachary [Thu, 12 Feb 2015 12:40:56 +0000 (13:40 +0100)]
Merge pull request #3698 from dachary/wip-10836-erasure-code-corpus

tests: clone ceph-erasure-code-corpus from ceph

Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
10 years agoMerge pull request #3696 from dachary/wip-10755-centos-docker
Loic Dachary [Thu, 12 Feb 2015 12:32:09 +0000 (13:32 +0100)]
Merge pull request #3696 from dachary/wip-10755-centos-docker

tests: add support for centos 6

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3714 from tchaikov/fix-osdcap-parser-10757
Loic Dachary [Thu, 12 Feb 2015 12:30:59 +0000 (13:30 +0100)]
Merge pull request #3714 from tchaikov/fix-osdcap-parser-10757

osd: fix OSDCap parser on old boost/spirit

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: Dockerfile COPY with two arguments 3696/head
Loic Dachary [Thu, 12 Feb 2015 10:21:00 +0000 (11:21 +0100)]
tests: Dockerfile COPY with two arguments

Avoid using COPY with multiple files because it will not behave as
intended with older (1.2) versions of docker.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: update docker helper documentation
Loic Dachary [Wed, 11 Feb 2015 11:20:18 +0000 (12:20 +0100)]
tests: update docker helper documentation

The tags for the centos repository changed from centos6, centos7 to 6
and 7 which is consistent with the other distribution
repositories. Update the documentation accordingly.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: add Dockerfile for centos-6
Loic Dachary [Wed, 11 Feb 2015 14:06:44 +0000 (15:06 +0100)]
tests: add Dockerfile for centos-6

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: one Dockerfile per repository:tag
Loic Dachary [Wed, 11 Feb 2015 11:15:02 +0000 (12:15 +0100)]
tests: one Dockerfile per repository:tag

There cannot be a common Dockerfile for all repository:tag combination
of a given operating system. The only way to customize a Dockerfile is
via variable substitution and it cannot conveniently address all
differences between versions.

Create one Dockerfile per operating system version instead. I.e. one
dockerfile for centos:7, one for centos:6 etc.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: fix OSDCap parser on old boost/spirit 3714/head
Kefu Chai [Thu, 12 Feb 2015 05:02:45 +0000 (13:02 +0800)]
osd: fix OSDCap parser on old boost/spirit

* on boost 1.41, the ascii::space skipper fails to skip the spaces at the
  beginning of the parsed string, so as a workaround we replace the `lit(' ')`
  in grammar spec with `ascii::blank`. this also simplifies the grammar
  a little bit.

Fixes: #10757
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3707 from dachary/wip-erasure-code-uninitialized
Loic Dachary [Thu, 12 Feb 2015 10:06:41 +0000 (11:06 +0100)]
Merge pull request #3707 from dachary/wip-erasure-code-uninitialized

erasure-code: initialize all data members

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
10 years agoMerge pull request #3713 from tchaikov/pass-string-by-ref
Loic Dachary [Thu, 12 Feb 2015 10:05:19 +0000 (11:05 +0100)]
Merge pull request #3713 from tchaikov/pass-string-by-ref

Pass string by ref

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd/OpRequest: pass string by const& 3713/head
Kefu Chai [Thu, 12 Feb 2015 02:32:34 +0000 (10:32 +0800)]
osd/OpRequest: pass string by const&

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3711 from ceph/hadoop
Gregory Farnum [Thu, 12 Feb 2015 05:04:03 +0000 (21:04 -0800)]
Merge pull request #3711 from ceph/hadoop

qa: hadoop plays nice with new teuthology task

10 years agoMerge remote-tracking branch 'gh/master' into hammer 3715/head
Sage Weil [Thu, 12 Feb 2015 02:31:39 +0000 (18:31 -0800)]
Merge remote-tracking branch 'gh/master' into hammer

10 years agoMerge pull request #3522 from ceph/wip-8600
Sage Weil [Thu, 12 Feb 2015 02:31:42 +0000 (18:31 -0800)]
Merge pull request #3522 from ceph/wip-8600

mon: OSDMonitor: tolerate catastrophically bad crush maps

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3703 from vuhuong/wip-xio-hammer
Sage Weil [Thu, 12 Feb 2015 02:21:24 +0000 (18:21 -0800)]
Merge pull request #3703 from vuhuong/wip-xio-hammer

Wip xio hammer

Reviewed-by: Matt Benjamin <matt@cohortfs.com>
10 years agoosd/: include version_t in extra_reqids with promote 3738/head
Samuel Just [Thu, 12 Feb 2015 01:07:05 +0000 (17:07 -0800)]
osd/: include version_t in extra_reqids with promote

Otherwise, we can't return the correct user version on a dup request.

Note: This patch does not handle compatilibity with the variant which
does not include the version_t field.  Since it's been less than 2 weeks
and we haven't had a release, I think that's ok since handling
compatilibity would require some overhead in the encode/decode
methods.

Fixes: 10830
Introduced (merge): b79c349067ab82b1ccb5d6cdac702f651b27a435
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3664 from liewegas/wip-10695
Samuel Just [Thu, 12 Feb 2015 01:35:22 +0000 (17:35 -0800)]
Merge pull request #3664 from liewegas/wip-10695

mon: fix 'nan' from osd df output

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3704 from ceph/wip-10761
Josh Durgin [Thu, 12 Feb 2015 01:32:53 +0000 (17:32 -0800)]
Merge pull request #3704 from ceph/wip-10761

librbd: blacklist clients before breaking locks

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3513 from rzarzynski/wip-10425
Samuel Just [Thu, 12 Feb 2015 01:29:41 +0000 (17:29 -0800)]
Merge pull request #3513 from rzarzynski/wip-10425

librados: Wip 10425

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3515 from rzarzynski/wip-10458
Samuel Just [Thu, 12 Feb 2015 01:28:09 +0000 (17:28 -0800)]
Merge pull request #3515 from rzarzynski/wip-10458

librados: Wip 10458 - rectify the pool name caching in IoCtxImpl.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3674 from jdurgin/wip-python-leak
Samuel Just [Thu, 12 Feb 2015 01:26:43 +0000 (17:26 -0800)]
Merge pull request #3674 from jdurgin/wip-python-leak

rados.py: keep reference to python callbacks

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3676 from majianpeng/misc
Samuel Just [Thu, 12 Feb 2015 01:26:05 +0000 (17:26 -0800)]
Merge pull request #3676 from majianpeng/misc

Misc

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3678 from tchaikov/fix-pg-leak
Samuel Just [Thu, 12 Feb 2015 01:24:35 +0000 (17:24 -0800)]
Merge pull request #3678 from tchaikov/fix-pg-leak

osd: fix PG leak in SnapTrimWQ._clear()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge remote-tracking branch 'ceph/hammer'
Loic Dachary [Thu, 12 Feb 2015 00:08:07 +0000 (01:08 +0100)]
Merge remote-tracking branch 'ceph/hammer'

10 years agoqa: hadoop plays nice with new teuthology task 3711/head
Noah Watkins [Thu, 12 Feb 2015 00:02:49 +0000 (16:02 -0800)]
qa: hadoop plays nice with new teuthology task

This brings the hadoop wordcount up-to-date with the new teuthology
hadoop task.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #3683 from dachary/wip-10845-python-flask
Ken Dreyer [Wed, 11 Feb 2015 23:57:30 +0000 (16:57 -0700)]
Merge pull request #3683 from dachary/wip-10845-python-flask

tests: no need for python-flask at build time

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agotests: no need for python-flask at build time 3709/head
Loic Dachary [Wed, 11 Feb 2015 22:16:24 +0000 (23:16 +0100)]
tests: no need for python-flask at build time

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3699 from ceph/wip-early-adopters
Gregory Farnum [Wed, 11 Feb 2015 23:01:06 +0000 (15:01 -0800)]
Merge pull request #3699 from ceph/wip-early-adopters

doc: Early adopter notes for CephFS

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3617 from ceph/wip-10737
Gregory Farnum [Wed, 11 Feb 2015 22:47:41 +0000 (14:47 -0800)]
Merge pull request #3617 from ceph/wip-10737

mds: disallow layout changes for files with data

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3683 from ceph/wip-10791-stopping
Gregory Farnum [Wed, 11 Feb 2015 22:39:29 +0000 (14:39 -0800)]
Merge pull request #3683 from ceph/wip-10791-stopping

MDSMonitor: do not allow MDS to transition from STATE_STOPPING

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3599 from ceph/wip-traceless-reply
Gregory Farnum [Wed, 11 Feb 2015 22:26:17 +0000 (14:26 -0800)]
Merge pull request #3599 from ceph/wip-traceless-reply

Wip traceless reply

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3700 from ceph/wip-librbd-maint-tests
Josh Durgin [Wed, 11 Feb 2015 22:04:09 +0000 (14:04 -0800)]
Merge pull request #3700 from ceph/wip-librbd-maint-tests

tests: add simple tests for proxied maintenance operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3706 from dachary/wip-10839-shec-uninitialized-hammer
Sage Weil [Wed, 11 Feb 2015 21:56:02 +0000 (13:56 -0800)]
Merge pull request #3706 from dachary/wip-10839-shec-uninitialized-hammer

erasure-code: fix uninitialized data members on SHEC

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoerasure-code: initialize all data members 3705/head 3707/head
Loic Dachary [Wed, 11 Feb 2015 20:48:34 +0000 (21:48 +0100)]
erasure-code: initialize all data members

As a safeguard against unitialized memory in isa and jerasure
plugins. Since the init method is supposed to be called before the
plugin is used, it is mostly not relevant. However it can lead to
problems that are non trivial to figure out.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: fix uninitialized data members on SHEC 3706/head
Loic Dachary [Wed, 11 Feb 2015 20:46:02 +0000 (21:46 +0100)]
erasure-code: fix uninitialized data members on SHEC

Also fix the tests that verify the result when init is not called and
factorize the two tests that were almost identical for simplicity.

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

Backport: hammer
Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoReplicatedPG::on_change: requeue in_progress_async_reads close to last 3736/head 3737/head
Samuel Just [Wed, 11 Feb 2015 18:30:51 +0000 (10:30 -0800)]
ReplicatedPG::on_change: requeue in_progress_async_reads close to last

Fixes: 10768
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3692 from athanatos/wip-8753
Samuel Just [Wed, 11 Feb 2015 18:29:47 +0000 (10:29 -0800)]
Merge pull request #3692 from athanatos/wip-8753

ReplicatedPG::on_change: clean up callbacks_for_degraded_object

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoReplicatedPG::on_change: clean up callbacks_for_degraded_object 3692/head
Samuel Just [Mon, 9 Feb 2015 18:37:15 +0000 (10:37 -0800)]
ReplicatedPG::on_change: clean up callbacks_for_degraded_object

Backport: dumpling, firefly, giant
Fixes: 8753
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3643 from athanatos/wip-10734
Sage Weil [Wed, 11 Feb 2015 18:26:25 +0000 (10:26 -0800)]
Merge pull request #3643 from athanatos/wip-10734

ObjectStore: fix Transaction encoding version number

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'gh/master' into hammer
Sage Weil [Wed, 11 Feb 2015 17:21:36 +0000 (09:21 -0800)]
Merge remote-tracking branch 'gh/master' into hammer

10 years agoMerge pull request #3092 from abartlet/ceph-dmcrypt-plain
Sage Weil [Wed, 11 Feb 2015 17:21:53 +0000 (09:21 -0800)]
Merge pull request #3092 from abartlet/ceph-dmcrypt-plain

Ceph dmcrypt with LUKS (split into 4 patches)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge branch 'hammer' of github.com:ceph/ceph into hammer
Sage Weil [Wed, 11 Feb 2015 17:20:19 +0000 (09:20 -0800)]
Merge branch 'hammer' of github.com:ceph/ceph into hammer

mon bits
Reviewed-by: Sage Weil <sage@redhat.com>
cli bits
Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agomon/PGMonitor: drop pg ls debug line
Sage Weil [Wed, 11 Feb 2015 15:58:38 +0000 (07:58 -0800)]
mon/PGMonitor: drop pg ls debug line

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agofix configure to reflect the missing libs for xio 3735/head
Danny Al-Gaaf [Wed, 11 Feb 2015 13:37:01 +0000 (14:37 +0100)]
fix configure to reflect the missing libs for xio

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agodoc: add a page for CephFS early adopters 3699/head
John Spray [Wed, 11 Feb 2015 12:11:03 +0000 (12:11 +0000)]
doc: add a page for CephFS early adopters

This is where we should point people who are
trying out CephFS in evaluation environments.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agodoc/cephfs: Ceph FS -> CephFS
Sage Weil [Mon, 2 Feb 2015 11:36:43 +0000 (03:36 -0800)]
doc/cephfs: Ceph FS -> CephFS

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agodoc/cephfs: clarify the 'not production ready' warning
Sage Weil [Mon, 2 Feb 2015 11:34:46 +0000 (03:34 -0800)]
doc/cephfs: clarify the 'not production ready' warning

Continue to run into people who see this and run away (occasionally to
less robust solutions) without understanding why.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agobuild-doc: package checks for fedora
John Spray [Wed, 11 Feb 2015 13:18:53 +0000 (13:18 +0000)]
build-doc: package checks for fedora

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agobuild-doc: don't ignore errors
John Spray [Wed, 11 Feb 2015 12:56:34 +0000 (12:56 +0000)]
build-doc: don't ignore errors

It's hard to see what went wrong when e.g. a pip
install fails, if it just steams right past.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agotests: clone ceph-erasure-code-corpus from ceph 3698/head
Loic Dachary [Wed, 11 Feb 2015 12:31:55 +0000 (13:31 +0100)]
tests: clone ceph-erasure-code-corpus from ceph

Instead of the http://github.com/dachary namespace. It is not an issue
in the common case because it should be cloned because it is in the
.gitmodules file with the proper namespace.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoxio: Fix out-of-order responses 3703/head
Vu Pham [Wed, 11 Feb 2015 10:36:11 +0000 (02:36 -0800)]
xio: Fix out-of-order responses

Without this clients received out-of-order responses from xio messenger

Signed-off-by: Raju.Kurunkad@sandisk.com
10 years agocmake: Fix cmakelist to compile librbd
Vu Pham [Wed, 11 Feb 2015 10:21:19 +0000 (02:21 -0800)]
cmake: Fix cmakelist to compile librbd

Signed-off-by: Vu Pham <vu@melanox.com>
10 years agoosd: Update object state after removing watch from object info 3694/head
David Zafman [Wed, 11 Feb 2015 04:25:05 +0000 (20:25 -0800)]
osd: Update object state after removing watch from object info

Fixes: #10784
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: Simplify handle_watch_timeout() using existing support functions
David Zafman [Wed, 11 Feb 2015 04:24:22 +0000 (20:24 -0800)]
osd: Simplify handle_watch_timeout() using existing support functions

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #3691 from athanatos/wip-6003
Sage Weil [Wed, 11 Feb 2015 01:42:21 +0000 (17:42 -0800)]
Merge pull request #3691 from athanatos/wip-6003

FileJournal: fix journalq population in do_read_entry()

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3690 from athanatos/wip-10817
Sage Weil [Wed, 11 Feb 2015 01:36:35 +0000 (17:36 -0800)]
Merge pull request #3690 from athanatos/wip-10817

Wip 10817

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3689 from athanatos/wip-10771
Sage Weil [Wed, 11 Feb 2015 01:33:18 +0000 (17:33 -0800)]
Merge pull request #3689 from athanatos/wip-10771

ReplicatedPG::eval_repop: check waiting_for_* even if !m

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge branch 'wip-7701' of git://github.com/xinxinsh/ceph into hammer
Sage Weil [Wed, 11 Feb 2015 01:19:44 +0000 (17:19 -0800)]
Merge branch 'wip-7701' of git://github.com/xinxinsh/ceph into hammer

Conflicts:
src/osd/osd_types.h