Commit Graph

132 Commits

Author SHA1 Message Date
Kefu Chai
b8bd9cbf00 cmake: fix "jobserver unavailable" warning
use ${MAKE} so the make command can be properly propagated to their
children

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-31 16:30:49 +08:00
Kefu Chai
f8adf40932 cmake: disable unused-variable warning for rocksdb
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-31 12:18:41 +08:00
John Coyle
6d860ba46c cmake: musl libc does not implement backtrace. Added feature check and fallback to libexecinfo.
Signed-off-by: John Coyle <dx9err@gmail.com>
2016-01-29 08:50:46 -05:00
Gregory Farnum
248bec737e Merge pull request #7312 from jcsp/wip-14365
mds, client: fix locking around handle_conf_change

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-01-28 21:28:54 -08:00
Kefu Chai
63d3d2bec7 cmake: link against libfuse if HAVE_LIBFUSE
* use ${FUSE_LIBRARIES} instead of "fuse" when referencing libfuse.
* do not compile FuseStore.cc if !HAVE_LIBFUSE.
* CMakeLists.txt: s/HAVE_FUSE/HAVE_LIBFUSE/, to match with the one
  defined for config.h.in.cmake, otherwise we need two vars:
  HAVE_LIBFUSE, and HAVE_FUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-28 23:36:45 +08:00
Yehuda Sadeh
7e0a7a3d44 Merge pull request #7381 from ceph/wip-rgw-static-website-yehuda
RGW static website feature
 - currently disabled by default
 - partial error page handling
 - a few known failures

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-01-27 12:36:35 -08:00
Yehuda Sadeh
bf9d1a067a Merge branch 'wip-rgw-static-website-yehuda'
Conflicts:
	src/rgw/rgw_common.h
	src/rgw/rgw_op.h
	src/rgw/rgw_rest_s3.cc
	src/rgw/rgw_rest_s3.h
2016-01-27 11:07:43 -08:00
Sage Weil
d01967d372 osd: osd_objectstore_fuse
Expose underlying ObjectStore via fuse at $osd_data/fuse/.  Can be enabled/
disabled at runtime.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-27 14:06:12 -05:00
Sage Weil
96643e9cc3 ceph-objectstore-tool: mount an ObjectStore via fuse
Currently only read-only.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-27 14:06:12 -05:00
Sage Weil
27784ff34f Merge pull request #7320 from yuyuyu101/kill-keyvaluestore
os/keyvaluestore: kill KeyValueStore

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-27 13:07:13 -05:00
Casey Bodley
a76ea6fb7c Merge pull request #7314 from tchaikov/wip-fix-cmake
cmake: let ceph-client-debug link with tcmalloc
2016-01-25 09:55:26 -05:00
Loic Dachary
acd4314cf3 Merge pull request #7284 from ceph/wip-make-remove-libedit
makefile: remove libedit from libclient.la

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-01-25 13:15:48 +07:00
Haomai Wang
19c39faead KeyValueStore: Kill this
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-01-22 11:15:10 +08:00
Kefu Chai
674fe18ded cmake: let ceph-client-debug link with tcmalloc
to fix the link problem of
libcephfs.so.1.0.0: undefined reference to `IsHeapProfilerRunning'
when tcmalloc is used and profiler header is detected.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-22 01:37:58 +08:00
John Spray
f4b0b2f3c3 cmake: fix libcephfs linking
This was a merge glitch between Ali's cmake
updates and my VolumeClient PR.  My PR
was using the old TCMALLOC_LIBS vs. the
new ALLOC_LIBS variable.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-01-21 13:29:11 +00:00
Gregory Farnum
f3e58a054a Merge pull request #6205 from jcsp/wip-volume-client
pybind: add ceph_volume_client interface for Manila and similar frameworks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-01-19 18:21:23 -08:00
Yehuda Sadeh
5f61d36d71 Merge remote-tracking branch 'origin/master' into wip-rgw-static-website-yehuda-2
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	src/global/Makefile.am
	src/rgw/rgw_common.cc
	src/rgw/rgw_common.h
	src/rgw/rgw_json_enc.cc
	src/rgw/rgw_op.h
	src/rgw/rgw_rest.cc
	src/rgw/rgw_rest_s3.cc
	src/tracing/Makefile.am
2016-01-19 11:01:24 -08:00
Kefu Chai
f5da159457 makefile: remove dependency on libedit
turns out we are not using it anymore

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-20 00:35:50 +08:00
Josh Durgin
dda9a08370 Merge pull request #7019 from dillaman/wip-14006
librbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-01-18 17:09:05 -05:00
Robin H. Johnson
166879655b s3website: update cmake.
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-01-15 15:05:47 -08:00
Jason Dillaman
629c6f0d7c librbd: moved all maintenance ops to new Operations class
This will permit unit testing and will facilitate proper
serialization of requests (when necessary).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-01-15 10:40:28 -05:00
Jason Dillaman
588ccfb633 librbd: move journal support classes to journal namespace
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-01-15 10:40:27 -05:00
Kefu Chai
10335c507a cmake: fix the build on trusty
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-15 22:42:07 +08:00
Yan, Zheng
50646711cb client: POSIX ACL support
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-01-12 17:21:00 +08:00
Kefu Chai
e6f2e8dd4f cmake: Add ENABLE_GIT_VERSION to avoid rebuilding
it is a pain to see something like
"expected plugin ./ec_plugins/libec_jerasure.so version
 v10.0.1-1239-g73c5763 but it claims to be v10.0.1-1241-gdb83f12
 instead" from time to time. so this is a cmake port of b227426.
the option ENABLE_GIT_VERSION is ON by default. if it is set OFF,
ceph_ver.h will not be recreated.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-11 13:22:45 +08:00
Ali Maredia
ede0e3ab06 cmake: made rocksdb an imported library
Systems with the minimum required version of CMake
such as Ubuntu Trusty Tahr don't support
INTERFACE_LINK_LIBRARIES, so rocksdb was made into
an IMPORTED library. Added ROCKSDB_INCLUDE_DIR to
simplify target_include_directories rocksdb.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-07 00:34:32 -05:00
Ali Maredia
cc30175480 cmake: udev linking and Findudev module changes
Linked udev into librbd, restored UDEV_I to
UDEV_INCLUDE_DIR in Findudev.cmake

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
1d4a11fca8 cmake: Missing binaries from src/tools added
Added ceph-objecstore-tool, ceph-kvstore-tool,
ceph-psim, ceph-client-debug, ceph-scratchtool,
ceph-scratchtoolpp, ceph-radosacl,
ceph-osdomap-tool, ceph-monmap-tool from src/tools
Makefiles.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
078e95f037 cmake: CMAKE_DL_LIBS is not linked into osdmaptool
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
68c3b3390e cmake: libradosstriper dir CMakeLists.txt added
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
68aee43f65 cmake: Added librados_api library
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
663dc8d843 cmake: Added common/Cycles.cc to libcommon
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
cbb71a4776 cmake: Boost libraries cleanup
Added components to Boost find_package, changed
libraries from boost_foo to ${Boost_FOO_LIBRARY}

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
bbf7641259 cmake: rbd_replay CMakeLists.txt, rbd_replay fixes
moved rbd_replay targets into it's directory,
rbd-replay-prep added, removed "lib" in front of
all rbd_replay libraries, linked rbd_replay into
ceph-dencoder.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
1aa7bc2ec4 cmake: LTTng functionality added
Set LTTNG option to ON by default, added
Findlttng.cmake, added CMakeLists.txt in
src/tracing that generates .h files using
lttng-gen-tp, added WITH_LTTNG to
config-h.in.cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
a614c3b9c1 cmake: Updated allocator checking
Added a FindJeMalloc.cmake file, changed
allocator checking logic (tcmalloc is default),
replaced TCMALLOC_LIBS to ALLOC_LIBS, added
HAVE_LIB(ALLOCATOR) to config-h.in.cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
Ali Maredia
b94f910cd1 cmake: kv dir and bluestore unittests
Added CMakeLists.txt in src/kv, replaced
os_mon_objs with kv_objs, linked libkv to os,
added HAVE_LIBROCKSDB to config-h.in.cmake,
tweaked rocksdb unittest, added bluestore
unittests, made rocksdb build with
add_custom_target instead of custom_command.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-01-05 15:42:06 -05:00
John Spray
b21e43ee45 CMake: add libcephfs to cephfs_testing target
Tests for VolumeClient will use this.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-01-05 00:47:53 +00:00
John Spray
c28492ad05 CMake: link libcephfs the same as librados
Things got weird (tcmalloc exceptions) if one used
both libraries from the same process, presumably
because of some of these dependencies.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-01-05 00:47:53 +00:00
John Spray
0fdf745920 cmake: build and link rocksdb etc for bluestore
Signed-off-by: John Spray <john.spray@redhat.com>
2016-01-04 16:30:39 +00:00
John Spray
63bfa0c929 cmake: add rocksdb include path for bluestore
Signed-off-by: John Spray <john.spray@redhat.com>
2016-01-04 16:30:39 +00:00
Sage Weil
88c3ee8129 CMakeLists: update for os/ reorg
Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-01 13:08:54 -05:00
Sage Weil
a62ffb0d03 newstore -> bluestore
Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-01 13:06:52 -05:00
Adam C. Emerson
84dcfbd8ba time: Add basic support for std::chrono based time
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2015-12-18 15:15:03 -05:00
Jason Dillaman
3fd24eb2cd librbd: rename ImageRefresh to ImageState
This class handles more than just refreshing the image from
disk.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
6e1718c758 librbd: separate image refresh into async state machines
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
8aabb8cbc3 librbd: separate exclusive lock handling into async state machines
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
7248b93c54 librbd: async object map lock/unlock/refresh state machines
Creating async versions to support an async image refresh

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:30:51 -05:00
Jason Dillaman
3d25f5148c librbd: moved object name helpers to librbd::util namespace
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:30:50 -05:00
Kefu Chai
61392c1c2c Merge pull request #6823 from oritwas/wip-cmake-fix-authtool
cmake: add TracepointProvider.cc to libcommon

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-11 23:32:40 +08:00