Commit Graph

33368 Commits

Author SHA1 Message Date
John Spray
8584b40686 fragtree: remove dead code
Signed-off-by: John Spray <john.spray@inktank.com>
2014-05-08 13:28:55 +01:00
Yan, Zheng
3f837254dd Merge pull request #1742 from ceph/wip-multimds
Wip multimds
2014-05-08 11:36:23 +08:00
Yan, Zheng
34e27e46a5 mds: remove unused MMDSCacheRejoin::{MISSING,FULL}
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-08 11:29:18 +08:00
Yan, Zheng
1f60060258 mds: properly wake up dentry waiters after fragmenting dirfrag
When active MDS wants to fragment a replica dirfrag, it should set
the 'replay' parameter of MDCache::adjust_dir_fragments() to false.
It makes sure that CDir::merge/split wake up any dentry waiter.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-08 11:29:18 +08:00
Yan, Zheng
5fa2bae3a5 mds: choose MIX state if replica of scatterlock is in MIX state
After ScatterLock::infer_state_from_strong_rejoin() set scatterlock
to LOCK_MIX state, don't change the scatterlock to other state.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-08 11:29:17 +08:00
Yan, Zheng
3ca0d01801 mds: switch flushing ScatterLock to dirty ScatterLock after cache rejoin
Otherwise the flushing flag may confuse Locker::eval_gather() if MDS later
imports lock's parent inode.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-08 11:29:17 +08:00
Josh Durgin
ff3987d476 Merge pull request #1766 from ceph/wip-fsx-krbd
krbd mode for librbd_fsx

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-05-07 18:13:04 -07:00
Sage Weil
b1805e74b7 Merge pull request #1780 from ceph/wip-8299
rgw: fix stripe_size calculation

Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-07 15:14:47 -07:00
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
Ilya Dryomov
817985b4dd test_librbd_fsx: align temporary buffers allocated in check_clone()
check_clone() allocates temporary good_buf and temp_buf with malloc(),
which is not good enough for krbd with O_DIRECT.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:06 +04:00
Ilya Dryomov
ab9de9c05c test_librbd_fsx: wire up O_DIRECT mode
Wire up O_DIRECT mode (-Z) for krbd, to have a workaround for possible
problems with BLKDISCARD leaving stale entries in the buffer cache in
place.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:06 +04:00
Ilya Dryomov
c4a764cc80 test_librbd_fsx: fix a bug in docloseopen()
docloseopen() always opens $iname image.  This is bad, because the
image we had opened could have been something like $iname-clone3.  Fix
it by leveraging the fact that rbd_ctx has an image name field.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
421e6c5617 test_librbd_fsx: add krbd mode support
Add krbd mode support (-K) to test krbd in the same way librbd is
tested.  This introduces a dependency on libkrbd and, because it's
a C++ static library, requires C++ linking.  The rbd_operations
framework can be extended in the future to also test rbd_fuse.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
d5daf7187a test_librbd_fsx: add a flag to disable randomized striping
In preparation for krbd mode support, introduce an option to disable
randomized striping.  The kernel as of 3.15 does not support "fancy"
striping and will not map images with non-default striping values.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
fef984b937 test_librbd_fsx: add holebdy option
In preparation for krbd mode support, provide an option to specify
alignment for discards.  The kernel will reject discard requests whose
offset and length are not sector-size aligned.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
d63808ed09 test_librbd_fsx: make resizes sector-size aligned
In preparation for krbd mode support, change check_trunc_hack() to
resize to a sector-size aligned value.  The kernel will not work with
images whose size is not sector-size aligned.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
3513ba0ac4 test_librbd_fsx: use posix_memalign() to allocate aligned buffers
Use posix_memalign() to allocate good_buf and temp_buf, which must be
writebdy and readbdy aligned respectively.  Using round_ptr_up() the
way it is used makes fsx crash on free()s at the end of main(), because
the pointer returned by malloc() is overwritten by the aligned pointer.

Drop round_ptr_up() as it is no longer used.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
7df50ecd80 test_librbd_fsx: align temp_buf by readbdy instead of writebdy
temp_buf is used for reads, so align it by readbdy.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
d13e32e201 test_librbd_fsx: move prterrcode() and simple_err()
Move prterrcode() and simple_err() so that all printing functions are
close together.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04:00
Ilya Dryomov
8d41f86f42 test_librbd_fsx: update usage
Update usage to include all options and flags.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-07 17:30:05 +04: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