]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agotests: fix potential race conditions in test_ImageWatcher 3781/head
Jason Dillaman [Tue, 24 Feb 2015 01:09:56 +0000 (20:09 -0500)]
tests: fix potential race conditions in test_ImageWatcher

The tests were sending invalid responses back to ImageWatchers
(missing the result code), which had the potential to allow the
lock to be acquired sooner than the test was expecting since
ImageWatcher would assume the last of response code meant no
clients owned the exclusive lock and would retry as fast as
possible.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3777 from ceph/wip-librbd-snap-create-race
Josh Durgin [Mon, 23 Feb 2015 18:00:01 +0000 (10:00 -0800)]
Merge pull request #3777 from ceph/wip-librbd-snap-create-race

librbd: fixed snap create race conditions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: fixed snap create race conditions 3777/head
Jason Dillaman [Mon, 23 Feb 2015 17:16:39 +0000 (12:16 -0500)]
librbd: fixed snap create race conditions

Since the post-snap create header update runs asynchrously
in a finalizer callback, it's possible that the snapshot
is not immediately visible.  Also, if a proxied snap create
message is replayed, it's possible for the client to receive
a EEXISTS error.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3758 from ceph/wip-10898
Josh Durgin [Mon, 23 Feb 2015 17:08:11 +0000 (09:08 -0800)]
Merge pull request #3758 from ceph/wip-10898

librbd: improved ImageWatcher duplicate message detection

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3770 from ceph/wip-librbd-exclusive-lock-config
Josh Durgin [Mon, 23 Feb 2015 16:37:04 +0000 (08:37 -0800)]
Merge pull request #3770 from ceph/wip-librbd-exclusive-lock-config

rbd: disable RBD exclusive locking by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
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 agorbd: disable RBD exclusive locking by default 3770/head
Jason Dillaman [Fri, 20 Feb 2015 17:50:26 +0000 (12:50 -0500)]
rbd: disable RBD exclusive locking by default

Utilize the existing rbd_default_features config option to
control whether or not to enable RBD exclusive locking and
object map features by default.  Also added a new option to
the rbd cli to specify the image features when creating images.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3741 from ceph/wip-cmake-vstart
Kefu Chai [Sun, 22 Feb 2015 02:10:40 +0000 (10:10 +0800)]
Merge pull request #3741 from ceph/wip-cmake-vstart

cmake fixes and enable vstart with cmake build

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3729 from guangyy/wip-4254-hammer
Sage Weil [Sat, 21 Feb 2015 18:10:12 +0000 (10:10 -0800)]
Merge pull request #3729 from guangyy/wip-4254-hammer

osd: number of degraded objects in EC pool is wrong when there is OSD down(in).

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3722 from ceph/wip-10787
Sage Weil [Sat, 21 Feb 2015 18:08:59 +0000 (10:08 -0800)]
Merge pull request #3722 from ceph/wip-10787

mon: fix osd_epoch cache bug 10787

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer
Sage Weil [Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)]
Merge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge branch 'wip-5639' of git://github.com/rzarzynski/ceph into hammer
Sage Weil [Sat, 21 Feb 2015 18:05:55 +0000 (10:05 -0800)]
Merge branch 'wip-5639' of git://github.com/rzarzynski/ceph into hammer

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3760 from ceph/wip-10883
Sage Weil [Fri, 20 Feb 2015 23:18:41 +0000 (15:18 -0800)]
Merge pull request #3760 from ceph/wip-10883

osd: Fix FileJournal wrap to get header out first

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3767 from athanatos/wip-10881
Sage Weil [Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)]
Merge pull request #3767 from athanatos/wip-10881

Wip 10881

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3768 from athanatos/wip-10780
Sage Weil [Fri, 20 Feb 2015 23:10:35 +0000 (15:10 -0800)]
Merge pull request #3768 from athanatos/wip-10780

Wip 10780

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3769 from athanatos/wip-10908
Sage Weil [Fri, 20 Feb 2015 23:08:20 +0000 (15:08 -0800)]
Merge pull request #3769 from athanatos/wip-10908

Wip 10908

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocmake: radosgw, radosgw-admin related fixes 3741/head
Yehuda Sadeh [Fri, 13 Feb 2015 23:41:29 +0000 (15:41 -0800)]
cmake: radosgw, radosgw-admin related fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agovstart.sh: can use binaries outside of ceph/src
Yehuda Sadeh [Fri, 13 Feb 2015 22:34:06 +0000 (14:34 -0800)]
vstart.sh: can use binaries outside of ceph/src

If setting CEPH_BUILD_ROOT, will use that path, otherwise runs
everything from current directory as before.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3744 from ceph/wip-10884-hammer-rpm-devel-split
Ken Dreyer [Fri, 20 Feb 2015 17:44:45 +0000 (10:44 -0700)]
Merge pull request #3744 from ceph/wip-10884-hammer-rpm-devel-split

ceph.spec: split ceph-devel to appropriate *-devel packages

Reviewed-by: Sandon Van Ness <sandon@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
10 years agoMerge pull request #3764 from ceph/wip-10919
Josh Durgin [Fri, 20 Feb 2015 17:00:26 +0000 (09:00 -0800)]
Merge pull request #3764 from ceph/wip-10919

cls_rbd: invalidate bufferlist CRC when updating object map

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agocls_rbd: invalidate bufferlist CRC when updating object map 3764/head
Jason Dillaman [Fri, 20 Feb 2015 15:37:59 +0000 (10:37 -0500)]
cls_rbd: invalidate bufferlist CRC when updating object map

The bit vector was not invalidating the bufferlist's CRC, resulting
in peer OSDs rejecting write op due to a mismatched CRC on the
message.

Fixes: #10919
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3759 from ceph/wip-10914
Josh Durgin [Fri, 20 Feb 2015 02:47:16 +0000 (18:47 -0800)]
Merge pull request #3759 from ceph/wip-10914

osdc: pass fadvise op flags to WritebackHandler read requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoosd: Fix FileJournal wrap to get header out first 3760/head
David Zafman [Thu, 19 Feb 2015 00:21:12 +0000 (16:21 -0800)]
osd: Fix FileJournal wrap to get header out first

Correct and restore assert that was removed

Cause by f46b1b473fce0322a672b16c7739e569a45054b6
Fixes: #10883
Backport: dumpling, firefly, giant

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosdc: pass fadvise op flags to WritebackHandler read requests 3759/head
Jason Dillaman [Thu, 19 Feb 2015 20:38:32 +0000 (15:38 -0500)]
osdc: pass fadvise op flags to WritebackHandler read requests

librbd was previously attempting to cast the provided Context to
retrieve the fadvise flags.  To eliminate the unsafe cast, now
the fadvise flags are directly passed to the WritebackHandler::read
callback.

Fixes: #10914
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoosd/OSDMap: include pg_temp count in summary
Sage Weil [Thu, 12 Feb 2015 22:16:53 +0000 (14:16 -0800)]
osd/OSDMap: include pg_temp count in summary

It is useful to know how big the pg_temp map is.  Strictly speaking
this is part of the OSDMap so I'm including it here.  It looks like
this:

     osdmap e25: 3 osds: 3 up, 3 in; 1 remapped pgs

It might be more user-friendly to put it in a line with the pgmap
somewhere (where other pg counts are included), but it doesn't quite
fit there either.  So sticking with where it lives in the data
structure!

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit db06582a067439a57e0d7f0da2193fc479736200)

10 years agoMerge pull request #3663 from ceph/wip-10765
Sage Weil [Thu, 19 Feb 2015 19:02:26 +0000 (11:02 -0800)]
Merge pull request #3663 from ceph/wip-10765

librados: close watch/notify race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3693 from ceph/wip-objecter-linger-locking
Sage Weil [Thu, 19 Feb 2015 19:02:08 +0000 (11:02 -0800)]
Merge pull request #3693 from ceph/wip-objecter-linger-locking

objecter: clean up linger op locking

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3710 from ceph/wip-10844
Sage Weil [Thu, 19 Feb 2015 19:01:07 +0000 (11:01 -0800)]
Merge pull request #3710 from ceph/wip-10844

mon: MonCap: take EntityName instead when expanding profiles

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoPG: compensate for bug 10780 on older peers 3768/head
Samuel Just [Tue, 17 Feb 2015 18:08:01 +0000 (10:08 -0800)]
PG: compensate for bug 10780 on older peers

Previously, there was a harmless bug where we didn't fill in the
last_epoch_started field for a peer which we are resetting the
last_backfill line for.  It's no longer harmless since we use that
as the activation epoch, so if the peer is missing the MIN_SIZE
feature bit, we fill in the last_epoch_started it meant to fill in.

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoPG: add a config option to enable (by default) recovery below min_size
Samuel Just [Tue, 17 Feb 2015 18:06:19 +0000 (10:06 -0800)]
PG: add a config option to enable (by default) recovery below min_size

This may be useful at some point.

Signed-off-by: Samuel Just <sjust@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 agoReplicatedPG: only allow a degraded write if we have at least min_size copies 3767/head
Samuel Just [Tue, 17 Feb 2015 18:29:59 +0000 (10:29 -0800)]
ReplicatedPG: only allow a degraded write if we have at least min_size copies

Also, add a config option to disable the feature.

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoECBackend: use tbl for empty transaction as well if necessary 3769/head
Samuel Just [Tue, 17 Feb 2015 23:30:49 +0000 (15:30 -0800)]
ECBackend: use tbl for empty transaction as well if necessary

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedBackend: use tbl for empty transaction to backfill peer also
Samuel Just [Tue, 17 Feb 2015 23:11:14 +0000 (15:11 -0800)]
ReplicatedBackend: use tbl for empty transaction to backfill peer also

Fixes: 10908
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoosd/: s/is_degraded_object/is_degraded_or_backfilling_object
Samuel Just [Tue, 17 Feb 2015 18:16:57 +0000 (10:16 -0800)]
osd/: s/is_degraded_object/is_degraded_or_backfilling_object

Currently, this method also returns true if the object is backfilling.

Signed-off-by: Samuel Just <sjust@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 agoceph.spec: split ceph-devel to appropriate *-devel packages 3744/head
Boris Ranto [Wed, 7 Jan 2015 09:00:21 +0000 (10:00 +0100)]
ceph.spec: split ceph-devel to appropriate *-devel packages

ceph-devel contains various header files/bindings for several
libraries, this patch creates *-devel packages for all the libraries
separately and provides the compatibility layer for the split.

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

Signed-off-by: Boris Ranto <branto@redhat.com>
Amended by Ken Dreyer <kdreyer@redhat.com> to add version numbers to the
Obsoletes, add Obsoletes to the libradosstriper1-devel and
libcephfs_jni1-devel subpackages, adjust the librados documentation, and
add the Redmine issue number to this commit log.

Signed-off-by: Ken Dreyer <kdreyer@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 agoosd: number of degraded objects in EC pool is wrong when there is OSD down(in) 3729/head
Guang Yang [Fri, 13 Feb 2015 09:19:30 +0000 (09:19 +0000)]
osd: number of degraded objects in EC pool is wrong when there is OSD down(in)

With EC pool (crush rule choose indep), when there is an OSD down, the size of the 'acting' list does not change (CRUSH_ITEM_NONE is used to replace the down OSD), in this case, 'actingset' should be used to calculate the degraded objects.

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
10 years agocmake: add librbd/test_fixture.cc
Yehuda Sadeh [Fri, 13 Feb 2015 19:57:44 +0000 (11:57 -0800)]
cmake: add librbd/test_fixture.cc

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocmake: add os/XfsFileStoreBackend.cc to rules
Yehuda Sadeh [Fri, 13 Feb 2015 18:51:23 +0000 (10:51 -0800)]
cmake: add os/XfsFileStoreBackend.cc to rules

Signed-off-by: Yehuda Sadeh <yehuda@redhat.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 agomon/OSDMonitor: note osd map epoch in one other place 3662/head 3722/head
Sage Weil [Thu, 12 Feb 2015 21:51:17 +0000 (13:51 -0800)]
mon/OSDMonitor: note osd map epoch in one other place

Also add a note about why we don't do it in another.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomon/OSDMonitor: move osd epoch cache update into helper, add fixme
Sage Weil [Thu, 12 Feb 2015 21:50:42 +0000 (13:50 -0800)]
mon/OSDMonitor: move osd epoch cache update into helper, add fixme

There is no semantic change here, just a helper to make things more
clear.

Add warning about a potential bug so we don't lose track.

Signed-off-by: Sage Weil <sage@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 agomon/OSDMonitor: do not trust small values in osd epoch cache
Sage Weil [Thu, 12 Feb 2015 21:49:50 +0000 (13:49 -0800)]
mon/OSDMonitor: do not trust small values in osd epoch cache

If the epoch cache says the osd has epoch 100 and the osd is asking for
epoch 200+, do not send it 100+.

Fixes: #10787
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomon: MonCap: take EntityName instead when expanding profiles 3710/head
Joao Eduardo Luis [Wed, 11 Feb 2015 23:36:01 +0000 (23:36 +0000)]
mon: MonCap: take EntityName instead when expanding profiles

entity_name_t is tightly coupled to the messenger, while EntityName is
tied to auth.  When expanding profiles we want to tie the profile
expansion to the entity that was authenticated.  Otherwise we may incur
in weird behavior such as having caps validation failing because a given
client messenger inst does not match the auth entity it used.

e.g., running

ceph --name osd.0 config-key exists foo daemon-private/osd.X/foo

has entity_name_t 'client.12345' and EntityName 'osd.0'.  Using
entity_name_t during profile expansion would not allow the client access
to daemon-private/osd.X/foo (client.12345 != osd.X).

Fixes: #10844
Backport: firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@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>