RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-30 07:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,826 Commits 210 Branches 394 Tags 1.4 GiB
36bf16d073
Commit Graph

59826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
36bf16d073 Merge pull request #11293 from liewegas/wip-mon-markout 
mon: preserve osd weight when marking osd out, then in

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-11 22:00:39 +08:00
John Spray
c88c395938 Merge pull request #11790 from jcsp/wip-mclientcaps 
client: remove unneeded layout on MClientCaps

Reviewed-by: Jeff Layton <jlayton@redhat.com>
 2016-11-11 12:10:49 +01:00
John Spray
d5bea25b50 Merge pull request #11789 from jcsp/wip-17798 
mds: require MAY_SET_POOL to set pool_ns

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-11 12:10:21 +01:00
John Spray
36905d7caf Merge pull request #11783 from jcsp/wip-17796 
mds: enable rmxattr on pool_namespace attrs 

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-11 12:09:57 +01:00
John Spray
babbfbc8e1 Merge pull request #11739 from SUSE/wip-17747 
mds: remove "--journal-check" help text
 2016-11-11 12:09:26 +01:00
John Spray
52efd27aec Merge pull request #11692 from stiopaa1/mds_flock_addConstToMemFun 
mds/flock: add const to member functions
 2016-11-11 12:07:46 +01:00
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
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
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
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
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
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
Sage Weil
ee3fa76234 Merge pull request #11811 from tanghaodong25/reap-ioc-wip 
os/bluestore: reap ioc when stopping aio_thread.

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-09 13:36:27 -06:00
Matt Benjamin
d929ba0c5b rgw_file: fix spurious mount entries w/Linux NFS client 
This change fixes the initialization of root file handles to have
their correct fs instance.  Previously, the root file handle had
fs_inst-1.  The apparent change in fsid in a subordinate directory
triggers the client's behavior for new filesystem mounts, which
we don't want.

Fixes: http://tracker.ceph.com/issues/17850

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-11-09 14:28:36 -05:00
Sage Weil
0a45b22f78 Merge pull request #11832 from ceph/wip-python-rgw 
deb: add python-rgw packages

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
 2016-11-09 11:42:09 -06:00
Sage Weil
ffc3dd6e9a debian: add python-rgw package 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-11-09 12:22:46 -05:00
Sage Weil
3aab75e0d2 Merge pull request #11845 from xiexingguo/xxg-wip-bs-1109 
os/bluestore: remove duplicated namespace of tx state

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-09 11:13:58 -06:00
Kefu Chai
88ed951473 Merge pull request #11859 from ceph/wip-py-rgw 
doc: add python-rgw doc

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-11-10 00:45:43 +08:00