Commit Graph

29875 Commits

Author SHA1 Message Date
Sage Weil
f60f5fe943 Merge pull request #843 from ceph/wip-osd-metadata
feed osd info about os, kernel, memory, arch to the mons

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
2013-12-03 10:48:57 -08:00
Josh Durgin
9770d5d84e Merge pull request #860 from dachary/wip-6827
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-12-03 10:39:17 -08:00
Sage Weil
6ac9269d45 Merge pull request #889 from dachary/wip-osd-metadata
depends on #843 : CPU info + check osd metadata
2013-12-03 08:13:03 -08:00
Loic Dachary
602d5d53c0 osd: include CPU info
It will be handy when trying to figure out CPU bound problems / benchmarks.

Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-03 15:39:36 +01:00
Loic Dachary
f5025307d9 pybind: syntax check osd metadata
Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-03 15:12:23 +01:00
Loic Dachary
6570197871 ceph-disk: blacklist /dev/fd0
blkid -s TYPE /dev/fd0 has been verified to hang forever on a
H8DMR-82 supermicro motherboard running

3.8.0-33-generic #48~precise1-Ubuntu SMP Thu Oct 24 16:28:06 UTC 2013
x86_64

It is unlikely that ceph will ever be used on floppy disks, they
can be blacklisted.

http://tracker.ceph.com/issues/6827 fixes: #6827

Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-03 09:31:05 +01:00
Sage Weil
3f1352ff38 doc/rados/operations/crush-map: describe crush locations, hook
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-02 21:48:54 -08:00
Sage Weil
396ee0d423 add script/run-coverity
Keep this in-tree.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-02 21:46:25 -08:00
Sage Weil
283de99c74 Merge pull request #887 from jdurgin/wip-peek-meta
osd: read into correct variable for magic string

Reviewed-by: Sage Weil <sage@inktank.com>
2013-12-02 17:36:32 -08:00
John Wilkins
a5eda4fcc3 doc: Updated scrub defaults and added note about deep scrubbing.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-12-02 15:26:19 -08:00
Josh Durgin
f11b380e9a osd: read into correct variable for magic string
4d140a71a1 refactored this and
introduced a bug. peek_meta() was accidentally reading into magic,
then replacing magic with val, which was always the empty string,
resulting in the osd always failing to start due to 'mismatched'
magic values.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-12-02 15:16:46 -08:00
athanatos
cc71fae70b Merge pull request #881 from ceph/wip-objectstore
osd: clean up the osd / objectstore separation

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-12-02 13:07:19 -08:00
John Wilkins
c77ce90f5b doc: Fixed hyperlink to the manual installation section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-12-02 10:49:04 -08:00
John Wilkins
648f3bcd39 doc: Added a link to get packages.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-12-02 10:48:27 -08:00
Sage Weil
16b75768b8 osd/OSDMap: fix typo and crush types helper
Bah!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-02 10:21:28 -08:00
Sage Weil
1242642dab Merge pull request #882 from ceph/wip-6699
sysvinit, upstart: use df -P when weighting new OSDs

Reviewed-by: Noah Watkins <noah.watkins@inktank.com>
2013-12-02 10:19:30 -08:00
Sage Weil
a4254f7f0a Merge pull request #876 from javacruft/wip-missed-module
Mark libcls_kvs as a module

Reviewed-by: Sage Weil <sage@inktank.com>
2013-12-02 10:10:45 -08:00
Sage Weil
5274b3ef02 Merge pull request #841 from ceph/wip-crush-chassis
osd/OSDMap: add 'chassis' to default type hierarchy

Reviewed-by: Loic Dachary <loic@dachary.org>
2013-12-02 09:59:39 -08:00
Sage Weil
78df4a148e Merge pull request #883 from idryomov/wip-readme
README: update a list of build deps for rpm-based systems

Reviewed-by: Sage Weil <sage@inktank.com>
2013-12-02 09:24:41 -08:00
Sage Weil
6298a576d3 osd/OSDMap: add region, pdu, pod types while we are at it
One use noted that they have a 'pdu' type in their type hierarchy that
typically spans multiple racks.  Others are known to use the 'pod'
terminology; add that to.  And I can imagine 'region' above datacenter.

Factor this into a helper to make things a bit less fragile.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-02 08:31:23 -08:00
Sage Weil
3a6707a183 osd/OSDMap: add 'chassis' to default type hierarchy
A chassis is usually bigger than a host but smaller than a rack.  This will
be useful for a broad class of modern hardware that sticks multiple hosts
in the same chassis (in sleds, or on cards, or blades, or whatever).

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-02 08:25:34 -08:00
Ilya Dryomov
5e1fc14757 README: update a list of build deps for rpm-based systems
A list of build dependencies for rpm-based OSes is missing a few items.
This fills in the gaps.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2013-12-02 11:52:31 +02:00
Sage Weil
f5ddb12a82 Merge remote-tracking branch 'gh/next' 2013-12-01 22:47:11 -08:00
Sage Weil
e80ab94bf4 Partial revert "mon: osd pool set syntax relaxed, modify unit tests"
This reverts commit 08327fed82, except
for the hashpspool bit.  We switched back to an integer argument in
commit 337195f046.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-01 22:21:31 -08:00
Sage Weil
f50371f081 Merge remote-tracking branch 'gh/next' 2013-11-30 13:44:27 -08:00
Sage Weil
fd175ab921 sysvinit, upstart: use df -P when weighting new OSDs
This avoids parsing out the wrong value when a long device name makes
df wrap over two lines.

Fixes: #6699
Reported-by: Jan Harkes <jaharkes@cs.cmu.edu>
Reviewed-by: Noah Watkins <noah.watkins@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-30 13:41:15 -08:00
Sage Weil
4d140a71a1 os/ObjectStore: add {read,write}_meta
Move these from the OSD.  Use a generic implementation in ObjectStore that
hopefully all backends can share (so that it can remain in sync with the
start/stop scripts, ceph-disk, and other orchestration machinery).

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:28:36 -08:00
Sage Weil
6bb42a0c44 osd: move peek_journal_fsid() into ObjectStore (from OSD)
This kills the last FileJournal reference in the OSD!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:28:36 -08:00
Sage Weil
bf5a7b2427 os/ObjectStore: generalize the FileStore's target_version
This kills the last FileStore reference in the OSD.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:28:36 -08:00
Sage Weil
e0f208926b osd: construct ObjectStore outside of OSD
This lets ceph_osd.cc handle the config details and use it directly for
all of the random command-line stuff, eliminating a bunch of mostly-
useless static wrappers in OSD.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:28:36 -08:00
Sage Weil
41056e5297 osd: use ObjectStore::create() helper to create ObjectStore impl
No more knowledge of FileStore!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:28:36 -08:00
Sage Weil
237d6b8375 os/ObjectStore: add static create() method
Generic way to create an ObjectStore implementation of the required type,
so that users don't need to know anything about it.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:28:35 -08:00
Sage Weil
6d92a8ef82 osd: drop obsolete 'filestore' bool option
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:28:35 -08:00
Sage Weil
2974eb5ac4 osd: include misc osd config info in metadata sent to the mon
addr info, pathnames.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:26:59 -08:00
Sage Weil
ea9dabf7f8 mon/OSDMonitor: include osd metadata in 'ceph report'
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:26:59 -08:00
Sage Weil
c4f817f9cd mon/OSDMonitor: move osd metadata dump into a helper
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-29 22:26:57 -08:00
Sage Weil
51cd75080d Merge pull request #838 from xinglin/boost-program-option-check
autoconf: add check for the boost_program_options library

Reviewed-by: Noah Watkins <noah.watkins@inktank.com>
2013-11-29 22:25:28 -08:00
Sage Weil
444ddaef7b Merge pull request #829 from ceph/port/detect-clang
conf: use better clang detection
2013-11-29 22:24:34 -08:00
Samuel Just
838b6c8387 PG: don't query unfound on empty pgs
When the replica responds, it responds with a notify
rather than a log, which the primary then ignores since
it is already in the peer_info map.  Rather than fix that
we'll simply not send queries to peers we already know to
have no unfound objects.

Fixes: #6910
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-27 15:17:35 -08:00
Samuel Just
964c8e978f PG: retry GetLog() each time we get a notify in Incomplete
If for some reason there are no up OSDs in the history which
happen to have usable copies of the pg, it's possible that
there is a usable copy elsewhere on the cluster which will
become known to the primary if it waits.

Fixes: #6909
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-27 15:17:33 -08:00
James Page
7ec21ed8cf Mark libcls_kvs as a module
This was missed by the changes in commit 909a733fe7

Signed-off-by: James Page <james.page@ubuntu.com>
2013-11-27 09:06:28 +00:00
Sage Weil
ff60c364d3 Merge pull request #859 from ceph/wip-pr781
fix the bug  ctypes.util.find_library to search for librados failed on...
2013-11-26 15:09:18 -08:00
Sage Weil
909a733fe7 Merge pull request #864 from javacruft/wip-debian-feedback
Misc fixes from current Debian packaging

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-26 15:00:51 -08:00
Sage Weil
17b495ab58 Merge pull request #873 from ceph/wip-mds-assert
mds: Add assertion to catch object mutation error

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-26 14:59:46 -08:00
Josh Durgin
e5357c0c44 test: remove zero-copy read_fd test temporarily
This fails since zero-copy from read_fd was temporarily disabled by
03d63c4b2d.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-26 11:40:13 -08:00
Loic Dachary
bafb5c3604 doc: clarify crush rule create-simple and fix typos
update the description of osd crush rule create-simple using terms that
match the keywords from the crushmap to avoid confusion.

fix missing closing parenthesis in osd crush commands

Signed-off-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-26 09:44:49 -08:00
Loic Dachary
371dc71e12 doc: fix formatting typo in mon configuration
Signed-off-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-26 09:44:47 -08:00
Loic Dachary
00ee9a5289 doc: improve ceph-mon usage, fix ceph tell examples
The ceph-mon command usage is updated to document all of the ceph-mon
specific options.

The ceph tell usage examples for log and debug are using a deprecated syntax.

Signed-off-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-26 09:44:45 -08:00
Josh Durgin
890bd5b3a8 Merge pull request #862 from ceph/wip-6829
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-26 09:06:15 -08:00
Josh Durgin
8db8ed73da Merge pull request #871 from dmick/wip-6894
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-26 09:02:26 -08:00