RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,332 Commits 211 Branches 394 Tags 2.1 GiB
6a06f320c1
Commit Graph

33332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
6a06f320c1 Merge pull request #1776 from ceph/wip-8289 
rgw: cut short object read if a chunk returns error

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-07 15:03:31 -07:00
Sage Weil
7f5de5d00f Merge pull request #1773 from ceph/wip-8170 
rgw: send user manifest header field

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-07 14:53:04 -07:00
Sage Weil
d1307631c9 vstart.sh: fix client admin socket path 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-07 14:46:53 -07:00
Samuel Just
499b29a323 Merge pull request #1783 from guangyy/folder-merge-doc 
Update doc to reflect the bahavior change for filestore_merge_threshold setting.

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-07 11:05:59 -07:00
Samuel Just
7b1b553de0 Merge pull request #1784 from ceph/wip-da-cleanup-includes 
Cleanup some included headers

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-07 11:05:07 -07:00
Danny Al-Gaaf
6c49d6e126 Merge pull request #1775 from ceph/wip-rbd-clang 
fix clang-analyzer warnings in rbd and objectcacher

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 15:47:56 +02:00
Danny Al-Gaaf
3d280d6b10 Merge pull request #1782 from xinglin/coverity-fixes 
test/libcephfs/test.cc: free cmount structure before return

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 15:34:30 +02:00
Danny Al-Gaaf
99400f8218 osdmaptool.cc: cleanup included headers 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:21:46 +02:00
Danny Al-Gaaf
a5e0d802e4 monmaptool.cc: cleanup included headers 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:21:08 +02:00
Danny Al-Gaaf
537385cc16 ceph_osdomap_tool.cc: cleanup included headers 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:17:40 +02:00
Danny Al-Gaaf
d57561a8b7 ceph_monstore_tool.cc: cleanup included headers 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:15:25 +02:00
Danny Al-Gaaf
e2e3d1d074 ceph_filestore_tool.cc: remove not needed includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:14:44 +02:00
Danny Al-Gaaf
ea6df887ea ceph_kvstore_tool.cc: cleanup includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:12:56 +02:00
Danny Al-Gaaf
8620609884 ceph_filestore_dump.cc: cleanup includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:12:15 +02:00
Danny Al-Gaaf
16e86aef79 mon_store_converter.cc: remove not needed includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:03:35 +02:00
Danny Al-Gaaf
2c33ace302 dupstore.cc: remove not needed include of <iostream> 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:03:02 +02:00
Danny Al-Gaaf
b1f4cd45fc rest_bench.cc: remove not needed includes, re-order includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 14:02:20 +02:00
Danny Al-Gaaf
bc166f3a28 psim.cc: remove not used includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:56:33 +02:00
Danny Al-Gaaf
de252c11f5 scratchtool.c: remove not needed include of <pthread.h> 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:55:59 +02:00
Danny Al-Gaaf
4da889458c radosacl.cc: remove include of <iostream>, re-order includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:55:36 +02:00
Danny Al-Gaaf
24a047eca6 ceph_conf.cc: cleanup includes, remove not needed headers 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:53:36 +02:00
Danny Al-Gaaf
c0dcd231e9 ceph_authtool.cc: remove not needed includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:53:07 +02:00
Danny Al-Gaaf
e2b4d4175f ceph_monstore_tool.cc: remove not needed includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:27:38 +02:00
Danny Al-Gaaf
8ab3232ab6 rgw_admin.cc: remove twice included header, resort includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:27:38 +02:00
Danny Al-Gaaf
ddb9ce0e2f MDSMonitor.cc: remove twice included header, resorted includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:27:38 +02:00
Danny Al-Gaaf
a8a2b56437 AuthMonitor.cc: remove twice included header, resorted includes 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:27:38 +02:00
Danny Al-Gaaf
71b340a0fd ceph_osdomap_tool.cc: remove some twice included headers 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:27:38 +02:00
Danny Al-Gaaf
e66aec6eed ceph_monstore_tool.cc: remove twice included headers 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-07 13:27:38 +02:00
Guang Yang
f9a91f2b62 Update doc to reflect the bahavior change for filestore_merge_threshold setting. 
Signed-off-by: Guang Yang (yguang@yahoo-inc.com)
 2014-05-07 09:41:36 +00:00
Gregory Farnum
523619b0e5 Merge pull request #1532 from ceph/wip-fast-dispatch 
fast dispatch
This series adds an ms_fast_dispatch interface to the Messenger/Dispatcher, designed so that you can dispatch messages directly from the Pipe threads without going through the Dispatch queue.
It also sets the OSD to make use of this interface for most operations, and switches to finer-grained locking and use of local data in a bunch of different paths to enable that.

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-06 23:06:14 -07:00
Greg Farnum
5e5a0867b1 Merge remote-tracking branch 'origin/master' into wip-fast-dispatch 
Conflicts:
	src/osd/OSD.cc
 2014-05-06 22:23:06 -07:00
Xing Lin
0d3cdb9fdb test/libcephfs/test.cc: free cmount structure before return 
call ceph_shutdown to free cmount structure before return

Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
 2014-05-06 22:44:37 -06:00
Sage Weil
b7134c9a2e Merge pull request #1774 from ceph/wip-8296 
osd/ReplicatedPG: fix whiteouts for other cache mode

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-06 13:08:39 -07:00
Yehuda Sadeh
03b0d1cfb7 rgw: cut short object read if a chunk returns error 
Fixes: #8289
Backport: firefly, dumpling
When reading an object, if we hit an error when trying to read one of
the rados objects then we should just stop. Otherwise we're just going
to continue reading the rest of the object, and since it can't be sent
back to the client (as we have a hole in the middle), we end up
accumulating everything in memory.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
 2014-05-06 12:03:34 -07:00
Greg Farnum
2d5d3097c3 Pipe: wait for Pipes to finish running, instead of just stop()ing them 
Add a stop_and_wait() function that, in addition to closing the Pipe and killing
its socket, waits for any fast_dispatch call which is in-progress. Use this in
several parts of the Pipe and SimpleMessenger code where appropriate.

This fixes several races with fast_dispatch and other avenues; here are two:
1) It could be that we grab the lock while the existing pipe is fast_dispatching
and then proceed to dispatch messages ourself, beating it. Instead, wait for
the other pipe. Add a "reader_dispatching" member which tells bus this is
happening, and when re-locking, signal the cond if we're shutting down.

2) It could be that a normally-dispatched Message in the OSD triggers a
mark_down() on the Connection and then clears out the Session
(Connection::priv) pointer, causing a racing fast_dispatch()'ed function to
assert out in the OSD because it requires a valid Session.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-06 11:39:34 -07:00
Josh Durgin
6ec99f7a20 librbd: check return value during snap_unprotect 
This would only fail if the header object was corrupted, so it's
unlikely to occur in practice.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
 2014-05-06 11:21:09 -07:00
Josh Durgin
6f2eddaa2a ObjectCacher: remove useless assignment 
left is not read after the break. Caught by clang-analyzer.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
 2014-05-06 11:11:01 -07:00
Sage Weil
3e387d62ed osd/ReplicatedPG: fix whiteouts for other cache mode 
We were special casing WRITEBACK mode for handling whiteouts; this needs to
also include the FORWARD and READONLY modes.  To avoid having to list
specific cache modes, though, just check != NONE.

Fixes: #8296
Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-06 11:01:27 -07:00
Samuel Just
650051cd17 Merge pull request #1601 from ceph/wip-7576 
osd: prevent pg map epochs from lagging too far behind

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-06 10:49:46 -07:00
Josh Durgin
2b48e52c4c Merge pull request #1748 from onlyjob/docs 
sample.ceph.conf update:

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
 2014-05-06 10:12:45 -07:00
Josh Durgin
9c0e92f0ea Merge pull request #1653 from ceph/wip-7499 
rgw, radosgw-admin: bucket link uses bucket instance id now

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
 2014-05-06 10:10:59 -07:00
Yehuda Sadeh
5cc5686039 rgw: send user manifest header field 
Fixes: #8170
Backport: firefly
If user manifest header exists (swift) send it as part of the object
header data.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
 2014-05-06 10:00:17 -07:00
Sage Weil
f31e3ee00a Merge pull request #1768 from daniel-j-h/code_quality 
Variable length array of std::strings (not legal in C++) changed to std::vector<std::string>

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-06 07:12:00 -07:00
Sage Weil
e65a9da93a Revert "Fix installation into user home directory, broken by d3f0c0b" 
This reverts commit 7539281037.

This breaks mount.fuse.ceph installation.
 2014-05-06 07:04:56 -07:00
John Wilkins
cdbbf86fa3 doc: Fixed artifacts from merge. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-06 03:54:45 -07:00
John Wilkins
a31b9e9c75 doc: Added sudo to setenforce. Restored merge artifact. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-06 03:54:08 -07:00
John Wilkins
515827223f doc: Added erasure coding and cache tiering notes. Special thanks to Loic Dachary. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-06 03:53:03 -07:00
Daniel J. Hofmann
08a4e88897 Variable length array of std::strings (not legal in C++) changed to std::vector<std::string> 
Signed-off-by: Daniel J. Hofmann <daniel@trvx.org>
 2014-05-06 09:51:37 +02:00
Sage Weil
38408f6b68 Merge pull request #1770 from ceph/wip-8290 
client: check snap_caps in Incode::is_any_caps()

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-05 16:55:49 -07:00
Yan, Zheng
ae434a3536 client: check snap_caps in Incode::is_any_caps() 
Fixes: #8290
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
 2014-05-06 07:46:12 +08:00