Commit Graph

29907 Commits

Author SHA1 Message Date
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
Sage Weil
5254cbd3f6 Merge pull request #872 from ceph/wip-5871
mds: remove superfluous warning of releasing lease

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-26 08:59:51 -08:00
Sage Weil
57f9c252cd Merge pull request #874 from liewegas/wip-readme
README: add yum command line
2013-11-26 07:59:09 -08:00
Sage Weil
4fa8f68ff6 README: add yum command line
This makes it easy to cut and paste. Yay!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-26 07:19:24 -08:00
Yan, Zheng
b0dce8a0dc mds: Add assertion to catch object mutation error
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2013-11-26 15:10:17 +08:00
Yan, Zheng
09a4c1bbe9 mds: remove superfluous warning of releasing lease
When receiving the lease release message, it's possible that the lease
has already expired and the corresponding dentry has been trimmed from
the cache.

Fixes #5871

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2013-11-26 14:56:30 +08:00
Dan Mick
c409e362c8 mon: osd dump should dump pool snaps as array, not object
Fixes: #6894
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-11-25 22:37:59 -08:00
Josh Durgin
1804e136da Merge pull request #835 from ceph/wip-6705
qa: workunits: mon: ping.py: test 'ceph ping'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-25 18:03:02 -08:00
Josh Durgin
29ef3d4607 Merge branch 'wip-zero-copy-bufferlist-last'
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-11-25 17:12:03 -08:00
Josh Durgin
03d63c4b2d buffer: turn off zero-copy reads for now
Some users will need to be changed to handle getting the correct
length from bufferlist::read_fd.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-25 14:38:20 -08:00
Li Wang
784d1888a6 mds: Release resource before return
Close file before return.
Fix coverity issue: CID 1019571

Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reported-by: Xianxia Xiao <xianxiaxiao@ubuntukylin.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-25 13:57:40 -08:00
Li Wang
524f666e84 rbd: Release resource before return
Close file before return.
Fix coverity issue: CID 1019579

Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reported-by: Xianxia Xiao <xianxiaxiao@ubuntukylin.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-25 13:57:40 -08:00
David Zafman
d6c8830b28 Merge pull request #868 from ceph/wip-6896
osd: Remove bogus assert(active == acting.size())

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-11-25 13:22:25 -08:00
David Zafman
66f51f82d4 osd: Remove bogus assert(active == acting.size())
We saw this assert because active is not correctly computed.
Remove assert and incorrectly computed active count.
We already use acting.size() to determine whether to set PG_STATE_DEGRADED.

Fixes: #6896

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-11-25 13:20:49 -08:00
Sage Weil
5ccc2ecd30 SubmittingPatches: describe github pull-request process
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-25 09:24:19 -08:00
Bastian Blank
ab05580a68 Add missing stuff to clean target
Sweepup a few bits a pieces that get left behind by make clean.

Signed-off-by: James Page <james.page@ubuntu.com>
2013-11-25 16:20:10 +00:00
Bastian Blank
ae46c38c2d Correctly mark library modules
Mark RADOS class libraries as module so that they will be automatically
ignored when stripping binaries.

Signed-off-by: James Page <james.page@ubuntu.com>
2013-11-25 16:19:25 +00:00
Sage Weil
94ca1cc663 ceph-object-corpus: revert accidental revert
From 5df3024d78

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-25 08:10:13 -08:00
Sage Weil
fd1ec0fa90 Merge pull request #863 from ceph/wip-6804
rgw: lower some debug message

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-25 07:53:03 -08:00