Commit Graph

54202 Commits

Author SHA1 Message Date
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
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
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
Kefu Chai
7696f09590 Merge pull request #9399 from mikulely/update-ceph-deploy-link
doc: update broken link for deploy ceph by Chef

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-03 20:36:35 +08:00
Jason Dillaman
197849cd9d Merge pull request #9441 from xinxinsh/wip-16706
librbd: remove invalid object map flag when object map is disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-06-03 08:08:19 -04:00
Jason Dillaman
17dbc1c967 Merge pull request #9437 from x11562/object-map
librbd: add object-map rebuild fail error log

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-06-03 08:02:57 -04:00
John Spray
04f49df63b Merge pull request #8652 from JiYou/fix-cephfs
cephfs: should close file handler before exit in cephfs.cc

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 12:46:03 +01:00
John Spray
5de0b6fb7b Merge pull request #8925 from ukernel/wip-15723
client: fstat should take CEPH_STAT_CAP_INODE_ALL

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:50:55 +01:00
John Spray
e63b724209 Merge pull request #9421 from renhwztetecs/renhw-wip-cdir
mds/cdir: limit max snap id in lookup()

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-06-03 11:49:56 +01:00
John Spray
8b7d26689c Merge pull request #9418 from xiexingguo/xxg-wip-fix-mdsmonitor
mon/MDSMonitor: fix wrong positive result of jewel flag check

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:45:38 +01:00
John Spray
1abccb6967 Merge pull request #8965 from ukernel/wip-lock-starve
mds: finish lock waiters in the same order that they were added.

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:43:47 +01:00
John Spray
6ce985f2a1 Merge pull request #8695 from renhwztetecs/renhw-wip-mds-dispatch
mds: dispatch assert cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:41:58 +01:00
Ramesh Chander
7c68bea09d os/bluestore:Tree based bitmapalloc
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
2016-06-02 23:07:16 -07:00
x11562
d7688d92e5 librbd: object-map rebuild fail, add error information
Signed-off-by: Na Xie <xie.na@h3c.com>
2016-06-03 09:36:39 +08:00
xinxin shu
b2d475686e remove invalid objectmap flag when objectmap is disabled
Fixes: http://tracker.ceph.com/issues/16076
Signed-off-by: xinxin shu <shuxinxin@chinac.com>
2016-06-03 09:28:57 +08:00
weiqiaomiao
3c899704f2 rgw:fix some indentation errors of "radosgw-admin --help"
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-06-03 08:59:58 +08:00
Casey Bodley
375c09c21c Merge pull request #9349 from Adirl/fix_compiltaion_entity_addr_t4
msg: add const overload to entity_addr_t functions

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-02 16:03:45 -04:00
Sage Weil
2cd63d2209 os/bluestore: remove aio_zero from BlockDevice interface
No users.  Not needed.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-02 14:35:09 -04:00
Matt Benjamin
aff13e590d Merge pull request #9295 from cbodley/wip-rgw-rados-vector
rgw: use vector for librados handles
2016-06-02 13:41:59 -04:00
Sage Weil
b55b6fbfa1 Merge pull request #9454 from tanghaodong25/bluestore-write-path
os/bluestore: no 'head_read' when check ondisk length.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 13:13:12 -04:00
haodong
6f4f28b916 os/bluestore: no 'head_read' when check ondisk length.
Signed-off-by: Haodong Tang <haodong.tang@intel.com>
2016-06-03 00:05:21 +08:00
Sage Weil
f92e8d0762 Merge pull request #9458 from jimwright/master
librados: Added declaration for rados_aio_get_version

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 11:46:21 -04:00
Sage Weil
c34342b108 Merge pull request #9462 from athanatos/wip-15952
osd/ReplicatedPG: adjust num_pinned in _delete_oid

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 11:45:36 -04:00
Sage Weil
acb567b30f Merge pull request #9236 from athanatos/wip-15943
osd/PG: update PGPool to detect map gaps and reset cached_removed_snaps

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 11:44:54 -04:00
Casey Bodley
459d4299f7 Merge pull request #9460 from pritha-srivastava/wip-cmake-vstart
cmake: detection scripts use lowercase project name

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-02 11:29:55 -04:00
Pritha
8f20e3cc61 cmake: detection scripts use lowercase project name
Changing the detection scripts to use the new project name, changed in commit
c1a37101ea (cmake: project name should be "ceph")

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
2016-06-02 20:55:40 +05:30
Jim Wright
a5a1c1732e librados: Added declaration for rados_aio_get_version
Was missing from librados.h and hence had an incorrect
visability.

Fixes: #15535
2016-06-02 15:12:30 +01:00