Commit Graph

31198 Commits

Author SHA1 Message Date
Sage Weil
29eac1d14e Merge remote-tracking branch 'gh/wip-inline'
Passed fs suite, sage-2014-02-01_22:18:10-fs-wip-inline-testing-basic-plana,
modulo a snap test error in the suite.

Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2014-02-02 09:16:06 -08:00
Sage Weil
9c3a4d8af6 Merge pull request #1165 from mo22/client_fuse_multithreading
client: ceph-fuse use fuse_session_loop_mt to allow multithreaded operat...

Reviewed-by: Sage Weil <sage@inktank.com>
2014-02-01 21:00:41 -08:00
John Wilkins
b717e11b52 Merge pull request #1174 from alram/master
doc: rgw: el6 documentation fixes
2014-01-31 14:20:37 -08:00
Alexandre Marangone
ee4cfda151 doc: rgw: el6 documentation fixes
- fix a couple of typo for repo configuration and service restart
- the ceph package must be installed on RPM distro since the init
script relies on ceph-conf
- Note on radosgw service name for RPM distro

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
2014-01-31 13:55:55 -08:00
David Zafman
dffe6019c3 Merge pull request #1162 from ceph/wip-5997
Fixes: #5997

 Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-01-31 12:35:56 -08:00
David Zafman
48fbccece5 osd: Change some be_compare_scrub_objects() args to const
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
ce1ea619f6 osd: Change be_scan_list() arg to const
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
e1bfed52f9 common: buffer::ptr::cmp() is a const function
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
34eb549cd4 osd: Move the rest of scrubbing routines to the backend
Move enum scrub_error_type to osd_types.h
Move PG::_compare_scrub_objects to ReplicatedBackend::be_compare_scrub_objects
Move PG::_select_auth_object to ReplicatedBackend::be_select_auth_object
Move PG::_compare_scrubmaps to ReplicatedBackend::be_compare_scrubmaps

Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
f9128e89a3 osd: Move PG::_scan_list() to backend as ReplicatedBackend::be_scan_list()
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
37447e758e osd: Add scrub_supported() backend interface
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
Sage Weil
802692ed8e os/KeyValueStore: fix warning
./os/KeyValueStore.h: In member function ‘std::string KeyValueStore::strip_object_key(uint64_t)’:
warning: ./os/KeyValueStore.h:173:31: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘uint64_t {aka long long unsigned int}’ [-Wformat=]

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-31 07:19:10 -08:00
Sage Weil
f8316f1a1a Merge branch 'wip-inline' of git://github.com/kylinstorage/ceph
Conflicts:
	src/include/ceph_features.h
2014-01-31 07:00:49 -08:00
Sage Weil
3a53d6deae Merge pull request #1171 from ceph/wip-osdmap-features
mon: encode full osdmap with same feature bits as the incremental

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-01-30 21:01:16 -08:00
Josh Durgin
3665815738 Merge remote-tracking branch 'origin/next'
Conflicts:
	src/test/ceph-disk.sh
2014-01-30 15:40:09 -08:00
Josh Durgin
abcc17bf3f Merge pull request #1169 from dachary/wip-ceph-disk
Reviewed-by: Sage Weil <sage.weil@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-01-30 16:04:09 -08:00
Sage Weil
0389f1d62d mon/OSDMonitor: encode full OSDMap with same feature bits as the Incremental
Each monitor is independently encoding the full OSDMap and storing it in
its local store.  Sometime this happens when we do not have a valid value
for quorum_features (for example, it can happen during sync).

Instead, use the feature bits the Incremental was encoded with for the full
OSDMap so that they always match.

Note that this conveniently the *only* place in the mon where we encode
the full OSDMap, so we're capturing all paths.  Yay!

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-30 15:13:05 -08:00
Sage Weil
b9208b4774 OSDMap: note encoding features in Incremental encoding
The monitor will need to know what features the incremental was encoded
with so that it can encode the OSDMap using the same bits.  Introduce a
member that is set during decode.  During encode, encoding the value passed
in by the caller.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-30 15:09:58 -08:00
Josh Durgin
ab649919f2 Merge pull request #1170 from ceph/wip-pybind-enverr
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-01-30 13:10:37 -08:00
Ilya Dryomov
e4dd1beae5 pybind: improve EnvironmentError output
Follow 70c7c9e600 ("pybind/rados.py: improve error output") and
improve EnvironmentError output for librbd and libcephfs too.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-01-30 23:04:12 +02:00
Yehuda Sadeh
754ddb16cb rgw: fix build on centos
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-30 12:17:20 -08:00
Loic Dachary
d11d1880a7 Merge pull request #1145 from dachary/wip-mailmap
mailmap: organization affiliations

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
2014-01-30 12:15:21 -08:00
Loic Dachary
1628423036 mailmap: Rutger ter Borg affiliation
Reviewed-by: Rutger ter Borg <rutger@terborg.net>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
3a1a8c3e8a mailmap: Laurent Barbe affiliation
Reviewed-by: Laurent Barbe <laurent@ksperis.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
5b5bc0bc3e mailmap: anonymous contributions are unaffiliated
there only are a few of them

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
b0fe2a944b mailmap: Andras Elso affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
93a62d73b7 mailmap: Ma Jianpeng affiliation
and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
74d5bf506b mailmap: Simon Leinen is with SWITCH
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
f9132e0a9a mailmap: John Spray is with Inktank
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
49842db15b mailmap: Alan Somers affiliation
Reviewed-by: Alan Somers <asomers@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
79563e1905 mailmap: Jonathan Dieter affiliation
Reviewed-by: Jonathan Dieter <jdieter@lesbg.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
a28f1fa243 mailmap: Christian Marie affiliation
and name normalization

Reviewed-by: Christian Marie <pingu@anchor.net.au>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
aa7fc3bbb1 mailmap: Dan Chai is unaffiliated
and name normalization

Reviewed-by: Dan Chai <tengweicai@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:06 +01:00
Loic Dachary
cb9792eeec mailmap: Kai Zhang affiliation
Reviewed-by: Kai Zhang <zakir.exe@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:48 +01:00
Loic Dachary
30f4969f07 mailmap: Ron Allred name normalization
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:24 +01:00
Loic Dachary
b5d22eb89e mailmap: Thomas Bechtold affiliation
and canonical name. Also fix the name "Deutsche Telekom"

Reviewed-by: Thomas Bechtold <t.bechtold@telekom.de>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:24 +01:00
Loic Dachary
c8c103b71f mailmap: Xihui He affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:24 +01:00
Loic Dachary
f7b000e537 mailmap: Adam Twardowski affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:24 +01:00
Loic Dachary
47a5122e41 mailmap: Huang Jun is unaffiliated
and name normalization

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:24 +01:00
Loic Dachary
0dbf44ff71 mailmap: Kun Huang affiliation
As found at https://github.com/pyKun

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:24 +01:00
Loic Dachary
ad515bfec3 ceph-disk: support and test the absence of PATH
Although this is not exactly the context in which ceph-disk is run when
invoked by udev, it makes sure there is at least one sensible way of
using it when PATH is undefined.

Also make src/ceph.in not fail if PATH is not defined.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 20:11:02 +01:00
Loic Dachary
3f5e4f5250 ceph-disk: larger timeout in the test script
Otherwise slow machines may timeout just because they are slow and not
because the process is blocked by an actual problem.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 20:11:02 +01:00
Haomai Wang
d70efe9889 FileStore: avoid leveldb check for xattr when possible
Maintain an internal xattr called "spill_out" that indicates whether we
(may) have xattrs stored in omap.  If attribute is set, it will indicate
that we should or should not look in omap.  If the attribute is not
present, then we do not know and will also need to check.

For new stores, this will avoid the overhead of consulting omap in the
general case until a particular objects gets enough (or big) xattrs and
spills over.

For old stores, we will effectively fall back to the previous behavior
of always checking.

Implements #7059

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-01-30 11:01:33 -08:00
Josh Durgin
7b179119b2 Merge pull request #1159 from ceph/wip-rbd-rm-watchers
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-01-30 10:52:50 -08:00
Sage Weil
15c0dd02b6 Merge remote-tracking branch 'gh/next' 2014-01-30 09:19:59 -08:00
Sage Weil
6d1daeae08 unittest_striper: fix warning
In file included from test/test_striper.cc:1:0:
../src/gtest/include/gtest/gtest.h: In function ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int, T2 = unsigned int]’:
../src/gtest/include/gtest/gtest.h:1300:30: instantiated from ‘static testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int, T2 = unsigned int, bool lhs_is_null_literal = false]’
test/test_striper.cc:57:223: instantiated from here
warning: ../src/gtest/include/gtest/gtest.h:1263:3: comparison between signed and unsigned integer expressions [-Wsign-compare]

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-30 09:13:30 -08:00
Loic Dachary
83db8b0427 Merge pull request #1167 from mourgaya/master
doc: cls moved to subdirectory

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
2014-01-30 07:42:04 -08:00
Eric Mourgaya
f9071a7713 doc: cls moved to subdirectory
Signed-off-by: Eric Mourgaya <eric.mourgaya@gmail.com>
2014-01-30 15:26:04 +01:00
Ilya Dryomov
e78f7564b7 run-rbd-tests: run remove_with_watcher test
Bug #2533 has been fixed for a while now, start running
remove_with_watcher test.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-01-30 14:47:45 +02:00
Ilya Dryomov
4ebc32f37a rbd: don't forget to call close_image() if remove_child() fails
close_image() among other things unregisters a watcher that's been
registered by open_image().  Even though it'll timeout in 30 or so
seconds, it's not nice now that we check for watchers before starting
the removal process.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-01-30 14:47:45 +02:00