Kefu Chai
4f05601730
cmake: install erasure plugins into ${pkglibdir}/erasure-code
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
225f345642
cmake: remove duplicated file from ceph-osd
...
objclass/class_api.cc is already included in libosd
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
c389c8d377
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>
2016-06-01 23:49:46 +08:00
Kefu Chai
8588e3d55e
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>
2016-06-01 23:49:46 +08:00
Kefu Chai
6936a811a3
cmake: install the artifacts the packaging requires
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
33d50ed004
cmake: install init script to etc/init.d
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
ce942bd619
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>
2016-06-01 23:49:46 +08:00
Kefu Chai
c192846c06
cmake: install ceph-post-file
...
and related pubkey for sftp
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
43d78c9939
cmake: add ceph-brag
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
c1a37101ea
cmake: project name should be "ceph"
...
so it would be easier to figure out paths, also
CMAKE_INSTALL_DOCDIR is composed using the PROJECT_NAME also.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
b02aaebc45
cmake: install ceph-{detect-init,disk}
...
add a cmake module named Distutils.cmake for setting up python modules
using setup.py.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
ed888f6983
cmake: add ceph_rgw_{json,multi}parser
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:46 +08:00
Kefu Chai
f67ebef597
cmake: compile and install ceph-bluefs-tool
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:45 +08:00
Kefu Chai
6df0bc8691
cmake: s/ceph_test_xattr_bench/ceph_xattr_bench/
...
to match with automake and packager
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:45 +08:00
Kefu Chai
81cd483936
cmake: rename ceph-psim to ceph_psim
...
to match with automake and packager
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:45 +08:00
Kefu Chai
b6da5c5135
cmake: fix bash_completion install path
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-01 23:49:45 +08:00
Mykola Golub
14a150bea8
Merge pull request #9360 from dillaman/wip-16045
...
rbd-mirror: support multiple replicated pools
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-05-28 22:21:25 +03:00
Jason Dillaman
f4339ee8cb
rbd-mirror: cluster-level asok commands need to support multiple pools
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-28 13:36:10 -04:00
Kefu Chai
60588e82e9
Merge pull request #9284 from tchaikov/wip-cmake-doc
...
cmake,make: speed up man page generation
Reviewed-by: François Lafont <francois.lafont@ac-versailles.fr>
2016-05-29 00:05:21 +08:00
Yuri Weinstein
092827cee7
Merge pull request #8738 from xiexingguo/xxg-wip-fstool
...
tool/cephfs: make EventOutput::binary() idempotent
Reviewed-by: John Spray <john.spray@redhat.com>
2016-05-28 08:57:42 -07:00
Yuri Weinstein
acef86675c
Merge pull request #8778 from ukernel/wip-open-symlink
...
mds: fix open symlink and truncate bugs
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2016-05-28 08:56:58 -07:00
Yuri Weinstein
fbf0a095fd
Merge pull request #9187 from liewegas/wip-cppool
...
rados: refuse to cppool if there are snaps; warn about user_version
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-28 08:52:43 -07:00
Yuri Weinstein
d6b5a4d44f
Merge pull request #9222 from xiexingguo/xxg-wip-scrubq-assert
...
mon: fix assert triggerred by the deprecated "scrubq" state
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-28 08:50:09 -07:00
Yuri Weinstein
b888ed6a5e
Merge pull request #9233 from vumrao/wip-vumrao-15809
...
mon : Display full flag in ceph status if full flag is set
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-28 08:49:20 -07:00
Yuri Weinstein
071e0299c6
Merge pull request #9234 from stiopaa1/osd_osdcap_preventCopyingVectorInConstructor
...
osd/OSDCap: prevent copying vector/strings
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-28 08:48:31 -07:00
Yuri Weinstein
cb9301dfd6
Merge pull request #9262 from songbaisen/song27
...
mon: remove the redundant judge on dispatch_op function
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-28 08:46:38 -07:00
Yuri Weinstein
baebdf5e0c
Merge pull request #9298 from liewegas/wip-16012
...
osd: reject rados ops with bad PARALLELEXEC flag
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-28 08:44:53 -07:00
Kefu Chai
9421345112
Merge pull request #9379 from ceph/wip-cmake
...
cmake: add ObjectMapIterate.cc to librbd
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-28 22:57:32 +08:00
Ali Maredia
452f7b859a
cmake: fix build when WITH_RADOSGW is set OFF
...
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-05-28 10:23:09 -04:00
Jason Dillaman
91e9be44da
Merge pull request #9382 from xiexingguo/xxg-wip-fixrbdut
...
test: fix ut failure caused by rbd usage update
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-28 06:55:10 -04:00
xie xingguo
3b0f2d02a2
test: fix ut failure caused by rbd usage update
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-28 18:24:38 +08:00
Ali Maredia
47f3e49a32
cmake: librbd missing source file
...
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-05-27 18:06:10 -04:00
Ali Maredia
ce1abf3b45
Merge pull request #9347 from tchaikov/wip-cmake
...
cmake: some fixes
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-05-27 17:09:49 -04:00
Yuri Weinstein
c41fc2e9af
Merge pull request #8562 from ceph/wip-djf-object-map-check
...
rbd: add rbd object-map check
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-27 13:07:20 -07:00
Yuri Weinstein
d70e74508d
Merge pull request #9280 from zhuangzeqiang/wip15522
...
rbd: check value of config override when setting image-meta
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-27 13:06:12 -07:00
zhuangzeqiang
4538f8152d
rbd: check value of config override when setting image-meta
...
Fixes: http://tracker.ceph.com/issues/15522
Signed-off-by: zhuangzeqiang <zhuang.zeqiang@h3c.com>
2017-10-07 16:53:00 +08:00
Yuri Weinstein
4628b8a92e
Merge pull request #9326 from marcan/rbd-aio-completion
...
librbd: only mark async completion as done after callback
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-27 13:04:47 -07:00
Yuri Weinstein
a62f3022af
pybind: misc fixesReviewed-by: Josh Durgin <jdurgin@redhat.com>
...
pybind: misc fixes
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-27 13:03:14 -07:00
Jason Dillaman
27a92ce851
Merge pull request #9322 from trociny/wip-16011
...
test: failure in journal.sh workunit test
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-27 15:04:42 -04:00
Kefu Chai
990949634c
cmake: remove cls_lock_client from libcephfs
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
6ebe72e7e1
cmake: remove duplicated src in osd_srcs
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
9a357a9de0
cmake: add libcommon to libmds
...
MDSDaemon is using cpu_profiler_handle_command() offered by libcommon
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
1dbfb264ff
cmake: s/ENABLE_SHARED/BUILD_SHARED_LIBS/
...
* BUILD_SHARED_LIB is a cmake variable respected by add_library().
so we can simply expose it as an option instead of reinventing our own.
* and mark internal libraries as STATIC explicitly
* and add keyutil to librbd as secret.cc is using it. and secret.cc is
linked into librbd.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
49518a4f02
cmake: add dl to libcommon
...
PluginRegistry.cc uses dlopen() functions, so added it to libcommon.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
b64dd9e833
cmake: add missing obj to libosd
...
* add common_util_obj as OSD::_collect_metadata() is calling collect_sys_info(), which lives
in util.c
* add global_common_objs as OSD::_committed_osd_maps() is calling
queue_async_signal(), which lives in signal_handler.cc
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
7a602ec292
cmake: use GNUInstallDirs for defining install dest directories
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
39c9452089
cmake: install include/memory.h also
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:52 +08:00
Kefu Chai
cb2bb76632
cmake: install librbd headers
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:34:51 +08:00
Kefu Chai
5800bea33c
cmake: install libradosstriper headers
...
also respect BUILD_SHARED_LIBS instead of always building this lib as a
static library. and we install .so in rpm/deb packaging scripts.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-28 00:09:32 +08:00
Kefu Chai
2242194dff
cmake: compile rbd-fuse
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-27 19:55:04 +08:00