]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Noah Watkins [Sat, 7 Dec 2013 17:58:43 +0000 (09:58 -0800)]
librbd: remove unused private variable
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Sat, 7 Dec 2013 17:54:53 +0000 (09:54 -0800)]
TrackedOp: remove unused private variable
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Sat, 7 Dec 2013 17:59:13 +0000 (09:59 -0800)]
librbd: rename howmany to avoid conflict
A howmany macro exists on some platforms in standard headers, but there
really isn't any sort of standard that I've found. We just avoid the
conflict entirely this way.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Sat, 7 Dec 2013 17:59:39 +0000 (09:59 -0800)]
rados_sync: fix mismatched tag warning
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Sat, 7 Dec 2013 18:01:30 +0000 (10:01 -0800)]
rados_sync: remove unused private variable
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Fri, 27 Sep 2013 14:38:11 +0000 (07:38 -0700)]
mon: check for sys/vfs.h existence
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Tue, 29 Oct 2013 15:54:01 +0000 (08:54 -0700)]
make: increase maximum template recursion depth
With clang on OSX spirit blows up without this.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Gregory Farnum [Tue, 3 Dec 2013 20:56:25 +0000 (12:56 -0800)]
Merge pull request #891 from ceph/wip-filestore-remount
allow various threaded services to be restarted to allow mount->umount->mount to work
Reviewed-by: Greg Farnum <greg@inktank.com>
Sage Weil [Tue, 3 Dec 2013 20:47:25 +0000 (12:47 -0800)]
Merge pull request #879 from xinglin/coverity-fixes
Coverity fixes
The rgw patch is
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
The rest is
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 3 Dec 2013 20:26:43 +0000 (12:26 -0800)]
common/WorkQueue: allow start() after stop()
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 3 Dec 2013 20:26:31 +0000 (12:26 -0800)]
os/FileStore: allow mount after umount
Clear the stop flag on successful shutdown so that we can start again
later.
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 3 Dec 2013 20:11:27 +0000 (12:11 -0800)]
common/Finisher: allow finisher to be restarted
Allow a start() after stop() by clearing the stop flag on a successful
stop.
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 3 Dec 2013 18:48:57 +0000 (10:48 -0800)]
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>
Josh Durgin [Tue, 3 Dec 2013 18:39:17 +0000 (10:39 -0800)]
Merge pull request #860 from dachary/wip-6827
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Xing Lin [Thu, 28 Nov 2013 06:06:55 +0000 (23:06 -0700)]
test/mon/workloadgen: added check of return value for statfs()
check the return value of statfs() in update_osd_stat()
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
test/mon/workloadgen: fixed typo in error message
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Xing Lin [Thu, 28 Nov 2013 06:35:50 +0000 (23:35 -0700)]
rgw/rgw_op: added check of return value for rgw_unlink_bucket()
checked the return value of rgw_unlink_bucket() in RGWCreateBucket::execute()
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Xing Lin [Thu, 28 Nov 2013 06:30:15 +0000 (23:30 -0700)]
os/WBThrottle: added check of return value for posix_fadvise()
check the return value of posix_fadvise() in WBThrottle::entry()
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Xing Lin [Thu, 28 Nov 2013 05:20:45 +0000 (22:20 -0700)]
test/filestore: add check of return values in StoreTest::SetUp
add return value check for function calls, including mkdir, mkfs
and mount
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
test/filestore: fix return value check for mkdir
allow EEXIST from mkdir()
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Xing Lin [Thu, 28 Nov 2013 05:06:37 +0000 (22:06 -0700)]
test/filestore/workloadgen: added check of return value for mkdir
check return value of mkdir
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
test/filestore/workloadgen: fix return value check for mkdir
allow EEXIST from mkdir()
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Sage Weil [Tue, 3 Dec 2013 16:13:03 +0000 (08:13 -0800)]
Merge pull request #889 from dachary/wip-osd-metadata
depends on #843 : CPU info + check osd metadata
Loic Dachary [Tue, 3 Dec 2013 14:39:36 +0000 (15:39 +0100)]
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>
Loic Dachary [Tue, 3 Dec 2013 14:12:23 +0000 (15:12 +0100)]
pybind: syntax check osd metadata
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Thu, 21 Nov 2013 12:21:22 +0000 (13:21 +0100)]
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>
Xing Lin [Fri, 8 Nov 2013 03:26:24 +0000 (20:26 -0700)]
test/ceph_decoder: add return value check for read_file()
check the return value of read_file function call
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Sage Weil [Thu, 31 Oct 2013 23:44:54 +0000 (16:44 -0700)]
doc/rados/operations/crush-map: describe crush locations, hook
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 3 Dec 2013 05:46:25 +0000 (21:46 -0800)]
add script/run-coverity
Keep this in-tree.
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 3 Dec 2013 01:36:32 +0000 (17:36 -0800)]
Merge pull request #887 from jdurgin/wip-peek-meta
osd: read into correct variable for magic string
Reviewed-by: Sage Weil <sage@inktank.com>
John Wilkins [Mon, 2 Dec 2013 23:26:19 +0000 (15:26 -0800)]
doc: Updated scrub defaults and added note about deep scrubbing.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Josh Durgin [Mon, 2 Dec 2013 22:54:04 +0000 (14:54 -0800)]
osd: read into correct variable for magic string
4d140a71a1a48081b449b7d8dde808eb6e74c6b2 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>
athanatos [Mon, 2 Dec 2013 21:07:19 +0000 (13:07 -0800)]
Merge pull request #881 from ceph/wip-objectstore
osd: clean up the osd / objectstore separation
Reviewed-by: Samuel Just <sam.just@inktank.com>
John Wilkins [Mon, 2 Dec 2013 18:49:04 +0000 (10:49 -0800)]
doc: Fixed hyperlink to the manual installation section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Mon, 2 Dec 2013 18:48:27 +0000 (10:48 -0800)]
doc: Added a link to get packages.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Sage Weil [Mon, 2 Dec 2013 18:21:17 +0000 (10:21 -0800)]
osd/OSDMap: fix typo and crush types helper
Bah!
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Mon, 2 Dec 2013 18:19:30 +0000 (10:19 -0800)]
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>
Sage Weil [Mon, 2 Dec 2013 18:10:45 +0000 (10:10 -0800)]
Merge pull request #876 from javacruft/wip-missed-module
Mark libcls_kvs as a module
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Mon, 2 Dec 2013 17:59:39 +0000 (09:59 -0800)]
Merge pull request #841 from ceph/wip-crush-chassis
osd/OSDMap: add 'chassis' to default type hierarchy
Reviewed-by: Loic Dachary <loic@dachary.org>
Sage Weil [Mon, 2 Dec 2013 17:24:41 +0000 (09:24 -0800)]
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>
Sage Weil [Mon, 2 Dec 2013 16:31:23 +0000 (08:31 -0800)]
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>
Sage Weil [Sun, 10 Nov 2013 06:03:42 +0000 (22:03 -0800)]
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>
Ilya Dryomov [Mon, 2 Dec 2013 09:52:31 +0000 (11:52 +0200)]
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>
Sage Weil [Mon, 2 Dec 2013 06:47:11 +0000 (22:47 -0800)]
Merge remote-tracking branch 'gh/next'
Sage Weil [Mon, 2 Dec 2013 06:21:31 +0000 (22:21 -0800)]
Partial revert "mon: osd pool set syntax relaxed, modify unit tests"
This reverts commit
08327fed8213a5d24cd642e12b38a171b98924cb , except
for the hashpspool bit. We switched back to an integer argument in
commit
337195f04653eed8e8f153a5b074f3bd48408998 .
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sat, 30 Nov 2013 21:44:27 +0000 (13:44 -0800)]
Merge remote-tracking branch 'gh/next'
Sage Weil [Sat, 30 Nov 2013 21:41:06 +0000 (13:41 -0800)]
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>
Sage Weil [Sun, 3 Nov 2013 04:21:39 +0000 (21:21 -0700)]
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>
Sage Weil [Sun, 3 Nov 2013 02:29:11 +0000 (19:29 -0700)]
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>
Sage Weil [Sun, 3 Nov 2013 02:23:06 +0000 (19:23 -0700)]
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>
Sage Weil [Sun, 3 Nov 2013 02:19:09 +0000 (19:19 -0700)]
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>
Sage Weil [Sun, 3 Nov 2013 01:56:53 +0000 (18:56 -0700)]
osd: use ObjectStore::create() helper to create ObjectStore impl
No more knowledge of FileStore!
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 3 Nov 2013 01:53:03 +0000 (18:53 -0700)]
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>
Sage Weil [Sun, 3 Nov 2013 00:39:14 +0000 (17:39 -0700)]
osd: drop obsolete 'filestore' bool option
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Mon, 25 Nov 2013 18:16:39 +0000 (10:16 -0800)]
osd: include misc osd config info in metadata sent to the mon
addr info, pathnames.
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 10 Nov 2013 05:53:14 +0000 (21:53 -0800)]
mon/OSDMonitor: include osd metadata in 'ceph report'
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sat, 30 Nov 2013 06:26:57 +0000 (22:26 -0800)]
mon/OSDMonitor: move osd metadata dump into a helper
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sat, 30 Nov 2013 06:25:28 +0000 (22:25 -0800)]
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>
Sage Weil [Sat, 30 Nov 2013 06:24:34 +0000 (22:24 -0800)]
Merge pull request #829 from ceph/port/detect-clang
conf: use better clang detection
Samuel Just [Wed, 27 Nov 2013 03:17:59 +0000 (19:17 -0800)]
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>
Samuel Just [Tue, 26 Nov 2013 21:20:21 +0000 (13:20 -0800)]
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>
James Page [Wed, 27 Nov 2013 09:06:28 +0000 (09:06 +0000)]
Mark libcls_kvs as a module
This was missed by the changes in commit
909a733fe7119fc1bf123b3739e3acc6f2135b6a
Signed-off-by: James Page <james.page@ubuntu.com>
Sage Weil [Tue, 26 Nov 2013 23:09:18 +0000 (15:09 -0800)]
Merge pull request #859 from ceph/wip-pr781
fix the bug ctypes.util.find_library to search for librados failed on...
Sage Weil [Tue, 26 Nov 2013 23:00:51 +0000 (15:00 -0800)]
Merge pull request #864 from javacruft/wip-debian-feedback
Misc fixes from current Debian packaging
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 26 Nov 2013 22:59:46 +0000 (14:59 -0800)]
Merge pull request #873 from ceph/wip-mds-assert
mds: Add assertion to catch object mutation error
Reviewed-by: Sage Weil <sage@inktank.com>
Josh Durgin [Tue, 26 Nov 2013 19:39:28 +0000 (11:39 -0800)]
test: remove zero-copy read_fd test temporarily
This fails since zero-copy from read_fd was temporarily disabled by
03d63c4b2d63b655924c5657637e85abdef40899 .
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Loic Dachary [Thu, 21 Nov 2013 12:08:19 +0000 (13:08 +0100)]
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>
Loic Dachary [Fri, 15 Nov 2013 23:55:20 +0000 (00:55 +0100)]
doc: fix formatting typo in mon configuration
Signed-off-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Loic Dachary [Fri, 15 Nov 2013 21:43:24 +0000 (22:43 +0100)]
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>
Josh Durgin [Tue, 26 Nov 2013 17:06:15 +0000 (09:06 -0800)]
Merge pull request #862 from ceph/wip-6829
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Tue, 26 Nov 2013 17:02:26 +0000 (09:02 -0800)]
Merge pull request #871 from dmick/wip-6894
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Sage Weil [Tue, 26 Nov 2013 16:59:51 +0000 (08:59 -0800)]
Merge pull request #872 from ceph/wip-5871
mds: remove superfluous warning of releasing lease
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 26 Nov 2013 15:59:09 +0000 (07:59 -0800)]
Merge pull request #874 from liewegas/wip-readme
README: add yum command line
Sage Weil [Tue, 26 Nov 2013 15:14:22 +0000 (07:14 -0800)]
README: add yum command line
This makes it easy to cut and paste. Yay!
Signed-off-by: Sage Weil <sage@inktank.com>
Yan, Zheng [Tue, 26 Nov 2013 07:06:19 +0000 (15:06 +0800)]
mds: Add assertion to catch object mutation error
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Yan, Zheng [Tue, 26 Nov 2013 06:41:00 +0000 (14:41 +0800)]
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>
Dan Mick [Tue, 26 Nov 2013 05:58:39 +0000 (21:58 -0800)]
mon: osd dump should dump pool snaps as array, not object
Fixes: #6894
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Josh Durgin [Tue, 26 Nov 2013 02:03:02 +0000 (18:03 -0800)]
Merge pull request #835 from ceph/wip-6705
qa: workunits: mon: ping.py: test 'ceph ping'
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Tue, 26 Nov 2013 00:43:51 +0000 (16:43 -0800)]
Merge branch 'wip-zero-copy-bufferlist-last'
Reviewed-by: Samuel Just <sam.just@inktank.com>
Josh Durgin [Mon, 25 Nov 2013 22:37:57 +0000 (14:37 -0800)]
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>
Li Wang [Mon, 18 Nov 2013 07:40:19 +0000 (15:40 +0800)]
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>
Li Wang [Mon, 18 Nov 2013 07:40:18 +0000 (15:40 +0800)]
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>
David Zafman [Mon, 25 Nov 2013 21:22:25 +0000 (13:22 -0800)]
Merge pull request #868 from ceph/wip-6896
osd: Remove bogus assert(active == acting.size())
Reviewed-by: Samuel Just <sam.just@inktank.com>
David Zafman [Mon, 25 Nov 2013 20:57:19 +0000 (12:57 -0800)]
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>
Sage Weil [Mon, 25 Nov 2013 17:24:19 +0000 (09:24 -0800)]
SubmittingPatches: describe github pull-request process
Signed-off-by: Sage Weil <sage@inktank.com>
Bastian Blank [Mon, 25 Nov 2013 16:16:40 +0000 (16:16 +0000)]
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>
Bastian Blank [Fri, 22 Nov 2013 14:24:56 +0000 (14:24 +0000)]
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>
Sage Weil [Mon, 25 Nov 2013 16:10:13 +0000 (08:10 -0800)]
ceph-object-corpus: revert accidental revert
From
5df3024d7847950672169069b9dc8c8dcb876019
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Mon, 25 Nov 2013 15:53:03 +0000 (07:53 -0800)]
Merge pull request #863 from ceph/wip-6804
rgw: lower some debug message
Reviewed-by: Sage Weil <sage@inktank.com>
Gregory Farnum [Mon, 25 Nov 2013 06:07:35 +0000 (22:07 -0800)]
Merge pull request #861 from dachary/init-ceph
init: fix typo s/{$update_crush/${update_crush/
David Zafman [Sat, 23 Nov 2013 01:09:54 +0000 (17:09 -0800)]
Merge pull request #832 from ceph/wip-flush-5855-review
Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
Josh Durgin [Fri, 18 Oct 2013 15:23:40 +0000 (08:23 -0700)]
buffer: enable tracking of calls to c_str()
Track buffer::ptr::c_str() to catch internal calls that use it, like
buffer::ptr::cmp(). buffer::list::c_str() will be captured by this as
well, since it will do a final buffer::ptr::c_str() and possibly
several more if it needs to rebuild into a single raw buffer.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Fri, 18 Oct 2013 14:58:10 +0000 (07:58 -0700)]
buffer: try to do zero copy in read_fd
Leave the explicit read_fd_zero_copy around as well for testing.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Fri, 18 Oct 2013 14:46:34 +0000 (07:46 -0700)]
buffer: attempt to size raw_pipe buffers
Make sure the requested length is below the maximum pipe size for now,
since we're only using one pipe and splicing once into and out of
it. The default max is 1MB on recent kernels, so this isn't such a
terrible limitation.
To get around this we could use multiple pipes, or keep both source and
destination fds open at the same time and call splice many times. This
is more usual usage for splice, but would require a lot more work to
restructure the filestore and messenger to handle it.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Mon, 21 Oct 2013 19:40:30 +0000 (12:40 -0700)]
buffer: add methods to read and write using zero copy
Create explicit methods for testing. Make buffer::list::write_fd() use
zero-copy if all the buffers support it. Don't automatically handle
reads yet, since we need better detection of read length first.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Mon, 21 Oct 2013 15:58:56 +0000 (08:58 -0700)]
buffer: create raw pipe-based buffer
This uses a pipe to reference kernel memory so we can use splice(2) to
avoid extra data copies. Take an fd in the factory to create it, since
that's the only way to use it efficiently, which is its whole purpose.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Mon, 21 Oct 2013 15:51:54 +0000 (08:51 -0700)]
buffer: add an exception with an error code
This allows e.g. raw buffer constructors to provide more specific
information about what failed, as well as a useful error string
automatically.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Sun, 20 Oct 2013 17:46:49 +0000 (10:46 -0700)]
safe_io: add functions for handling splice
Like the other functions, these don't handle non-blocking I/O.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Thu, 17 Oct 2013 23:34:55 +0000 (16:34 -0700)]
buffer: remove unused raw::length() method
This was accidentally introduced in
0c23a5624a80903fba7e635e8c44f38a79caf223
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Wed, 16 Oct 2013 23:23:36 +0000 (16:23 -0700)]
buffer: abstract raw data related methods
Create a virtual function that returns the raw data instead of
accessing it directly, so raw buffers backed by pipes can be used as
buffer::ptrs. Make raw::is_page_aligned() virtual so it will not need
to look at the raw data for a pipe-based buffer.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
John Wilkins [Fri, 22 Nov 2013 23:49:16 +0000 (15:49 -0800)]
doc: Clarified description on scrub load threshold.
fixes: #6735
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Fri, 22 Nov 2013 23:48:25 +0000 (15:48 -0800)]
doc: Fixed instruction.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Fri, 22 Nov 2013 23:16:18 +0000 (15:16 -0800)]
Merge branch 'master' of https://github.com/ceph/ceph