RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 06:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,238 Commits 216 Branches 394 Tags 1.2 GiB
3e6c951f68
Commit Graph

54238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
3e6c951f68 Merge pull request #9516 from liewegas/wip-bluestore-fixes 
os/bluestore: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-06-06 09:26:56 -04:00
xie xingguo
5cfb2d5c1a bluestore: add "0x" prefix for tracing messages 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 09:10:49 -04:00
xie xingguo
3d849bd322 bluestore: simplify flag translation logic 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 09:10:49 -04:00
xie xingguo
8c75de795c bluestore: fix is_allocated() method of bluestore_blob_t 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 09:10:49 -04:00
Sage Weil
944a895234 Merge pull request #9254 from branch-predictor/bp-lockdep-on-diet 
lockdep: Lockdep on diet

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 08:52:49 -04:00
Kefu Chai
3563092638 Merge pull request #9384 from stiopaa1/osd_replicatedpg_override 
osd/ReplicatedPG.h: add override to virtual funct

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 20:48:30 +08:00
Sage Weil
21f6bbbeef Merge pull request #9497 from Yan-waller/yj-wip-fixosdmaptools 
tools/osdmaptool: fix some errors

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 08:46:25 -04:00
Kefu Chai
fb3d2a948a Merge pull request #9490 from stiopaa1/osd_replicatedpg_addConstOutputOp 
osd/ReplicatedPG.h: add const to operator<< param

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 20:46:00 +08:00
Sage Weil
c8d8fbe3f3 Merge pull request #9499 from Yan-waller/yj-wip-fixrgwwarning 
rgw/op: kill compiling warning

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-06-06 08:42:45 -04:00
Sage Weil
38ac6100c2 Merge pull request #9501 from stiopaa1/all_operatorOutput 
all: add const to operator<< param

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-06-06 08:42:03 -04:00
Sage Weil
02708c6850 rocksdb: pull up to master 
This includes a few patches from Willem Jan Withagen
<wjw@digiware.nl> that fix the build on FreeBSD.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-06 08:25:12 -04:00
John Spray
df407a7245 Merge pull request #8598 from renhwsky/wip-renhw-ceph_mds-help 
mds: fix usage() display 

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-06-06 10:47:29 +01:00
John Spray
ccf5a39c89 Merge pull request #8641 from renhwztetecs/renhw-wip-mds-cleanup 
mds: MDSDaemon::init bug fix

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-06-06 10:46:59 +01:00
John Spray
ed18dcde6a Merge pull request #8753 from renhwztetecs/renhw-wip-fuse-fuse_file_info 
client: fuse_file_info.fh type should be uint64_t

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-06-06 10:45:29 +01:00
John Spray
83cf189922 Merge pull request #8777 from ukernel/wip-allow-dirfrags 
mds: fix 'allows_dirfrags' check for fragment_dir command

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-06-06 10:43:37 +01:00
John Spray
22d24f7290 Merge pull request #8799 from renhwztetecs/renhw-wip-fusemain 
client/fuse: object release order error 

Reviewed-by: Yan, Zheng <zyan@redhat.com>
 2016-06-06 10:42:59 +01:00
Mykola Golub
430e025984 Merge pull request #9459 from dillaman/wip-16123 
test/rbd: fsx needs to shut down the journal

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-06-06 10:20:54 +03:00
Kefu Chai
4e5a0186a1 Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration 
common/ceph_json.h: remove duplicate declaration

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 10:57:23 +08:00
Michal Jarzabek
d6d5da1bc1 common/ceph_json.h: remove duplicate declaration 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-06-05 22:15:48 +01:00
Michal Jarzabek
0a157e088b all: add const to operator<< param 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-06-05 22:12:56 +01:00
Kefu Chai
3c83ab2caa Merge pull request #9174 from majianpeng/osd-ms-dispatch 
OSD: cleanup code for ms_dispatch

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-05 14:15:02 +08:00
Kefu Chai
abe240b57e Merge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2 
build: freebsd changes (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-05 14:01:23 +08:00
Ali Maredia
50eab6e4a8 Merge pull request #9446 from ceph/wip-cmake 
cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
 2016-06-04 18:28:40 -04:00
Yan Jun
1cd489de7d rgw/op: kill compiling warning 
rgw/rgw_op.cc: In member function 'virtual int RGWCreateBucket::verify_permission()':
rgw/rgw_op.cc:1810:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (buckets.count() >= s->user->max_buckets) {

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-06-04 20:36:48 +08:00
Yan Jun
6592046cc7 tools/osdmaptool: fix error message if we are unable to parse pgid 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-06-04 19:01:26 +08:00
Yan Jun
c97ec99579 tools/osdmaptool: exit if we are unable to resolve pg_num 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-06-04 19:00:23 +08:00
Piotr Dałek
a81e2bb48c lockdep: Convert free_ids from list to bitmap 
Convert "free_ids" list to bitmap, reducing its memory usage from
16 + MAX_LOCKS * 20 (~20KB) to MAX_LOCKS/8 (512b) and save some time
(re)populating the free id array.

Signed-off-by: Piotr Dałek <git@predictor.org.pl>
 2016-06-04 12:15:47 +02:00
Kefu Chai
cf9a42c7cc cmake: use ENABLE_SHARED instead of BUILD_SHARED_LIBS 
we decided to drop the static libraries from the *-dev debian packages.
so no more tricky changes for supporting creating both libraries.

* partially revert 1dbfb26: s/BUILD_SHARED_LIBS/ENABLE_SHARED/
 - add_library() command use BUILD_SHARED_LIBS as the default library
   type, and all intermediate libraries should static ones. it would
   cause unnecessary confusion if some developer uses add_library() without
   specifying the library type, and ends up with a .so. so we use our
   own setting variables for specifying the type of user facing libraries.
* revert ac47440
 - the BUILD_SHARED_LIBS setting is also populated to the gmock libraries,
   which should be compiled as static ones. otherwise the unit tests will
   crash on exit.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 12:57:19 +08:00
Kefu Chai
703e9c800c cmake: install binaries used by ceph-qa-suite 
they are:
- ceph_test_rados: used by
  tasks/rados.py
- ceph_test_rados_delete_pools_parallel: used by
  suites/rados/monthrash/workloads/pool-create-delete.yaml
- ceph_test_filejournal
  suites/rados/objectstore/filejournal.yaml
- ceph_test_objectstore: used by
  suites/rados/objectstore/objectstore.yaml
- ceph_test_{async_driver,msgr}: used by
  suites/rados/singleton-nomsgr/all/msgr.yaml

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:40:28 +08:00
Kefu Chai
a011b4e71a cmake: compile more radosstriper tests 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:40:28 +08:00
Kefu Chai
c24098cc54 cmake: do not link ceph_test_rgw_*, ceph-dencoder against cls_kvs 
it is not used, and causes link errors.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:40:28 +08:00
Kefu Chai
01efc89aa7 cmake: link ceph-dencoder against os lib 
os is a top level target which is linked into executables or user facing
libraries. so it is not included by any libraries linked by
ceph-dencoder so far.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:40:28 +08:00
Kefu Chai
93b1200306 cmake: link rbd cli against krbd_objs directly 
rbd cli => Kernel.cc => krbd_create_from_context() <= krbd.cc

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:40:21 +08:00
Kefu Chai
3245df5508 cmake: fix linkage of ceph_test_cls_${name} 
they should link against cls_${name}_client, instead of against
cls_${name} directly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:38:08 +08:00
Kefu Chai
52021ff9f0 makefile: install mount.fuse.ceph,mount.ceph into /usr/sbin 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:37:33 +08:00
Kefu Chai
c4a8784330 cmake: install ceph-disk to /usr/sbin 
* add keyword "INSTALL_SCRIPT" to distutils_install_module(), so we can
  override the install path of ceph-disk script.
* refactor the Distutils.cmake module a little bit, the ${option}
  variable out lives the CODE snipplet. so we need to reset it
  at the beginning.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 09:37:33 +08:00
Michal Jarzabek
663cf89573 osd/ReplicatedPG.h: add const to operator<< param 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-06-03 22:28:57 +01:00
Sage Weil
ac8c40f3e3 Merge pull request #9483 from ceph/wip-rocksdb 
rocksdb: fix build
 2016-06-03 13:54:08 -04:00
Casey Bodley
91e7bf2c17 Merge pull request #9477 from tchaikov/wip-fix-cmake-unittests 
cmake: do not create gtest/gmock shared libraries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-03 13:46:11 -04:00
Kefu Chai
ac47440174 cmake: do not create gtest/gmock shared libraries 
otherwise unit tests crash at exit.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-04 01:42:09 +08:00
Casey Bodley
7abda15aa5 Merge pull request #9381 from weiqiaomiao/wqm-wip-rgw-align 
rgw:fix some indentation errors of "radosgw-admin --help"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-03 11:34:07 -04:00
Sage Weil
4c6f1ba424 Makefile-rocksdb: remove .d files 
Not really sure why autotools is removing these... but
whatever.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-03 11:22:45 -04:00
Kefu Chai
c6c6968e86 Merge pull request #9480 from ErwanAliasr1/evelu-cephtool 
cephtool/test.sh: Adding iterations numbers in output log

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-03 23:09:49 +08:00
Sage Weil
98c6c05f94 Merge pull request #9465 from liewegas/wip-bluestore-zero 
os/bluestore: remove aio_zero from bdev interface
 2016-06-03 10:46:26 -04:00
Sage Weil
fbb13ab187 Merge pull request #9417 from chhabaramesh/master 
os/bluestore: Tree based bitmapalloc
 2016-06-03 10:45:44 -04:00
Sage Weil
f485596dd0 Merge pull request #9466 from liewegas/wip-rocksdb 
rocksdb: pull up to latest master
 2016-06-03 10:41:35 -04:00
Sage Weil
70aa58eb9f Makefile-rocksdb.am: update 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-03 10:01:37 -04:00
Orit Wasserman
1a32f5181d Merge pull request #9457 from yehudasa/wip-14534 
rgw: can set negative max_buckets on RGWUserInfo
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-06-03 15:18:15 +02:00
Sage Weil
2a3c0e2098 unittest_bluefs: fix more 
- wait for aio to finish
- shut down bdev, which stops the aio completion thread
- *then* deallocate the IOContexts

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-03 08:54:06 -04:00
Erwan Velu
2381740542 cephtool/test.sh: Adding iterations numbers in output log 
When this test is failing and reach the limits, reading the log doesn't make
obvious that we reach them.

This simple patch adds the iterations numbers inside the output log.

Signed-off-by: Erwan Velu <erwan@redhat.com>
 2016-06-03 14:53:00 +02:00