From: Jason Dillaman Date: Sun, 3 Feb 2019 16:28:37 +0000 (-0500) Subject: librados: revert librados3/libradoscc back to librados2 X-Git-Tag: v14.1.0~20^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65c8733b56d2392ec70d6bf4db994697a4828287;p=ceph.git librados: revert librados3/libradoscc back to librados2 For backwards compatibility and upgrade reasons, the librados2 API needs to be preserved and it needs to continue to be compatible with dependent libraries like librbd1. Signed-off-by: Jason Dillaman --- diff --git a/ceph.spec.in b/ceph.spec.in index b9617c34b848..6866c6a66f16 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -331,8 +331,7 @@ Group: System/Filesystems Provides: ceph-test:/usr/bin/ceph-kvstore-tool Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} @@ -369,8 +368,7 @@ Summary: Ceph Common Group: System/Filesystems %endif Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release} @@ -537,7 +535,7 @@ Summary: Ceph fuse-based client %if 0%{?suse_version} Group: System/Filesystems %endif -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-fuse FUSE based client to map Ceph rbd images to files @@ -548,7 +546,8 @@ Summary: Ceph daemon for mirroring RBD images Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-mirror Daemon for mirroring RBD images between Ceph clusters, streaming changes asynchronously. @@ -558,7 +557,7 @@ Summary: Ceph RBD client base on NBD %if 0%{?suse_version} Group: System/Filesystems %endif -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-nbd NBD based client to map Ceph rbd images to local device @@ -572,8 +571,7 @@ Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?rhel} || 0%{?fedora} Requires: mailcap @@ -612,7 +610,7 @@ ceph-osd is the object storage daemon for the Ceph distributed file system. It is responsible for storing objects on a local file system and providing access to them over the network. -%package -n librados3 +%package -n librados2 Summary: RADOS distributed object store client library %if 0%{?suse_version} Group: System/Libraries @@ -620,7 +618,7 @@ Group: System/Libraries %if 0%{?rhel} || 0%{?fedora} Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif -%description -n librados3 +%description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster developed as part of the Ceph distributed storage system. This is a shared library allowing applications to access the distributed object @@ -631,31 +629,20 @@ Summary: RADOS headers %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: librados3-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: librados3-devel < %{_epoch_prefix}%{version}-%{release} +Provides: librados2-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: librados2-devel < %{_epoch_prefix}%{version}-%{release} %description -n librados-devel This package contains C libraries and headers needed to develop programs that use RADOS object store. -%package -n libradospp1 -Summary: RADOS distributed object store client C++ library -%if 0%{?suse_version} -Group: System/Libraries -%endif -%description -n libradospp1 -RADOS is a reliable, autonomic distributed object storage cluster -developed as part of the Ceph distributed storage system. This is a -shared library allowing C++ applications to access the distributed object -store using a simple file-like interface. - %package -n libradospp-devel Summary: RADOS headers %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} %description -n libradospp-devel This package contains C++ libraries and headers needed to develop programs @@ -666,7 +653,7 @@ Summary: RADOS gateway client library %if 0%{?suse_version} Group: System/Libraries %endif -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n librgw2 This package provides a library implementation of the RADOS gateway (distributed object store with S3 and Swift personalities). @@ -715,7 +702,7 @@ Summary: Python 2 libraries for the RADOS object store %if 0%{?suse_version} Group: Development/Libraries/Python %endif -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} %description -n python-rados This package contains Python 2 libraries for interacting with Cephs RADOS @@ -728,7 +715,7 @@ Summary: Python 3 libraries for the RADOS object store Group: Development/Libraries/Python %endif Requires: python%{python3_pkgversion} -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rados This package contains Python 3 libraries for interacting with Cephs RADOS object store. @@ -739,8 +726,7 @@ Summary: RADOS striping interface %if 0%{?suse_version} Group: System/Libraries %endif -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n libradosstriper1 Striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard rados objects using @@ -767,8 +753,7 @@ Summary: RADOS block device client library %if 0%{?suse_version} Group: System/Libraries %endif -Requires: librados3 = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} Requires(post): coreutils %endif @@ -1853,7 +1838,7 @@ fi %endif -%files -n librados3 +%files -n librados2 %{_libdir}/librados.so.* %dir %{_libdir}/ceph %{_libdir}/ceph/libceph-common.so.* @@ -1861,9 +1846,9 @@ fi %{_libdir}/librados_tp.so.* %endif -%post -n librados3 -p /sbin/ldconfig +%post -n librados2 -p /sbin/ldconfig -%postun -n librados3 -p /sbin/ldconfig +%postun -n librados2 -p /sbin/ldconfig %files -n librados-devel %dir %{_includedir}/rados @@ -1876,13 +1861,6 @@ fi %{_bindir}/librados-config %{_mandir}/man8/librados-config.8* -%files -n libradospp1 -%{_libdir}/libradospp.so.* - -%post -n libradospp1 -p /sbin/ldconfig - -%postun -n libradospp1 -p /sbin/ldconfig - %files -n libradospp-devel %dir %{_includedir}/rados %{_includedir}/rados/buffer.h @@ -1892,7 +1870,6 @@ fi %{_includedir}/rados/librados.hpp %{_includedir}/rados/page.h %{_includedir}/rados/rados_types.hpp -%{_libdir}/libradospp.so %if 0%{with python2} %files -n python-rados diff --git a/debian/control b/debian/control index 304aee71d131..a402e7a4650e 100644 --- a/debian/control +++ b/debian/control @@ -109,7 +109,7 @@ Depends: binutils, ${shlibs:Depends}, Recommends: btrfs-tools, ceph-mds (= ${binary:Version}), - librados3 (= ${binary:Version}), + librados2 (= ${binary:Version}), libradosstriper1 (= ${binary:Version}), librbd1 (= ${binary:Version}), ntp | time-daemon, @@ -428,7 +428,7 @@ Description: debugging symbols for rbd-fuse Package: rbd-mirror Architecture: linux-any Depends: ceph-common (= ${binary:Version}), - librados3 (= ${binary:Version}), + librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Description: Ceph daemon for mirroring RBD images @@ -551,7 +551,7 @@ Description: OCF-compliant resource agents for Ceph Ceph with OCF-compliant cluster resource managers, such as Pacemaker. -Package: librados3 +Package: librados2 Conflicts: librados Replaces: librados Architecture: linux-any @@ -564,11 +564,11 @@ Description: RADOS distributed object store client library shared library allowing applications to access the distributed object store using a simple file-like interface. -Package: librados3-dbg +Package: librados2-dbg Architecture: linux-any Section: debug Priority: extra -Depends: librados3 (= ${binary:Version}), +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, Description: debugging symbols for librados RADOS is a reliable, autonomic distributed object storage cluster @@ -581,7 +581,7 @@ Description: debugging symbols for librados Package: librados-dev Architecture: linux-any Section: libdevel -Depends: librados3 (= ${binary:Version}), +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Conflicts: librados1-dev, @@ -597,36 +597,10 @@ Description: RADOS distributed object store client library (development files) This package contains development files needed for building applications that link against librados. -Package: libradospp1 -Architecture: linux-any -Section: libs -Depends: ${misc:Depends}, - ${shlibs:Depends}, -Description: RADOS distributed object store client C++ library - RADOS is a reliable, autonomic distributed object storage cluster - developed as part of the Ceph distributed storage system. This is a - shared library allowing C++ applications to access the distributed object - store using a simple file-like C++ interface. - -Package: libradospp1-dbg -Architecture: linux-any -Section: debug -Priority: extra -Depends: libradospp1 (= ${binary:Version}), - ${misc:Depends}, -Description: debugging symbols for libradospp1 - RADOS is a reliable, autonomic distributed object storage cluster - developed as part of the Ceph distributed storage system. This is a - shared library allowing applications to access the distributed object - store using a simple file-like interface in C++. - . - This package contains debugging symbols for libradospp. - Package: libradospp-dev Architecture: linux-any Section: libdevel Depends: librados-dev (= ${binary:Version}), - libradospp1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Description: RADOS distributed object store client C++ library (development files) @@ -641,7 +615,7 @@ Description: RADOS distributed object store client C++ library (development file Package: libradosstriper1 Architecture: linux-any Section: libs -Depends: librados3 (= ${binary:Version}), +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Description: RADOS striping interface @@ -678,7 +652,7 @@ Description: RADOS striping interface (development files) Package: librbd1 Architecture: linux-any Section: libs -Depends: librados3 (= ${binary:Version}), +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Description: RADOS block device client library @@ -777,7 +751,7 @@ Description: Ceph distributed file system client library (development files) Package: librgw2 Architecture: linux-any Section: libs -Depends: librados3 (= ${binary:Version}), +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Description: RADOS Gateway client library @@ -890,7 +864,7 @@ Description: Meta-package for python libraries for the Ceph libraries Package: python-rados Architecture: linux-any Section: python -Depends: librados2 | librados3 +Depends: librados2 | librados2 ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, @@ -924,7 +898,7 @@ Description: Python 2 libraries for the Ceph librados library Package: python3-rados Architecture: linux-any Section: python -Depends: librados2 | librados3, +Depends: librados2 | librados2, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, diff --git a/debian/librados2.install b/debian/librados2.install new file mode 100644 index 000000000000..816e55fce2fa --- /dev/null +++ b/debian/librados2.install @@ -0,0 +1,3 @@ +usr/lib/ceph/libceph-common.so.* +usr/lib/librados.so.* +usr/lib/librados_tp.so.* diff --git a/debian/librados3.install b/debian/librados3.install deleted file mode 100644 index 816e55fce2fa..000000000000 --- a/debian/librados3.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/ceph/libceph-common.so.* -usr/lib/librados.so.* -usr/lib/librados_tp.so.* diff --git a/debian/libradospp-dev.install b/debian/libradospp-dev.install index 37d2d330efb4..c7aa0f9d6868 100644 --- a/debian/libradospp-dev.install +++ b/debian/libradospp-dev.install @@ -5,4 +5,3 @@ usr/include/rados/inline_memory.h usr/include/rados/librados.hpp usr/include/rados/page.h usr/include/rados/rados_types.hpp -usr/lib/libradospp.so diff --git a/debian/libradospp1.install b/debian/libradospp1.install deleted file mode 100644 index 0e18366b2476..000000000000 --- a/debian/libradospp1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libradospp.so.* diff --git a/debian/rules b/debian/rules index 940bbdb0749e..8579f42613f3 100755 --- a/debian/rules +++ b/debian/rules @@ -98,7 +98,7 @@ override_dh_strip: dh_strip -prbd-mirror --dbg-package=rbd-mirror-dbg dh_strip -prbd-nbd --dbg-package=rbd-nbd-dbg dh_strip -pceph-common --dbg-package=ceph-common-dbg - dh_strip -plibrados3 --dbg-package=librados3-dbg + dh_strip -plibrados2 --dbg-package=librados2-dbg dh_strip -plibradosstriper1 --dbg-package=libradosstriper1-dbg dh_strip -plibrbd1 --dbg-package=librbd1-dbg dh_strip -plibcephfs2 --dbg-package=libcephfs2-dbg diff --git a/doc/install/upgrading-ceph.rst b/doc/install/upgrading-ceph.rst index 6d4a0847994d..bf22b38ecab3 100644 --- a/doc/install/upgrading-ceph.rst +++ b/doc/install/upgrading-ceph.rst @@ -214,12 +214,12 @@ Upgrading a Client Once you have upgraded the packages and restarted daemons on your Ceph cluster, we recommend upgrading ``ceph-common`` and client libraries -(``librbd1`` , ``librados3`` and ``libradospp1``) on your client nodes too. +(``librbd1`` and ``librados2``) on your client nodes too. #. Upgrade the package:: ssh {client-host} - apt-get update && sudo apt-get install ceph-common librados3 libradospp1 librbd1 python-rados python-rbd + apt-get update && sudo apt-get install ceph-common librados2 librbd1 python-rados python-rbd #. Ensure that you have the latest version:: diff --git a/doc/man/8/ceph-deploy.rst b/doc/man/8/ceph-deploy.rst index 555626d7e0c3..3d099252a992 100644 --- a/doc/man/8/ceph-deploy.rst +++ b/doc/man/8/ceph-deploy.rst @@ -330,7 +330,7 @@ uninstall Remove Ceph packages from remote hosts. It detects the platform and distro of selected host and uninstalls Ceph packages from it. However, some dependencies -like ``librbd1`` and ``librados3`` will not be removed because they can cause +like ``librbd1`` and ``librados2`` will not be removed because they can cause issues with ``qemu-kvm``. Usage:: @@ -345,7 +345,7 @@ purge Remove Ceph packages from remote hosts and purge all data. It detects the platform and distro of selected host, uninstalls Ceph packages and purges all -data. However, some dependencies like ``librbd1`` and ``librados3`` will not be +data. However, some dependencies like ``librbd1`` and ``librados2`` will not be removed because they can cause issues with ``qemu-kvm``. Usage:: diff --git a/examples/librados/Makefile b/examples/librados/Makefile index 2254a1d56f88..fd61cb998032 100644 --- a/examples/librados/Makefile +++ b/examples/librados/Makefile @@ -1,7 +1,7 @@ CXX?=g++ CXX_FLAGS?=-std=c++11 -Wno-unused-parameter -Wall -Wextra -Werror -g -CXX_LIBS?=-lradospp -lradosstriper +CXX_LIBS?=-lrados -lradosstriper CXX_INC?=$(LOCAL_LIBRADOS_INC) CXX_CC=$(CXX) $(CXX_FLAGS) $(CXX_INC) $(LOCAL_LIBRADOS) diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml index f8c854200271..79189a0a50f3 100644 --- a/qa/packages/packages.yaml +++ b/qa/packages/packages.yaml @@ -13,7 +13,7 @@ ceph: - libcephfs-dev - libcephfs-java - libcephfs-jni - - librados3 + - librados2 - librbd1 - rbd-fuse - ceph-common-dbg @@ -24,7 +24,7 @@ ceph: - ceph-osd-dbg - ceph-test-dbg - libcephfs2-dbg - - librados3-dbg + - librados2-dbg - libradosstriper1-dbg - librbd1-dbg - librgw2-dbg @@ -47,7 +47,7 @@ ceph: - libcephfs_jni1 - libcephfs2 - libcephfs-devel - - librados3 + - librados2 - librbd1 - python-ceph - rbd-fuse diff --git a/qa/qa_scripts/cephscrub.sh b/qa/qa_scripts/cephscrub.sh index 19bf075ced46..331d5ce32d81 100755 --- a/qa/qa_scripts/cephscrub.sh +++ b/qa/qa_scripts/cephscrub.sh @@ -13,8 +13,8 @@ sudo apt-get -y purge ceph-fuse-dbg sudo apt-get -y purge ceph-common sudo apt-get -y purge ceph-common-dbg sudo apt-get -y purge ceph-resource-agents -sudo apt-get -y purge librados3 -sudo apt-get -y purge librados3-dbg +sudo apt-get -y purge librados2 +sudo apt-get -y purge librados2-dbg sudo apt-get -y purge librados-dev sudo apt-get -y purge librbd1 sudo apt-get -y purge librbd1-dbg diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25df4fe882f9..1b1f19d464e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -397,7 +397,7 @@ add_library(ceph-common SHARED ${ceph_common_objs}) target_link_libraries(ceph-common ${ceph_common_deps}) # appease dpkg-shlibdeps set_target_properties(ceph-common PROPERTIES - SOVERSION 1 + SOVERSION 0 INSTALL_RPATH "") if(NOT APPLE AND NOT FREEBSD) # Apple uses Mach-O, not ELF. so this option does not apply to APPLE. diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt index c2f68f648c1e..c4df7531094e 100644 --- a/src/librados/CMakeLists.txt +++ b/src/librados/CMakeLists.txt @@ -10,17 +10,16 @@ add_library(rados_c_api OBJECT librados_c.cc) add_library(rados_cxx_api OBJECT librados_cxx.cc) -add_library(rados_cxx STATIC - $) if(WITH_LTTNG) add_dependencies(librados_impl librados-tp) add_dependencies(rados_c_api librados-tp) add_dependencies(rados_cxx_api librados-tp) endif() -# C API +# C/C++ API add_library(librados ${CEPH_SHARED} - $) + $ + $) if(ENABLE_SHARED) set_target_properties(librados PROPERTIES OUTPUT_NAME rados @@ -39,34 +38,11 @@ if(ENABLE_SHARED) endif() target_link_libraries(librados PRIVATE - rados_cxx librados_impl - osdc ceph-common cls_lock_client + librados_impl osdc ceph-common cls_lock_client ${BLKID_LIBRARIES} ${CRYPTO_LIBS} ${EXTRALIBS} ${GSSAPI_LIBRARIES}) target_link_libraries(librados ${rados_libs}) install(TARGETS librados DESTINATION ${CMAKE_INSTALL_LIBDIR}) -# C++ API -add_library(librados-cxx ${CEPH_SHARED} - $) -if(ENABLE_SHARED) - set_target_properties(librados-cxx PROPERTIES - OUTPUT_NAME radospp - VERSION 1.0.0 - SOVERSION 1 - CXX_VISIBILITY_PRESET hidden - VISIBILITY_INLINES_HIDDEN ON) - if(NOT APPLE) - set_property(TARGET librados-cxx APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,--exclude-libs,ALL") - endif() -endif(ENABLE_SHARED) -target_link_libraries(librados-cxx - PUBLIC - librados - PRIVATE - librados_impl cls_lock_client ceph-common) -install(TARGETS librados-cxx DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(WITH_LTTNG AND WITH_EVENTTRACE) add_dependencies(librados_api_obj eventtrace_tp) endif() diff --git a/src/libradosstriper/CMakeLists.txt b/src/libradosstriper/CMakeLists.txt index d9d022f675f3..a69192465d51 100644 --- a/src/libradosstriper/CMakeLists.txt +++ b/src/libradosstriper/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(radosstriper ${CEPH_SHARED} ${libradosstriper_srcs}) target_link_libraries(radosstriper PRIVATE - librados-cxx + librados librados_impl cls_lock_client osdc ceph-common pthread ${CRYPTO_LIBS} ${EXTRALIBS}) set_target_properties(radosstriper PROPERTIES diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt index e7da59cf267f..061238a94be3 100644 --- a/src/librbd/CMakeLists.txt +++ b/src/librbd/CMakeLists.txt @@ -162,7 +162,7 @@ target_link_libraries(librbd PRIVATE rbd_internal rbd_types journal - librados-cxx + librados cls_rbd_client cls_lock_client cls_journal_client diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt index 5ffae423be46..e9d3804c5f57 100644 --- a/src/rbd_replay/CMakeLists.txt +++ b/src/rbd_replay/CMakeLists.txt @@ -10,7 +10,7 @@ set(librbd_replay_srcs rbd_loc.cc Replayer.cc) add_library(rbd_replay STATIC ${librbd_replay_srcs}) -target_link_libraries(rbd_replay PRIVATE librbd librados-cxx global) +target_link_libraries(rbd_replay PRIVATE librbd librados global) add_executable(rbd-replay rbd-replay.cc) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 7e3b1662393e..d0e508d8aa9c 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -197,7 +197,7 @@ target_include_directories(rgw_a SYSTEM PUBLIC "../rapidjson/include") target_link_libraries(rgw_a PUBLIC dmclock::dmclock PRIVATE - librados-cxx cls_otp_client cls_lock_client cls_rgw_client cls_refcount_client + librados cls_otp_client cls_lock_client cls_rgw_client cls_refcount_client cls_log_client cls_timeindex_client cls_version_client cls_user_client ceph-common common_utf8 global ${CURL_LIBRARIES} @@ -327,7 +327,7 @@ add_library(rgw_admin_user SHARED add_dependencies(rgw_admin_user civetweb_h) target_link_libraries(rgw_admin_user PRIVATE - librados-cxx + librados cls_rgw_client cls_otp_client cls_lock_client diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index fbc45c6daf5b..bd11aee0aec4 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -133,7 +133,7 @@ target_link_libraries(ceph_bench_log global pthread rt ${BLKID_LIBRARIES} ${CMAK add_executable(ceph_test_mutate test_mutate.cc ) -target_link_libraries(ceph_test_mutate global librados-cxx ${BLKID_LIBRARIES} +target_link_libraries(ceph_test_mutate global librados ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) # test_trans @@ -153,7 +153,7 @@ add_executable(ceph_omapbench ${omapbench_srcs} ) target_link_libraries(ceph_omapbench - librados-cxx + librados Boost::program_options global ${BLKID_LIBRARIES} @@ -167,7 +167,7 @@ if(WITH_KVS) ${CMAKE_SOURCE_DIR}/src/key_value_store/kv_flat_btree_async.cc ) add_executable(ceph_kvstorebench ${kvstorebench_srcs}) - target_link_libraries(ceph_kvstorebench librados-cxx global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + target_link_libraries(ceph_kvstorebench librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) install(TARGETS ceph_kvstorebench DESTINATION bin) endif(WITH_KVS) @@ -359,7 +359,7 @@ endif(${WITH_RADOSGW}) add_executable(ceph_multi_stress_watch multi_stress_watch.cc ) -target_link_libraries(ceph_multi_stress_watch librados-cxx global radostest-cxx +target_link_libraries(ceph_multi_stress_watch librados global radostest-cxx ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) #ceph_perf_local @@ -421,7 +421,7 @@ add_executable(ceph_test_stress_watch test_stress_watch.cc ) target_link_libraries(ceph_test_stress_watch - librados-cxx + librados ${UNITTEST_LIBS} radostest-cxx ${EXTRALIBS} diff --git a/src/test/cls_hello/CMakeLists.txt b/src/test/cls_hello/CMakeLists.txt index 1363d746b6a1..9efb95e03093 100644 --- a/src/test/cls_hello/CMakeLists.txt +++ b/src/test/cls_hello/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(ceph_test_cls_hello test_cls_hello.cc ) target_link_libraries(ceph_test_cls_hello - librados-cxx + librados global ${EXTRALIBS} ${BLKID_LIBRARIES} diff --git a/src/test/cls_journal/CMakeLists.txt b/src/test/cls_journal/CMakeLists.txt index 08d47655a798..eeb943330f9c 100644 --- a/src/test/cls_journal/CMakeLists.txt +++ b/src/test/cls_journal/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable(ceph_test_cls_journal $) target_link_libraries(ceph_test_cls_journal cls_journal_client - librados-cxx + librados global ${UNITTEST_LIBS} ${CMAKE_DL_LIBS} diff --git a/src/test/cls_lock/CMakeLists.txt b/src/test/cls_lock/CMakeLists.txt index 53f36725c56c..eef2de40edc2 100644 --- a/src/test/cls_lock/CMakeLists.txt +++ b/src/test/cls_lock/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(ceph_test_cls_lock ) target_link_libraries(ceph_test_cls_lock cls_lock_client - librados-cxx + librados global ${UNITTEST_LIBS} ${BLKID_LIBRARIES} diff --git a/src/test/cls_log/CMakeLists.txt b/src/test/cls_log/CMakeLists.txt index c27d9843a1c8..b5a88d47c173 100644 --- a/src/test/cls_log/CMakeLists.txt +++ b/src/test/cls_log/CMakeLists.txt @@ -1,7 +1,7 @@ add_executable(ceph_test_cls_log test_cls_log.cc) target_link_libraries(ceph_test_cls_log - librados-cxx + librados cls_log_client global radostest-cxx diff --git a/src/test/cls_lua/CMakeLists.txt b/src/test/cls_lua/CMakeLists.txt index cfb6ba1171b3..a16fb6226d68 100644 --- a/src/test/cls_lua/CMakeLists.txt +++ b/src/test/cls_lua/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable(ceph_test_cls_lua target_link_libraries(ceph_test_cls_lua cls_lua_client liblua - librados-cxx + librados global ${UNITTEST_LIBS} ${EXTRALIBS} diff --git a/src/test/cls_numops/CMakeLists.txt b/src/test/cls_numops/CMakeLists.txt index 00108991d390..827ff606f980 100644 --- a/src/test/cls_numops/CMakeLists.txt +++ b/src/test/cls_numops/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(ceph_test_cls_numops test_cls_numops.cc) target_link_libraries(ceph_test_cls_numops - librados-cxx + librados global cls_numops_client ${EXTRALIBS} diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt index d42deb08848b..59a75b030f4d 100644 --- a/src/test/cls_rbd/CMakeLists.txt +++ b/src/test/cls_rbd/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable(ceph_test_cls_rbd target_link_libraries(ceph_test_cls_rbd cls_rbd_client cls_lock_client - librados-cxx + librados global ${UNITTEST_LIBS} ${CMAKE_DL_LIBS} diff --git a/src/test/cls_refcount/CMakeLists.txt b/src/test/cls_refcount/CMakeLists.txt index e9aaeaa6a25d..c8589bdb5a11 100644 --- a/src/test/cls_refcount/CMakeLists.txt +++ b/src/test/cls_refcount/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(ceph_test_cls_refcount test_cls_refcount.cc ) target_link_libraries(ceph_test_cls_refcount - librados-cxx + librados cls_refcount_client global ${UNITTEST_LIBS} diff --git a/src/test/cls_rgw/CMakeLists.txt b/src/test/cls_rgw/CMakeLists.txt index 79409db53b7e..32d73e26e16b 100644 --- a/src/test/cls_rgw/CMakeLists.txt +++ b/src/test/cls_rgw/CMakeLists.txt @@ -4,7 +4,7 @@ if(${WITH_RADOSGW}) ) target_link_libraries(ceph_test_cls_rgw cls_rgw_client - librados-cxx + librados global ${UNITTEST_LIBS} ${EXTRALIBS} diff --git a/src/test/cls_sdk/CMakeLists.txt b/src/test/cls_sdk/CMakeLists.txt index cd05900d56f5..68085af28e87 100644 --- a/src/test/cls_sdk/CMakeLists.txt +++ b/src/test/cls_sdk/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(ceph_test_cls_sdk test_cls_sdk.cc ) target_link_libraries(ceph_test_cls_sdk - librados-cxx + librados global ${EXTRALIBS} ${BLKID_LIBRARIES} diff --git a/src/test/cls_version/CMakeLists.txt b/src/test/cls_version/CMakeLists.txt index d8e43878d698..05264017b73c 100644 --- a/src/test/cls_version/CMakeLists.txt +++ b/src/test/cls_version/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(ceph_test_cls_version test_cls_version.cc ) target_link_libraries(ceph_test_cls_version - librados-cxx + librados cls_version_client global ${UNITTEST_LIBS} diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt index e4b3011d3ff2..4fc53d240661 100644 --- a/src/test/librados/CMakeLists.txt +++ b/src/test/librados/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(ceph_test_rados_api_cmd add_executable(ceph_test_rados_api_cmd_pp cmd_cxx.cc) target_link_libraries(ceph_test_rados_api_cmd_pp - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_io io.cc) @@ -37,7 +37,7 @@ target_link_libraries(ceph_test_rados_api_io add_executable(ceph_test_rados_api_io_pp io_cxx.cc) target_link_libraries(ceph_test_rados_api_io_pp - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_c_write_operations c_write_operations.cc) @@ -56,11 +56,11 @@ target_link_libraries(ceph_test_rados_api_aio add_executable(ceph_test_rados_api_aio_pp aio_cxx.cc) target_link_libraries(ceph_test_rados_api_aio_pp - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_asio asio.cc) target_link_libraries(ceph_test_rados_api_asio global - librados-cxx ${UNITTEST_LIBS}) + librados ${UNITTEST_LIBS}) if(WITH_BOOST_CONTEXT) target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) endif() @@ -83,7 +83,7 @@ target_link_libraries(ceph_test_rados_api_stat add_executable(ceph_test_rados_api_stat_pp stat_cxx.cc) target_link_libraries(ceph_test_rados_api_stat_pp - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_watch_notify watch_notify.cc) @@ -92,12 +92,12 @@ target_link_libraries(ceph_test_rados_api_watch_notify add_executable(ceph_test_rados_api_watch_notify_pp watch_notify_cxx.cc) target_link_libraries(ceph_test_rados_api_watch_notify_pp - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_cls cls.cc) target_link_libraries(ceph_test_rados_api_cls - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_misc misc.cc @@ -108,7 +108,7 @@ add_executable(ceph_test_rados_api_misc_pp misc_cxx.cc $) target_link_libraries(ceph_test_rados_api_misc_pp - librados-cxx global ${UNITTEST_LIBS} radostest-cxx) + librados global ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_lock lock.cc) @@ -117,7 +117,7 @@ target_link_libraries(ceph_test_rados_api_lock add_executable(ceph_test_rados_api_lock_pp lock_cxx.cc) target_link_libraries(ceph_test_rados_api_lock_pp - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_service service.cc) @@ -126,13 +126,13 @@ target_link_libraries(ceph_test_rados_api_service add_executable(ceph_test_rados_api_service_pp service_cxx.cc) target_link_libraries(ceph_test_rados_api_service_pp - librados-cxx global ${UNITTEST_LIBS} radostest-cxx) + librados global ${UNITTEST_LIBS} radostest-cxx) add_executable(ceph_test_rados_api_tier_pp tier_cxx.cc $) target_link_libraries(ceph_test_rados_api_tier_pp - librados-cxx global ${UNITTEST_LIBS} Boost::system radostest-cxx) + librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) add_executable(ceph_test_rados_api_snapshots snapshots.cc) @@ -141,7 +141,7 @@ target_link_libraries(ceph_test_rados_api_snapshots add_executable(ceph_test_rados_api_snapshots_pp snapshots_cxx.cc) target_link_libraries(ceph_test_rados_api_snapshots_pp - librados-cxx ${UNITTEST_LIBS} radostest-cxx) + librados ${UNITTEST_LIBS} radostest-cxx) install(TARGETS ceph_test_rados_api_aio diff --git a/src/test/librados/list.cc b/src/test/librados/list.cc index 3ee9ae24bab5..c66cec351355 100644 --- a/src/test/librados/list.cc +++ b/src/test/librados/list.cc @@ -169,7 +169,7 @@ TEST_F(LibRadosList, ListObjectsStart) { // this function replicates // librados::operator<<(std::ostream& os, const librados::ObjectCursor& oc) -// because we don't want to use librados-cxx in librados client. +// because we don't want to use librados in librados client. std::ostream& operator<<(std::ostream&os, const rados_object_list_cursor& oc) { if (oc) { diff --git a/src/test/librados/test_shared.h b/src/test/librados/test_shared.h index 29e23b471cab..3c8ce7ed88ff 100644 --- a/src/test/librados/test_shared.h +++ b/src/test/librados/test_shared.h @@ -11,7 +11,7 @@ #include "include/buffer_fwd.h" -// helpers shared by librados and librados-cxx tests +// helpers shared by librados tests std::string get_temp_pool_name(const std::string &prefix = "test-rados-api-"); void assert_eq_sparse(ceph::bufferlist& expected, const std::map& extents, diff --git a/src/test/libradosstriper/CMakeLists.txt b/src/test/libradosstriper/CMakeLists.txt index 14de7ca83b1f..8e53a300ae16 100644 --- a/src/test/libradosstriper/CMakeLists.txt +++ b/src/test/libradosstriper/CMakeLists.txt @@ -13,8 +13,7 @@ add_executable(ceph_test_rados_striper_api_striping target_link_libraries(ceph_test_rados_striper_api_striping ${UNITTEST_LIBS} rados_striper_test radosstriper - librados - librados-cxx) + librados) install(TARGETS ceph_test_rados_striper_api_striping DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -23,14 +22,13 @@ add_executable(ceph_test_rados_striper_api_io target_link_libraries(ceph_test_rados_striper_api_io ${UNITTEST_LIBS} rados_striper_test radosstriper - librados - librados-cxx) + librados) install(TARGETS ceph_test_rados_striper_api_io DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(ceph_test_rados_striper_api_aio aio.cc) -target_link_libraries(ceph_test_rados_striper_api_aio librados-cxx radosstriper +target_link_libraries(ceph_test_rados_striper_api_aio librados radosstriper ${UNITTEST_LIBS} rados_striper_test) install(TARGETS ceph_test_rados_striper_api_aio DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt index 53570db52634..9d9f6c3118e0 100644 --- a/src/test/librbd/CMakeLists.txt +++ b/src/test/librbd/CMakeLists.txt @@ -138,7 +138,6 @@ target_link_libraries(ceph_test_librbd cls_journal_client cls_rbd_client librados - librados-cxx ${UNITTEST_LIBS} radostest) target_compile_definitions(ceph_test_librbd PRIVATE "TEST_LIBRBD_INTERNALS") @@ -154,7 +153,6 @@ target_link_libraries(ceph_test_librbd_api radostest-cxx librbd librados - librados-cxx ${UNITTEST_LIBS}) add_executable(ceph_test_librbd_fsx @@ -164,7 +162,6 @@ add_executable(ceph_test_librbd_fsx target_link_libraries(ceph_test_librbd_fsx librbd librados - librados-cxx journal global m diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt index 565a82064dcc..64639d5ec8eb 100644 --- a/src/test/osd/CMakeLists.txt +++ b/src/test/osd/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(ceph_test_rados RadosModel.cc ) target_link_libraries(ceph_test_rados - librados-cxx + librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt index 5a528c395521..2af8680b2f2d 100644 --- a/src/test/rbd_mirror/CMakeLists.txt +++ b/src/test/rbd_mirror/CMakeLists.txt @@ -61,7 +61,7 @@ target_link_libraries(unittest_rbd_mirror cls_lock_client cls_journal_client rbd_types - librados-cxx + librados osdc global radostest-cxx @@ -81,7 +81,7 @@ target_link_libraries(ceph_test_rbd_mirror cls_rbd_client cls_journal_client rbd_types - librados-cxx + librados radostest-cxx ${UNITTEST_LIBS} ) @@ -89,7 +89,7 @@ target_link_libraries(ceph_test_rbd_mirror add_executable(ceph_test_rbd_mirror_random_write random_write.cc) target_link_libraries(ceph_test_rbd_mirror_random_write - librbd librados-cxx global) + librbd librados global) install(TARGETS ceph_test_rbd_mirror diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index a799a6c96f19..42b72560c1e2 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -8,7 +8,7 @@ set(rados_srcs ${PROJECT_SOURCE_DIR}/src/osd/ECUtil.cc) add_executable(rados ${rados_srcs}) -target_link_libraries(rados librados-cxx global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) +target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) if(WITH_LIBRADOSSTRIPER) target_link_libraries(rados radosstriper) else() @@ -22,11 +22,11 @@ target_link_libraries(ceph_scratchtool librados global) install(TARGETS ceph_scratchtool DESTINATION bin) add_executable(ceph_scratchtoolpp scratchtoolpp.cc) -target_link_libraries(ceph_scratchtoolpp librados-cxx global) +target_link_libraries(ceph_scratchtoolpp librados global) install(TARGETS ceph_scratchtoolpp DESTINATION bin) add_executable(ceph_radosacl radosacl.cc) -target_link_libraries(ceph_radosacl librados-cxx global) +target_link_libraries(ceph_radosacl librados global) install(TARGETS ceph_radosacl DESTINATION bin) install(PROGRAMS @@ -102,7 +102,7 @@ install(TARGETS ceph-authtool DESTINATION bin) set(cephdeduptool_srcs ceph_dedup_tool.cc) add_executable(cephdeduptool ${cephdeduptool_srcs}) -target_link_libraries(cephdeduptool librados-cxx global cls_cas_client) +target_link_libraries(cephdeduptool librados global cls_cas_client) install(TARGETS cephdeduptool DESTINATION bin) if(WITH_CEPHFS) diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt index dbfc74e6a33b..2cca8dc034c8 100644 --- a/src/tools/cephfs/CMakeLists.txt +++ b/src/tools/cephfs/CMakeLists.txt @@ -9,7 +9,7 @@ set(cephfs_journal_tool_srcs RoleSelector.cc MDSUtility.cc) add_executable(cephfs-journal-tool ${cephfs_journal_tool_srcs}) -target_link_libraries(cephfs-journal-tool librados-cxx mds osdc global +target_link_libraries(cephfs-journal-tool librados mds osdc global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) set(cephfs_table_tool_srcs @@ -18,7 +18,7 @@ set(cephfs_table_tool_srcs RoleSelector.cc MDSUtility.cc) add_executable(cephfs-table-tool ${cephfs_table_tool_srcs}) -target_link_libraries(cephfs-table-tool librados-cxx mds osdc global +target_link_libraries(cephfs-table-tool librados mds osdc global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) set(cephfs_data_scan_srcs @@ -28,7 +28,7 @@ set(cephfs_data_scan_srcs PgFiles.cc MDSUtility.cc) add_executable(cephfs-data-scan ${cephfs_data_scan_srcs}) -target_link_libraries(cephfs-data-scan librados-cxx cephfs mds osdc global +target_link_libraries(cephfs-data-scan librados cephfs mds osdc global cls_cephfs_client ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt index eaebbc8f1143..36b2408a8d28 100644 --- a/src/tools/rbd/CMakeLists.txt +++ b/src/tools/rbd/CMakeLists.txt @@ -48,7 +48,7 @@ set(rbd_srcs add_executable(rbd ${rbd_srcs} $) set_target_properties(rbd PROPERTIES OUTPUT_NAME rbd) -target_link_libraries(rbd librbd librados-cxx +target_link_libraries(rbd librbd librados cls_journal_client cls_rbd_client rbd_types journal diff --git a/src/tools/rbd_ggate/CMakeLists.txt b/src/tools/rbd_ggate/CMakeLists.txt index fcd341c2a677..5c5572c48fe2 100644 --- a/src/tools/rbd_ggate/CMakeLists.txt +++ b/src/tools/rbd_ggate/CMakeLists.txt @@ -5,5 +5,5 @@ add_executable(rbd-ggate debug.cc ggate_drv.c main.cc) -target_link_libraries(rbd-ggate geom librbd librados-cxx global) +target_link_libraries(rbd-ggate geom librbd librados global) install(TARGETS rbd-ggate DESTINATION bin) diff --git a/src/tools/rbd_mirror/CMakeLists.txt b/src/tools/rbd_mirror/CMakeLists.txt index 1ad8ad34af38..fb39f9c52215 100644 --- a/src/tools/rbd_mirror/CMakeLists.txt +++ b/src/tools/rbd_mirror/CMakeLists.txt @@ -59,7 +59,7 @@ target_link_libraries(rbd-mirror rbd_internal rbd_types journal - librados-cxx + librados osdc cls_rbd_client cls_lock_client diff --git a/src/tools/rbd_nbd/CMakeLists.txt b/src/tools/rbd_nbd/CMakeLists.txt index 73ea99137864..d7ce811e9634 100644 --- a/src/tools/rbd_nbd/CMakeLists.txt +++ b/src/tools/rbd_nbd/CMakeLists.txt @@ -1,3 +1,3 @@ add_executable(rbd-nbd rbd-nbd.cc) -target_link_libraries(rbd-nbd librbd librados-cxx global) +target_link_libraries(rbd-nbd librbd librados global) install(TARGETS rbd-nbd DESTINATION bin)