Commit Graph

207 Commits

Author SHA1 Message Date
Kefu Chai
b567261208 cmake: require lz4 v1.7 for building lz4 compressor
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-17 16:01:55 +08:00
Jenkins Build Slave User
b661348f15 12.1.2 2017-08-01 17:55:40 +00:00
Jenkins Build Slave User
f3e663a190 12.1.1 2017-07-17 16:56:02 +00:00
Sage Weil
8b08bd580d Merge remote-tracking branch 'gh/luminous' 2017-07-07 14:19:47 -04:00
Kefu Chai
d723b8a667 Merge pull request #15305 from wjwithagen/wip-wjw-HAVE_BABELTRACE
cmake: Rewrite HAVE_BABELTRACE  option to WITH_

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-04 20:20:12 +08:00
Willem Jan Withagen
b331898ea9 CMakeLists.txt: Rewrite 2 remaning options to WITH_
All options to en/disable inclusion of libraries or other software
are of the format WITH_ so that the Cmake commaind like ahs all
WITH_* options. The WITH_=ON option will result in a HAVE_ setting
in CMAKE so that tests can use that variable.

Last "abusers" to actually follow this format.

 - HAVE_BABELTRACE

 - HAVE_ZFSLIB is fixed in #15907

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-02 17:10:01 +02:00
Kefu Chai
f8d5f74663 cmake: compile libzfs backend conditionally
* do not REQUIRE libzfs if it is enabled, this follows the way how we
  handle `WITH_XFS` option.
* also refactor the cmake script related to libxfs backend support a
  little bit.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-27 23:28:03 +08:00
Jenkins Build Slave User
262617c9f1 12.1.0 2017-06-22 15:43:50 +00:00
Kefu Chai
1e1b108bb6 Merge pull request #15376 from tchaikov/wip-remove-boost-submodule
cmake: build boost as an external project

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-15 00:40:28 +08:00
Kefu Chai
1b96dada33 cmake: include boost before default system directory
so ceph will prefer the local boost installation to the one in system if
any.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-14 23:53:50 +08:00
Kefu Chai
83432b4461 cmake: build boost as an external project
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-14 23:53:50 +08:00
Leo Zhang
7681fd8e4a build: add css file to excludes while generate tags
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
2017-06-13 19:43:54 +08:00
Yuri Weinstein
41a90b99aa Merge pull request #15223 from badone/wip-ceph_test_admin_socket_output
tests: Add integration tests for admin socket output

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-09 09:01:52 -07:00
Sage Weil
f3904aad0c Merge pull request #15600 from ceph/luminous
12.0.3
2017-06-09 09:13:59 -05:00
Sage Weil
c2e346cf12 Merge pull request #15562 from tchaikov/wip-no-assert.h
common,osdc: remove atomic_t completely

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-08 20:38:23 -05:00
Sage Weil
b0e9f3ed51 Merge pull request #15102 from majianpeng/blockdevice-pmem
os/bluestore/BlockDevice: support pmem device as bluestore backend

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-08 13:15:52 -05:00
Kefu Chai
a87fa37e46 cmake,debian,rpm: remove atomic_t completely
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-08 12:21:00 +08:00
Jianpeng Ma
e25accff7d os/bluestore/BlockDevice:support pmem device as bluestore backend.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-06-07 23:22:52 +08:00
Kefu Chai
8f5a5a9c12 Merge pull request #15413 from tchaikov/wip-rgw-boost-cleanup
rgw: drop asio/{yield,coroutine}.hpp replacements

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-07 22:34:42 +08:00
Brad Hubbard
c5536b1976 tests: Add integration tests for admin socket output
Add a framework to test all admin socket commands as reported by "help"
as well as custom commands.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-06-07 16:48:02 +10:00
Haomai Wang
a97a6e8274 compressor: add LZ4 support
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-06-03 15:56:05 +08:00
Kefu Chai
1d19254ba2 rgw: drop asio/{yield,coroutine}.hpp replacements
as we requires boost 1.61+ now, which offers them. see
http://www.boost.org/doc/libs/1_61_0/boost/asio/.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-03 02:19:50 +08:00
Kefu Chai
9fd19500bf Merge pull request #15225 from smithfarm/wip-s390-rgw
build/ops: conditionalize rgw Beast frontend so it isn't built on s390x architecture

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 20:39:12 +08:00
Nathan Cutler
b22cde8e88 cmake: build boost::context and coroutine only with rgw Beast frontend
boost::context is currently (1.63) unsupported for s390x and anyway
it makes sense to conditionalize Boost components so they are only
built with the Ceph components that need them (like is already being
done for mgr).

Fixes: http://tracker.ceph.com/issues/20048
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-05-29 22:47:44 +02:00
Kefu Chai
7a5a0a893e Merge pull request #15338 from trociny/wip-get_process_name
common: get_process_name: use getprogname on bsd systems

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-29 20:55:30 +08:00
Kefu Chai
ef9d93b8ea Merge pull request #15055 from mogeb/wip-with-instrument-functions
cmake: Add -finstrument-functions flag to OSD code

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-28 14:45:57 +08:00
Mykola Golub
134e295c69 common: get_process_name: use getprogname on bsd systems
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-05-27 21:13:08 +02:00
Mohamad Gebai
0baebc308c cmake: configuration for OSD function instrumentation
Signed-off-by: Mohamad Gebai <mgebai@suse.com>
2017-05-25 15:16:14 -04:00
Matt Benjamin
d06d13472c Merge pull request #15070 from ceph/wip-turn-off-fcgi-tserlin
rgw: Turn off fcgi as a frontend
2017-05-24 15:53:57 -04:00
Bassam Tabbara
23b073237e cmake: fix boost components for WITH_SYSTEM_BOOST
when using WITH_SYSTEM_BOOST dont set header-only packages
for BOOST_COMPONENTS. On some distros these packages dont
exist.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
2017-05-18 10:18:10 -07:00
Yuri Weinstein
9187156b55 Merge pull request #15069 from tchaikov/wip-inttypes-cleanup
int_types.h: remove hacks to workaround old systems

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-05-16 13:18:23 -07:00
Jenkins Build Slave User
f2337d1b42 12.0.3 2017-05-16 12:42:56 +00:00
Sage Weil
880dde8e47 Merge pull request #15091 from ceph/luminous
merge v12.0.2 release tag
2017-05-15 12:47:42 -05:00
Kefu Chai
9a44857a09 int_types.h: remove hacks to workaround old systems
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-05-13 10:20:26 +08:00
Thomas Serlin
2643fe88b2 RGW: Turn off fcgi as a frontend
Signed-off-by: Thomas Serlin <tserlin@redhat.com>
2017-05-12 11:35:12 -04:00
Sage Weil
b4eab62c5e CMakeLists.txt: WITH_BLKIN off for now
We are unconditionally linking lttng-ust, which make selinux complain. We
should either

 - fix selinux rules and unconditionally link
 - dlopen at runtime based on an option (like we do for the current
   tracepoints)
 - ???

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-05 14:05:24 -04:00
Sage Weil
bdd6c3f382 CMakeLists.txt: default WITH_BLKIN=ON
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-05 14:05:24 -04:00
Casey Bodley
26678e673a cmake: build blkin instead of using find_package
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-05-05 14:05:24 -04:00
Casey Bodley
5ec55b9daa cmake: add module and WITH_BLKIN option for blkin
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-05-05 13:59:46 -04:00
Casey Bodley
4d076dd565 rgw: rename frontend from asio to beast
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-05-05 10:12:35 -04:00
Casey Bodley
5b41fb55e4 rgw: update Beast for streaming reads in asio frontend
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-05-05 10:12:35 -04:00
liuchang0812
e2bb57b53b cmake: kill duplicated cmake commands
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-05-04 15:49:08 +08:00
Kefu Chai
61e2ff4840 cmake: enable crosscompile of boost
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-30 02:01:33 +08:00
Kefu Chai
b32f1813bb cmake: add "container" to required boost components
it is used by our denc

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-28 05:09:08 +08:00
Sage Weil
7e2a286446 Merge pull request #14651 from tchaikov/wip-silent-boost-build
cmake: pass -d0 to b2 if not CMAKE_VERBOSE_MAKEFILE

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-25 16:53:58 -05:00
Jenkins Build Slave User
5a1b6b3269 12.0.2 2017-04-20 20:00:00 +00:00
Sage Weil
ab9e8419ec Merge pull request #14690 from ceph/luminous
build/ops: add 12.0.1 release tag in master
2017-04-20 11:55:00 -05:00
Kefu Chai
f2e04c41bb cmake: pass -d0 to b2 if not CMAKE_VERBOSE_MAKEFILE
also do not hardwire the built components

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-20 16:56:41 +08:00
Kefu Chai
e1991238e7 cmake: support optional argument for overriding default ctag excludes
so instead of excluding all submodules, one can just exclude boost and
rocksdb using:

  cmake -DCTAG_EXCLUDES="boost;rocksdb" ..

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-07 12:06:52 +08:00
Dan Mick
3681683df7 cmake: Add simple recursive ctags target for Ceph source only
Excludes submodules and random JavaScript.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-06 13:27:12 +08:00