RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,103 Commits 219 Branches 396 Tags 1.4 GiB
eb3b2024f2
Commit Graph

60103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spray
ff9b388f15 Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug 
osdc: After write try merge bh.

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-11-11 12:06:53 +01:00
Wido den Hollander
33f1f60778
osd: Add config option to disable new scrubs during recovery 
The osd_scrub_during_recovery config option allows for configuring
if the OSD will schedule a new scrub while recovery is active.

When set to false no new scrubs will be initiated by the OSD while
there are recovery threads active on that OSD.

Signed-off-by: Wido den Hollander <wido@42on.com>
 2016-11-11 11:53:50 +01:00
Kefu Chai
b581df1778 Merge pull request #10853 from wido/docs-mon-pool-settings 
doc: Add MON docs about pool flags and pool removal config settings

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-11 17:36:28 +08:00
Wido den Hollander
61bf31f847
doc: Add MON docs about pool flags and pool removal config settings 
Signed-off-by: Wido den Hollander <wido@42on.com>
 2016-11-11 10:00:27 +01:00
Michal Jarzabek
d3bbcffa38 mds/MDCache.h: remove unused functions 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-11-11 08:14:39 +00:00
Brad Hubbard
6cc6aca053 msg: Fix typos in socket creation error message 
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
 2016-11-11 16:30:14 +10:00
xie xingguo
5bfe679b67 os/bluestore: remove dead assert 
This assert will never fire, hence it can be safely removed.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-11 13:53:31 +08:00
xie xingguo
b32cbcd78f os/bluestore: make Extent deleter as independent disposer 
Duplicated definition of lambas of same function is not good.
Also switching ExtentMap::rm() to use the new disposer to
keep pace with others.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-11 13:53:16 +08:00
Dongsheng Yang
d2705be626 rbd-mirror: remove unused comment 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2016-11-10 23:40:19 -05:00
xie xingguo
ef084317ab os/bluestore: fix compiler warnings 
As follows:

/home/jenkins-build/build/workspace/ceph-pull-requests/build/boost/include/boost/intrusive/pointer_plus_bits.hpp: In member function ‘bool BlueStore::ExtentMap::encode_some(uint32_t, uint32_t, ceph::bufferlist&, unsigned int*)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/build/boost/include/boost/intrusive/pointer_plus_bits.hpp:76:7: warning: ‘dummy’ is used uninitialized in this function [-Wuninitialized]
       n = pointer(uintptr_t(p) | (uintptr_t(n) & Mask));
       ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/os/bluestore/BlueStore.cc:1779:10: note: ‘dummy’ was declared here
   Extent dummy(offset);

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-11 10:18:36 +08:00
Jason Dillaman
626432160d Merge pull request #11902 from ceph/wip-krbd-mons-fix 
krbd: kernel client expects ip[:port], not an entity_addr_t

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-10 18:24:48 -05:00
Michal Jarzabek
1b266ee3b0 mds/ScrubHeader.h: pass string by const reference 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-11-10 22:49:26 +00:00
Sage Weil
2b63a5d71a Merge pull request #11903 from dmick/master 
README: hint at where to look to diagnose test failures
 2016-11-10 16:48:18 -06:00
Dan Mick
f81a47dbe3 README: hint at where to look to diagnose test failures 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2016-11-10 14:43:41 -08:00
Sage Weil
fcb8d754eb Merge pull request #11895 from xiexingguo/xxg-wip-bluestore-blob-range 
os/bluestore: readability improvements and doxygen fix

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-10 16:39:38 -06:00
Sage Weil
c78545a051 Merge pull request #11900 from linuxbox2/fix-civetweb-link 
cmake: replace civetweb symlink w/file copy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-11-10 16:29:35 -06:00
Ilya Dryomov
480c71a7ad krbd: kernel client expects ip[:port], not an entity_addr_t 
Commit 2ee1b9a408 ("krbd.cc: don't rely on MonMap internal members")
inadvertently dropped .get_sockaddr() call, breaking rbd map.  Fix it.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2016-11-10 22:37:17 +01:00
Dan Mick
6754d97983 Merge pull request #11897 from liewegas/wip-pool-delete 
tests: fix tests vs pool deletion

The default changed to disallow pool delete as of #11665; the tests assume it's allowed.
Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-11-10 13:01:33 -08:00
Matt Benjamin
d9e5ad5e92 cmake: replace civetweb symlink w/file copy 
Intended to remove an apparent race.  The two effects are
1. replace top-level command callouts w/file builtins
2. do them in the src/rgw sub-cmake

This is cleaner, and ideally avoids the race.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-11-10 14:44:27 -05:00
Sage Weil
c5180262a0 os/filestore/HashIndex: fix list_by_hash_* termination on reaching end 
If we set *next to max, then the caller (a few lines up) doesn't terminate
the loop and will keep trying to list objects in every following hash
dir until it reaches the end of the collection.  In fact, if we have an
end bound we will never to an efficient listing unless we hit the max
first.

For one user, this was causing OSD suicides when scrub ran because it
wasn't able to list all objects before the timeout.  In general, this would
cause scrub to stall a PG for a long time and slow down requests.

Broken by refactor in 921c4586f1.

Fixes: http://tracker.ceph.com/issues/17859
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-11-10 13:56:24 -05:00
Sage Weil
5944838ce4 vstart.sh: allow pool deletion 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-11-10 11:48:19 -05:00
Sage Weil
573e5b060e qa/workunits/ceph-helpers.sh: allow pool deletes 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-11-10 11:43:41 -05:00
Sage Weil
f1476e221e Merge pull request #11894 from xiexingguo/xxg-wip-bluestore-1110 
os/bluestore: speed up omap-key generation for same onode(the read paths)

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-10 09:18:16 -06:00
Sage Weil
891fefbf19 Merge pull request #11893 from xiexingguo/xxg-wip-bluestore-fix-clear 
os/bluestore: fix potential memory leak

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-10 09:13:12 -06:00
Kefu Chai
b8e7ce393b Merge pull request #11892 from tchaikov/wip-move-context 
Context: std::move the callback param in FunctionContext's ctor

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-11-10 22:38:50 +08:00
xie xingguo
da194fc971 os/bluestore: doxygen fixes 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-10 20:12:35 +08:00
Kefu Chai
c1b2e3ae33 Merge pull request #11889 from trociny/wip-vstart-bashism 
vstart.sh: fix bashism in the script

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 20:04:59 +08:00
Kefu Chai
d3927fe3a4 Merge pull request #11601 from ceph/wip-ms-async-keepalive2 
msg/async/AsyncConnection: dispatch write handler on keepalive2

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-11-10 19:55:34 +08:00
Kefu Chai
f669cf8261 Merge pull request #11633 from ddiss/tcc17684_rados_segv_without_pool 
rados: fix segfaults when run without --pool

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 19:53:44 +08:00
Kefu Chai
5d7f4ea4fc Merge pull request #11665 from wido/mon-prevent-pool-delete 
mon: Do not allow pools to be deleted by default

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 19:52:27 +08:00
Kefu Chai
0e9462b66a Merge pull request #11795 from runsisi/wip-fix-osd-noin 
mon/OSDMonitor: newly created osd should not be wrongly marked in

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-10 19:50:49 +08:00
Kefu Chai
e2a4302620 Merge pull request #10049 from sponce/wip-striper-async-rm-master 
librados: improvements async IO in librados and libradosstriper

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 19:48:47 +08:00
Kefu Chai
654e5159f4 Context: std::move the callback param in FunctionContext's ctor 
for better performance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 19:41:09 +08:00
Kefu Chai
a8cafa9553 Merge pull request #11883 from jcsp/wip-mgr-functioncontext 
mgr: remove unnecessary C_StdFunction

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 19:17:32 +08:00
xie xingguo
0590a32d61 os/bluestore: improve the readability of Extent::blob_escapes_range() 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-10 19:11:25 +08:00
xie xingguo
18219d17b2 os/bluestore: fix potential memory leak 
Call to extent_map.clear_and_dispose() will be noop after extent_map.clear()
hence causing memory leak.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-10 18:38:15 +08:00
Mykola Golub
d447339e48 vstart.sh: fix bashism in the script 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-11-10 12:14:49 +02:00
xie xingguo
d04f7d46d4 os/bluestore: speed up omap-key generation for same onode(the read paths) 
In https://github.com/ceph/ceph/pull/11807 we only modify the write paths,
this patch fixes the read parts too, which are more time-sensitive.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-10 17:30:27 +08:00
Kefu Chai
8b77898b28 Merge pull request #11886 from stiopaa1/mds_mantle_includeCorrectHeaders 
mds/Mantle.h: include correct header files

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-10 16:09:42 +08:00
Kefu Chai
f628bac31a Merge pull request #11683 from wjwithagen/wip-wjw-freebsd-vstart 
src/vstart.sh: Only execute btrfs if it is available

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 10:39:33 +08:00
Kefu Chai
37f3897c55 Merge pull request #11702 from wjwithagen/wip-wjw-freebsd-cephtool-test 
qa/workunits/cephtool/test.sh: FreeBSD has no distro.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-10 10:18:23 +08:00
John Spray
b33e265edb mds: remove unused EFragment::OP_ONESHOT 
EFragment::decode had a minimum version of 4, and
the only way you could get the ONESHOT value was if
you had a struct_v < 2.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-11-10 00:08:07 +00:00
Sage Weil
8e325b92d0 Merge pull request #11885 from cbodley/wip-python-rgw-deb 
deb: update python-rgw dependencies to librgw2

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-09 16:51:13 -06:00
Michal Jarzabek
50feb66b5f mds/Mantle.h: include correct header files 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-11-09 22:40:17 +00:00
Casey Bodley
96923c726c deb: update python-rgw dependencies to librgw2 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-11-09 17:33:13 -05:00
Matt Benjamin
06275a7933 Merge pull request #11881 from linuxbox2/rgw-file-fsid 
rgw_file: fix spurious mount entries w/Linux NFS client
verified that failed check is in osd-scrub-repair.sh
 2016-11-09 17:28:39 -05:00
Sage Weil
299ecc3586 Merge pull request #11882 from yehudasa/wip-yehuda-spdk 
spdk: a few fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-09 15:13:48 -06:00
John Spray
624bdbcf3a mgr: remove unnecessary C_StdFunction 
FunctionContext works fine and already existed.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-11-09 19:54:32 +00:00
Danny Al-Gaaf
79d658f5c0 test_ImageReplayer.cc: prefer ++operator for non-primitive iterators 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2016-11-09 14:45:22 -05:00
Danny Al-Gaaf
aebacf0a31 rgw/rgw_user.cc: remove unused code 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2016-11-09 14:45:22 -05:00