RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,645 Commits 216 Branches 395 Tags 1.4 GiB
aa28b58df9
Commit Graph

47645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abhishek Lekshmanan
aa28b58df9 vstart: update help with a few more switches 
Add the `bluestore`, `memstore` and `cache` tier options to the vstart
help

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-01-18 11:56:20 +01:00
Kefu Chai
3daf908ba0 Merge pull request #5900 from ritz303/wip-doc-12899 
doc: Updated the rados command man page to include the --run-name opt…

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-01-16 00:45:48 +08:00
Casey Bodley
1e9fc0630f Merge pull request #7249 from ceph/wip-fix-cmake-trusty 
cmake: fix the build on trusty
 2016-01-15 11:07:45 -05:00
Kefu Chai
10335c507a cmake: fix the build on trusty 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-01-15 22:42:07 +08:00
Sage Weil
31034f6d74 Merge branch 'wip-compressor' 
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 19:04:53 -05:00
Ved-vampir
300c2f773b Compressor: compressor plugins unit tests 
Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
 2016-01-14 19:04:19 -05:00
Ved-vampir
2cadc416ca Compressor: compressor code extention: plugin system added 
Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
 2016-01-14 19:04:11 -05:00
Sage Weil
c5a3c2b1e4 Merge pull request #6425 from branch-predictor/bp-delayed-pglog-index-v2 
osd: delay populating in-memory PG log hashmaps

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 19:02:30 -05:00
Sage Weil
2f9f91b6a1 Merge pull request #6797 from mathslinux/fix-parse-return 
rgw: fix wrong check for parse() return

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-01-14 19:01:00 -05:00
Sage Weil
b8bc25b0f0 Merge pull request #7087 from H3C/wip-yrf-cephdf 
mon: add RAW USED column to ceph df detail

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 19:00:16 -05:00
Sage Weil
cae2e2c60b Merge pull request #7106 from tchaikov/wip-11101 
ceph: improve the error message

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 18:59:46 -05:00
Sage Weil
852f076f6d Merge pull request #7122 from xiexingguo/xxg-wip-bluefs 
osd: bluestore: fix several bugs

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 18:59:12 -05:00
Sage Weil
7241bf3316 Merge pull request #7196 from liewegas/wip-bluestore 
osd: bluestore: fix space rebalancing, collection split, buffered reads
 2016-01-14 18:57:57 -05:00
Sage Weil
1c85998b49 Merge pull request #7200 from xiexingguo/xxg-wip-14343 
osd: bluestore: bluefs: fix several small bugs

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 18:57:26 -05:00
Sage Weil
f6900b826f Merge pull request #7213 from xiexingguo/xxg-wip-14351 
osd: kstore: several small fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 18:56:16 -05:00
Jason Dillaman
a290d34ebd Merge remote-tracking branch 'upstream/jewel' 2016-01-14 16:21:05 -05:00
Sage Weil
dd63cdce71 Merge pull request #7222 from dack/master 
ceph-disk: add -f flag for btrfs mkfs

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-14 15:49:03 -05:00
Greg Farnum
ee757a966a Merge branch 'greg-fs-testing' 2016-01-14 10:27:17 -08:00
Greg Farnum
7d52372ae7 fsx: checkout old version until it compiles properly on miras 
I sent a patch to xfstests upstream at
http://article.gmane.org/gmane.comp.file-systems.fstests/1665, but
until that's fixed we need a version that works in our test lab.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2016-01-14 10:26:43 -08:00
Greg Farnum
11cd84ca71 Merge branch 'wip-13569' of git://github.com/ukernel/ceph into greg-fs-testing 
https://github.com/ceph/ceph/pull/6463

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-01-14 10:26:21 -08:00
Greg Farnum
bf9790e1c5 Merge branch 'wip-13127-master' into greg-fs-testing 
https://github.com/ceph/ceph/pull/5990

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-14 10:25:35 -08:00
Greg Farnum
e7dc5fb798 Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing 
https://github.com/ceph/ceph/pull/5658

Reviewed-by: John Spray <jspray@redhat.com>

Conflicts:
	src/common/config_opts.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2016-01-14 10:24:15 -08:00
Greg Farnum
1d3f80acc3 Merge branch 'wip-root-metadata' of git://github.com/jcsp/ceph into greg-fs-testing 
https://github.com/ceph/ceph/pull/6179

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-01-14 10:23:18 -08:00
Sage Weil
256dc84da3 doc/release-notes: v10.0.2 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-14 09:47:38 -05:00
Jason Dillaman
55a78e55a0 Merge pull request #7235 from theanalyst/fix/pybind-build-failure 
pybind: fix build failure, remove extraneous semicolon in method

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-01-14 09:30:46 -05:00
Sage Weil
6a309c81bc pybind/rbd.pyx: drop stray semicolon 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-14 09:22:48 -05:00
Sage Weil
e92cbde530 os/bluestore/FreelistManager: fix _dump locking 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-14 09:18:24 -05:00
Abhishek Lekshmanan
386834ca9a pybind: remove extraneous semicolon in method 
A semicolon on `rbd_build_object_map` method was causing build failures
in current master

Fixes: #14371
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-01-14 15:04:22 +01:00
Sage Weil
9e07482007 osd: less chatter about tick 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-14 08:46:45 -05:00
Kefu Chai
4c4d929972 Merge pull request #7212 from caibo2014/fix-cephin-pipe-error 
ceph.in: avoid a broken pipe error when use ceph command

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-01-14 20:23:28 +08:00
Bo Cai
f6eb3e5569 ceph.in:avoid a broken pipe error when use ceph command 
Fixes: #14354
Signed-off-by: Bo Cai <cai.bo@h3c.com>
 2016-01-14 20:10:02 +08:00
xie xingguo
2be865c52d kstore: remove unreachable code 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 20:01:27 +08:00
Loic Dachary
a44968ad99 Merge pull request #7210 from swamireddy/contrib_list_10 
mailmap update

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-01-14 12:05:56 +01:00
Kefu Chai
fd305c813e Merge pull request #7227 from dwj192/dwj-paxos 
mon: paxos is_recovering calc error

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-01-14 18:21:15 +08:00
Yan, Zheng
1eb13d9681 Merge pull request #7216 from jcsp/wip-14357 
mds: advance clientreplay when replying
 2016-01-14 18:16:58 +08:00
Loic Dachary
70b3d18743 Merge pull request #7219 from aiicore/affiliation 
mailmap: Igor Podoski affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-01-14 09:35:00 +01:00
xie xingguo
a987fc3a37 BlueStore: decrease max listed object number from 5 to 1 
For the sake of performance.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:49:50 +08:00
xie xingguo
c8aae0c108 kstore: decrease max listed object number from 5 to 1 
For the sake of performance.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:47:07 +08:00
xie xingguo
d3395549e8 BlueStore: kill warnings 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:43:59 +08:00
xie xingguo
635bda3630 BlueStore: fix wrong verification of object key 
Fixes: #14353
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:03 +08:00
xie xingguo
3cdf36b334 BlueStore: fix unhandle error cases during block file setup 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:03 +08:00
xie xingguo
2e77e9ac16 BlueStore: remove unused local variable "empty" 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:03 +08:00
xie xingguo
1f1f577d06 BlueStore: remove redundant omap_head check 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:03 +08:00
xie xingguo
dc94eb76ca BlueStore: fix potential null pointer access 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:03 +08:00
xie xingguo
4e124e5714 BlueStore: fix result code overwritten 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:03 +08:00
xie xingguo
c64d339419 BlueStore: fix shared_ptr leak during fsck 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:03 +08:00
xie xingguo
0747e3bdec BlueStore: fix shared_ptr leak during mount 
Fixes: #14261
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:02 +08:00
xie xingguo
de0a5d297c BlueStore: fix typo 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:02 +08:00
xie xingguo
a0112a2171 BlueStore: fix memory leak in several abnormal cases 
Fixes: #14260
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 14:30:02 +08:00
xie xingguo
d5900ea033 BlueStore: reset result code to errno for better tracing 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-14 13:45:34 +08:00