]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
huanwen ren [Sun, 12 Jun 2016 10:00:58 +0000 (18:00 +0800)]
mds/mdsrank: fix MDSRank::get_metadata_pool return value
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
huanwen ren [Sun, 12 Jun 2016 09:56:14 +0000 (17:56 +0800)]
mds/tools: fix mds->mdsmap->get_metadata_pool() return int->int64_t
mds->mdsmap->get_metadata_pool() return should be int64_t not int,
fix up
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
huanwen ren [Sun, 12 Jun 2016 08:54:48 +0000 (16:54 +0800)]
mds/mdcache: fix get poolid in open_remote_dentry
if dnl->get_remote_d_type() == DT_DIR not establish, then pool = -1
so the type of pool should be int64_t not uint64_t
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
John Spray [Mon, 6 Jun 2016 09:47:29 +0000 (10:47 +0100)]
Merge pull request #8598 from renhwsky/wip-renhw-ceph_mds-help
mds: fix usage() display
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 6 Jun 2016 09:46:59 +0000 (10:46 +0100)]
Merge pull request #8641 from renhwztetecs/renhw-wip-mds-cleanup
mds: MDSDaemon::init bug fix
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 6 Jun 2016 09:45:29 +0000 (10:45 +0100)]
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>
John Spray [Mon, 6 Jun 2016 09:43:37 +0000 (10:43 +0100)]
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>
John Spray [Mon, 6 Jun 2016 09:42:59 +0000 (10:42 +0100)]
Merge pull request #8799 from renhwztetecs/renhw-wip-fusemain
client/fuse: object release order error
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Mykola Golub [Mon, 6 Jun 2016 07:20:54 +0000 (10:20 +0300)]
Merge pull request #9459 from dillaman/wip-16123
test/rbd: fsx needs to shut down the journal
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Kefu Chai [Mon, 6 Jun 2016 02:57:23 +0000 (10:57 +0800)]
Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration
common/ceph_json.h: remove duplicate declaration
Reviewed-by: Kefu Chai <kchai@redhat.com>
Michal Jarzabek [Sun, 5 Jun 2016 21:15:48 +0000 (22:15 +0100)]
common/ceph_json.h: remove duplicate declaration
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Kefu Chai [Sun, 5 Jun 2016 06:15:02 +0000 (14:15 +0800)]
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>
Kefu Chai [Sun, 5 Jun 2016 06:01:23 +0000 (14:01 +0800)]
Merge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2
build: freebsd changes (part 2)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Ali Maredia [Sat, 4 Jun 2016 22:28:40 +0000 (18:28 -0400)]
Merge pull request #9446 from ceph/wip-cmake
cmake changes
Reviewed-by: Ali Maredia <amaredia@redhat.com>
Kefu Chai [Sat, 4 Jun 2016 01:50:00 +0000 (09:50 +0800)]
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>
Kefu Chai [Fri, 3 Jun 2016 05:39:04 +0000 (13:39 +0800)]
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>
Kefu Chai [Fri, 3 Jun 2016 05:32:44 +0000 (13:32 +0800)]
cmake: compile more radosstriper tests
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 2 Jun 2016 03:51:36 +0000 (11:51 +0800)]
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>
Kefu Chai [Thu, 2 Jun 2016 03:37:18 +0000 (11:37 +0800)]
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>
Kefu Chai [Thu, 2 Jun 2016 03:25:26 +0000 (11:25 +0800)]
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>
Kefu Chai [Thu, 2 Jun 2016 03:15:26 +0000 (11:15 +0800)]
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>
Kefu Chai [Wed, 1 Jun 2016 18:08:45 +0000 (02:08 +0800)]
makefile: install mount.fuse.ceph,mount.ceph into /usr/sbin
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 1 Jun 2016 17:50:21 +0000 (01:50 +0800)]
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>
Sage Weil [Fri, 3 Jun 2016 17:54:08 +0000 (13:54 -0400)]
Merge pull request #9483 from ceph/wip-rocksdb
rocksdb: fix build
Casey Bodley [Fri, 3 Jun 2016 17:46:11 +0000 (13:46 -0400)]
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>
Kefu Chai [Fri, 3 Jun 2016 03:53:10 +0000 (11:53 +0800)]
cmake: do not create gtest/gmock shared libraries
otherwise unit tests crash at exit.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Casey Bodley [Fri, 3 Jun 2016 15:34:07 +0000 (11:34 -0400)]
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>
Sage Weil [Fri, 3 Jun 2016 15:22:45 +0000 (11:22 -0400)]
Makefile-rocksdb: remove .d files
Not really sure why autotools is removing these... but
whatever.
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 3 Jun 2016 15:09:49 +0000 (23:09 +0800)]
Merge pull request #9480 from ErwanAliasr1/evelu-cephtool
cephtool/test.sh: Adding iterations numbers in output log
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 3 Jun 2016 14:46:26 +0000 (10:46 -0400)]
Merge pull request #9465 from liewegas/wip-bluestore-zero
os/bluestore: remove aio_zero from bdev interface
Sage Weil [Fri, 3 Jun 2016 14:45:44 +0000 (10:45 -0400)]
Merge pull request #9417 from chhabaramesh/master
os/bluestore: Tree based bitmapalloc
Sage Weil [Fri, 3 Jun 2016 14:41:35 +0000 (10:41 -0400)]
Merge pull request #9466 from liewegas/wip-rocksdb
rocksdb: pull up to latest master
Sage Weil [Fri, 3 Jun 2016 14:01:37 +0000 (10:01 -0400)]
Makefile-rocksdb.am: update
Signed-off-by: Sage Weil <sage@redhat.com>
Orit Wasserman [Fri, 3 Jun 2016 13:18:15 +0000 (15:18 +0200)]
Merge pull request #9457 from yehudasa/wip-14534
rgw: can set negative max_buckets on RGWUserInfo
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Sage Weil [Fri, 3 Jun 2016 12:54:06 +0000 (08:54 -0400)]
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>
Erwan Velu [Fri, 3 Jun 2016 12:53:00 +0000 (14:53 +0200)]
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>
Kefu Chai [Fri, 3 Jun 2016 12:36:35 +0000 (20:36 +0800)]
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>
Jason Dillaman [Fri, 3 Jun 2016 12:08:19 +0000 (08:08 -0400)]
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>
Jason Dillaman [Fri, 3 Jun 2016 12:02:57 +0000 (08:02 -0400)]
Merge pull request #9437 from x11562/object-map
librbd: add object-map rebuild fail error log
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Fri, 3 Jun 2016 11:46:03 +0000 (12:46 +0100)]
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>
John Spray [Fri, 3 Jun 2016 10:50:55 +0000 (11:50 +0100)]
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>
John Spray [Fri, 3 Jun 2016 10:49:56 +0000 (11:49 +0100)]
Merge pull request #9421 from renhwztetecs/renhw-wip-cdir
mds/cdir: limit max snap id in lookup()
Reviewed-by: Yan, Zheng <zyan@redhat.com>
John Spray [Fri, 3 Jun 2016 10:45:38 +0000 (11:45 +0100)]
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>
John Spray [Fri, 3 Jun 2016 10:43:47 +0000 (11:43 +0100)]
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>
John Spray [Fri, 3 Jun 2016 10:41:58 +0000 (11:41 +0100)]
Merge pull request #8695 from renhwztetecs/renhw-wip-mds-dispatch
mds: dispatch assert cleanup
Reviewed-by: John Spray <john.spray@redhat.com>
Ramesh Chander [Mon, 23 May 2016 12:04:40 +0000 (05:04 -0700)]
os/bluestore:Tree based bitmapalloc
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
x11562 [Fri, 3 Jun 2016 01:36:33 +0000 (09:36 +0800)]
librbd: object-map rebuild fail, add error information
Signed-off-by: Na Xie <xie.na@h3c.com>
xinxin shu [Thu, 2 Jun 2016 06:13:09 +0000 (14:13 +0800)]
remove invalid objectmap flag when objectmap is disabled
Fixes: http://tracker.ceph.com/issues/16076
Signed-off-by: xinxin shu <shuxinxin@chinac.com>
weiqiaomiao [Sat, 28 May 2016 06:19:17 +0000 (14:19 +0800)]
rgw:fix some indentation errors of "radosgw-admin --help"
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
Casey Bodley [Thu, 2 Jun 2016 20:03:45 +0000 (16:03 -0400)]
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>
Sage Weil [Thu, 2 Jun 2016 18:34:10 +0000 (14:34 -0400)]
os/bluestore: remove aio_zero from BlockDevice interface
No users. Not needed.
Signed-off-by: Sage Weil <sage@redhat.com>
Matt Benjamin [Thu, 2 Jun 2016 17:41:59 +0000 (13:41 -0400)]
Merge pull request #9295 from cbodley/wip-rgw-rados-vector
rgw: use vector for librados handles
Sage Weil [Thu, 2 Jun 2016 17:13:12 +0000 (13:13 -0400)]
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>
haodong [Thu, 2 Jun 2016 10:32:03 +0000 (18:32 +0800)]
os/bluestore: no 'head_read' when check ondisk length.
Signed-off-by: Haodong Tang <haodong.tang@intel.com>
Sage Weil [Thu, 2 Jun 2016 15:46:21 +0000 (11:46 -0400)]
Merge pull request #9458 from jimwright/master
librados: Added declaration for rados_aio_get_version
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 2 Jun 2016 15:45:36 +0000 (11:45 -0400)]
Merge pull request #9462 from athanatos/wip-15952
osd/ReplicatedPG: adjust num_pinned in _delete_oid
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 2 Jun 2016 15:44:54 +0000 (11:44 -0400)]
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>
Casey Bodley [Thu, 2 Jun 2016 15:29:55 +0000 (11:29 -0400)]
Merge pull request #9460 from pritha-srivastava/wip-cmake-vstart
cmake: detection scripts use lowercase project name
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Pritha [Thu, 2 Jun 2016 15:07:01 +0000 (20:37 +0530)]
cmake: detection scripts use lowercase project name
Changing the detection scripts to use the new project name, changed in commit
c1a37101ea87a973068f2dc9858487f83ae57f88 (cmake: project name should be "ceph")
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
Jason Dillaman [Thu, 2 Jun 2016 14:41:18 +0000 (10:41 -0400)]
test/rbd: fsx needs to shut down the journal
Fixes: http://tracker.ceph.com/issues/16123
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jim Wright [Thu, 2 Jun 2016 14:12:30 +0000 (15:12 +0100)]
librados: Added declaration for rados_aio_get_version
Was missing from librados.h and hence had an incorrect
visability.
Fixes: #15535
Sage Weil [Thu, 2 Jun 2016 14:06:17 +0000 (10:06 -0400)]
Merge pull request #9449 from ifed01/wip-bluestore-crc32
os/bluestore: Some improvement for crc32c calculations
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 1 Jun 2016 19:51:12 +0000 (15:51 -0400)]
rocksdb: pull up to latest master
This includes our replay fixes, which are now upstream.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 2 Jun 2016 13:57:34 +0000 (09:57 -0400)]
Merge pull request #9448 from tchaikov/wip-fix-warning
test/osd/TestRados.cc: silence a compiler warning
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Thu, 2 Jun 2016 13:51:16 +0000 (09:51 -0400)]
qa/workunits/rados/loadgen-mostly-read.sh: half as much data (512mb)
Use less space so we can run on openstack.
Signed-off-by: Sage Weil <sage@redhat.com>
Yehuda Sadeh [Thu, 2 Jun 2016 11:28:30 +0000 (04:28 -0700)]
rgw: can set negative max_buckets on RGWUserInfo
This can be used to disable user's bucket creation
Fixes: http://tracker.ceph.com/issues/14534
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Orit Wasserman [Thu, 2 Jun 2016 12:45:43 +0000 (14:45 +0200)]
Merge pull request #9037 from rzarzynski/wip-rgw-swift-quota
rgw: add support for account and container quotas of Swift API
Reviewed-by" Orit Wasserman <owasserm@redhat.com>
Igor Fedotov [Thu, 2 Jun 2016 09:21:35 +0000 (12:21 +0300)]
os/bluestore: dec->hex for verify_csum error reporting
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Orit Wasserman [Thu, 2 Jun 2016 09:20:55 +0000 (11:20 +0200)]
rgw: reuse populate_with_generic_attrs() across rgw_op.cc.Reviewed-by: Orit Wasserman <owasserm@redhat.com>
rgw: reuse populate_with_generic_attrs() across rgw_op.cc.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Igor Fedotov [Thu, 2 Jun 2016 09:19:23 +0000 (12:19 +0300)]
common/Checksummer: Eliminates data copying in crc32c calculation
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Orit Wasserman [Thu, 2 Jun 2016 09:19:05 +0000 (11:19 +0200)]
Merge pull request #9367 from Yan-waller/yj-wip-rgwfixhextobuf
rgw/common: fix error return value of hex_to_buf.
Reviewed by: Orit Wasserman <owasserm@redhat.com>
Igor Fedotov [Thu, 2 Jun 2016 09:17:47 +0000 (12:17 +0300)]
common/bufferlist: Adds test cases for bufferlist::iterator::crc32c
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Igor Fedotov [Thu, 2 Jun 2016 09:14:22 +0000 (12:14 +0300)]
common/bufferlist: Fixes lack of offset increment in get_ptr_and_advance
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Sage Weil [Tue, 31 May 2016 18:43:49 +0000 (14:43 -0400)]
buffer: add iterator crc32c method
Calculate crc from an iterator position.
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 2 Jun 2016 03:17:36 +0000 (11:17 +0800)]
test/osd/TestRados.cc: silence a compiler warning
fix following warning by returning `nullptr` after an assert(0).
```
ceph/src/test/osd/TestRados.cc: In member function ‘TestOp*
WeightedTestGenerator::gen_op(RadosTestContext&, TestOpType)’:
ceph/src/test/osd/TestRados.cc:241:3: warning: control reaches
end of non-void function [-Wreturn-type]
}
```
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 2 Jun 2016 07:41:21 +0000 (15:41 +0800)]
Merge pull request #9438 from ceph/wip-cmake
cmake: rbd_mirror not linking rbd_test_mock
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yehuda Sadeh [Thu, 2 Jun 2016 05:52:42 +0000 (08:52 +0300)]
Merge pull request #9060 from mikulely/fix-rgw-multiste-doc
doc: fix rgw multiste config
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Yehuda Sadeh [Thu, 2 Jun 2016 05:46:04 +0000 (08:46 +0300)]
Merge pull request #9392 from yehudasa/wip-16072
rgw/rgw_common.cc: modify the end check in RGWHTTPArgs::sys_get
Tested-by: Orit Wasserman <owasserm@redhat.com>
http://pulpito.ceph.com/owasserm-2016-06-01_20:43:36-rgw:verify-wip-orit-testing---basic-mira/
Ali Maredia [Thu, 2 Jun 2016 03:28:38 +0000 (23:28 -0400)]
cmake: rbd_mirror not linking rbd_test_mock
Added rbd_test_mock lib, also changed name of
journal_test to journal_test_mock to mimic
automake naming.
Signed-off-by: Ali Maredia <amaredia@redhat.com>
xie xingguo [Wed, 1 Jun 2016 06:28:17 +0000 (14:28 +0800)]
mon/MDSMonitor: fix wrongly set expiration time of blacklist
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Wed, 1 Jun 2016 03:49:14 +0000 (11:49 +0800)]
mon/MDSMonitor: fix assert
Belowe here "version" will never equal to "fsmap.epoch", otherwise we shall
return already.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Wed, 1 Jun 2016 03:39:54 +0000 (11:39 +0800)]
mon/MDSMonitor: drop redundant assignment
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Matt Benjamin [Wed, 1 Jun 2016 22:11:53 +0000 (18:11 -0400)]
Merge pull request #9209 from yehudasa/wip-15939
rgw: aws4 fixes
verified
Samuel Just [Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)]
Merge pull request #9084 from dzafman/wip-dz-misc
Wip dz misc
Reviewed-by: Samuel Just <sjust@redhat.com>
Casey Bodley [Wed, 1 Jun 2016 18:07:59 +0000 (14:07 -0400)]
Merge pull request #9426 from linuxbox2/cmake-mds
cmake: change libmds back to a static library
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Matt Benjamin [Wed, 1 Jun 2016 17:25:19 +0000 (13:25 -0400)]
cmake: restore static linkage (libmds)
Required by ceph-mds.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Matt Benjamin [Wed, 1 Jun 2016 16:42:52 +0000 (12:42 -0400)]
Merge pull request #9385 from ceph/wip-cmake-kefu
cmake: more fixes
fixes make install workflow
Sage Weil [Wed, 1 Jun 2016 16:29:49 +0000 (12:29 -0400)]
Merge pull request #9228 from liewegas/wip-bluestore-write
os/bluestore: new write path (checksums and compression)
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Nathan Cutler [Wed, 1 Jun 2016 16:14:38 +0000 (18:14 +0200)]
Merge pull request #9106 from SUSE/wip-15869
rpm: unconditionally set ceph user's primary group to ceph (SUSE)
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Kefu Chai [Wed, 1 Jun 2016 05:38:05 +0000 (13:38 +0800)]
cmake: install cython modules
* fix CYTHON_ADD_MODULE() macro. because python_add_module() offered by
FindPythonLibs.cmake creates a target with name of ${name}, which conflicts
with existing targets like "rbd" or "rados". so we can not reuse the
name in ${name}.pyx. and instead, we should specify the target name
explicitly.
* add distutils_install_cython_module() function to build and install
cython modules.
* we can split build and install of cython module, but the install phase
always tries to build the module. so keep it this way. will look at it
later on.
* move the variables initializations into the Distutils.cmake module.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 1 Jun 2016 03:25:11 +0000 (11:25 +0800)]
cmake: install compressor plugins into ${pkglibdir/compressor
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 1 Jun 2016 03:14:49 +0000 (11:14 +0800)]
cmake: install erasure plugins into ${pkglibdir}/erasure-code
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 21:19:23 +0000 (05:19 +0800)]
cmake: remove duplicated file from ceph-osd
objclass/class_api.cc is already included in libosd
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 16:23:22 +0000 (00:23 +0800)]
cmake: fix dependencies on tracing headers
group the header dependencies by its tp .so, so the traced target can
depend on them by the name of ${name}-tp.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 16:22:31 +0000 (00:22 +0800)]
cmake: libradosstriper's OUTPUT_NAME should be radosstriper
and s/libradosstriper/radosstriper/ otherwise the created .so
filename would be liblibradosstriper.so with the default prefix.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 07:42:33 +0000 (15:42 +0800)]
cmake: install the artifacts the packaging requires
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 13:59:14 +0000 (21:59 +0800)]
cmake: install init script to etc/init.d
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 09:09:37 +0000 (17:09 +0800)]
cmake: add the autoconf path variables back
* partially revert
7a602ec .
* the directory variables created by automake, like "prefix", "bindir",
and "libdir", are used for generating configuration_file() for substitution,
and they should have the same names with ones from autotools.
* also fix the ${pkglibdir}, it should be the ${libdir}/${PACKAGE}. so
the plugins are not installed into ${libdir}, in which the installed shared
objects are supposed to be shared with other applications.
* install shared libraries into ${CMAKE_INSTALL_LIBDIR} instead of
${prefix}/lib. this complies to what ceph.spec.in requires:
ceph.spec.in expects the shared libraries to be installed into
${_libdir}, and ${_libdir} is /usr/lib64 on an amd64 machine.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 09:03:08 +0000 (17:03 +0800)]
cmake: install ceph-post-file
and related pubkey for sftp
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 28 May 2016 08:53:36 +0000 (16:53 +0800)]
cmake: add ceph-brag
Signed-off-by: Kefu Chai <kchai@redhat.com>