mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
sys-cluster/ceph: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15471 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
committed by
Patrick McLean
Patrick McLean
parent
beb8fd4aa8
commit
e86cc310b4
@@ -1,165 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index aa90ba65da..ea65dd4209 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS
|
||||
set(BOOST_HEADER_COMPONENTS container)
|
||||
|
||||
if(WITH_MGR)
|
||||
- list(APPEND BOOST_COMPONENTS python)
|
||||
+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
|
||||
endif()
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
list(APPEND BOOST_COMPONENTS context coroutine)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 7aa8a4392e..111f669f2e 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -622,13 +622,13 @@ set(ceph_common_objs
|
||||
$<TARGET_OBJECTS:crush_objs>)
|
||||
set(ceph_common_deps
|
||||
json_spirit erasure_code rt ${LIB_RESOLV}
|
||||
- Boost::thread
|
||||
- Boost::system
|
||||
- Boost::regex
|
||||
- Boost::random
|
||||
- Boost::program_options
|
||||
- Boost::date_time
|
||||
- Boost::iostreams
|
||||
+ boost_thread
|
||||
+ boost_system
|
||||
+ boost_regex
|
||||
+ boost_random
|
||||
+ boost_program_options
|
||||
+ boost_date_time
|
||||
+ boost_iostreams
|
||||
${BLKID_LIBRARIES}
|
||||
${Backtrace_LIBRARIES}
|
||||
${BLKIN_LIBRARIES}
|
||||
@@ -712,7 +712,7 @@ if (WITH_MGR)
|
||||
$<TARGET_OBJECTS:heap_profiler_objs>)
|
||||
target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
|
||||
target_link_libraries(ceph-mgr osdc client global-static common
|
||||
- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
|
||||
+ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
|
||||
install(TARGETS ceph-mgr DESTINATION bin)
|
||||
endif (WITH_MGR)
|
||||
|
||||
@@ -885,7 +885,7 @@ set(ceph_mds_srcs
|
||||
ceph_mds.cc)
|
||||
add_executable(ceph-mds ${ceph_mds_srcs})
|
||||
target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
|
||||
- Boost::thread)
|
||||
+ boost_thread)
|
||||
install(TARGETS ceph-mds DESTINATION bin)
|
||||
|
||||
add_subdirectory(erasure-code)
|
||||
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
|
||||
index f3999e3b01..0ce7fca1ba 100644
|
||||
--- a/src/test/CMakeLists.txt
|
||||
+++ b/src/test/CMakeLists.txt
|
||||
@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
|
||||
)
|
||||
target_link_libraries(ceph_omapbench
|
||||
librados
|
||||
- Boost::program_options
|
||||
+ boost_program_options
|
||||
global
|
||||
${BLKID_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
|
||||
cls_rgw_client
|
||||
cls_user_client
|
||||
cls_lock_client
|
||||
- Boost::regex
|
||||
+ boost_regex
|
||||
${BLKID_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${EXPAT_LIBRARIES}
|
||||
@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
|
||||
cls_rgw_client
|
||||
cls_user_client
|
||||
cls_lock_client
|
||||
- Boost::regex
|
||||
+ boost_regex
|
||||
${BLKID_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${EXPAT_LIBRARIES}
|
||||
diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
|
||||
index 9fba701e05..da3cbcfe96 100644
|
||||
--- a/src/test/bench/CMakeLists.txt
|
||||
+++ b/src/test/bench/CMakeLists.txt
|
||||
@@ -8,7 +8,7 @@ set(smalliobench_srcs
|
||||
add_executable(ceph_smalliobench
|
||||
${smalliobench_srcs}
|
||||
)
|
||||
-target_link_libraries(ceph_smalliobench librados Boost::program_options global
|
||||
+target_link_libraries(ceph_smalliobench librados boost_program_options global
|
||||
${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
|
||||
|
||||
# ceph_smalliobenchrbd
|
||||
@@ -27,7 +27,7 @@ if(WITH_RBD)
|
||||
librados
|
||||
os
|
||||
global
|
||||
- Boost::program_options
|
||||
+ boost_program_options
|
||||
${BLKID_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
)
|
||||
@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
|
||||
add_executable(ceph_smalliobenchfs
|
||||
${ceph_smalliobenchfs_srcs}
|
||||
)
|
||||
-target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
|
||||
+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
|
||||
${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
|
||||
|
||||
# ceph_smalliobenchdumb
|
||||
@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
|
||||
add_executable(ceph_smalliobenchdumb
|
||||
${smalliobenchdumb_srcs}
|
||||
)
|
||||
-target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
|
||||
+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
|
||||
${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
|
||||
|
||||
# ceph_tpbench
|
||||
@@ -73,7 +73,7 @@ set(tpbench_srcs
|
||||
add_executable(ceph_tpbench
|
||||
${tpbench_srcs}
|
||||
)
|
||||
-target_link_libraries(ceph_tpbench librados Boost::program_options global
|
||||
+target_link_libraries(ceph_tpbench librados boost_program_options global
|
||||
${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
|
||||
|
||||
install(TARGETS
|
||||
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
|
||||
index 9f72fa3b48..665c977606 100644
|
||||
--- a/src/tools/CMakeLists.txt
|
||||
+++ b/src/tools/CMakeLists.txt
|
||||
@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global)
|
||||
install(TARGETS ceph_radosacl DESTINATION bin)
|
||||
|
||||
add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
|
||||
-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
|
||||
+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
|
||||
install(TARGETS ceph-osdomap-tool DESTINATION bin)
|
||||
|
||||
add_executable(ceph-monstore-tool
|
||||
ceph_monstore_tool.cc
|
||||
../mgr/mgr_commands.cc)
|
||||
-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
|
||||
+target_link_libraries(ceph-monstore-tool os global boost_program_options)
|
||||
install(TARGETS ceph-monstore-tool DESTINATION bin)
|
||||
install(PROGRAMS
|
||||
ceph-monstore-update-crush.sh
|
||||
@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool
|
||||
ceph_objectstore_tool.cc
|
||||
rebuild_mondb.cc
|
||||
RadosDump.cc)
|
||||
-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
|
||||
if(WITH_FUSE)
|
||||
target_link_libraries(ceph-objectstore-tool fuse)
|
||||
endif(WITH_FUSE)
|
||||
@@ -1,166 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2f997d03f8..748cb190e6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -591,7 +591,7 @@ set(BOOST_COMPONENTS
|
||||
set(BOOST_HEADER_COMPONENTS container)
|
||||
|
||||
if(WITH_MGR)
|
||||
- list(APPEND BOOST_COMPONENTS python)
|
||||
+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
|
||||
endif()
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
list(APPEND BOOST_COMPONENTS context coroutine)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 3d3b4c0919..94ab42ef9f 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -630,12 +630,12 @@ set(ceph_common_objs
|
||||
$<TARGET_OBJECTS:crush_objs>)
|
||||
set(ceph_common_deps
|
||||
json_spirit erasure_code ${LIB_RESOLV}
|
||||
- Boost::thread
|
||||
- Boost::system
|
||||
- Boost::random
|
||||
- Boost::program_options
|
||||
- Boost::date_time
|
||||
- Boost::iostreams
|
||||
+ boost_thread
|
||||
+ boost_system
|
||||
+ boost_random
|
||||
+ boost_program_options
|
||||
+ boost_date_time
|
||||
+ boost_iostreams
|
||||
${BLKID_LIBRARIES}
|
||||
${Backtrace_LIBRARIES}
|
||||
${BLKIN_LIBRARIES}
|
||||
@@ -759,7 +759,7 @@ if (WITH_MGR)
|
||||
$<TARGET_OBJECTS:heap_profiler_objs>)
|
||||
target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
|
||||
target_link_libraries(ceph-mgr osdc client global-static ceph-common
|
||||
- Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
|
||||
+ boost_python-${EPYTHON_VERSION} ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
|
||||
install(TARGETS ceph-mgr DESTINATION bin)
|
||||
endif (WITH_MGR)
|
||||
|
||||
@@ -888,7 +888,7 @@ set(ceph_mds_srcs
|
||||
ceph_mds.cc)
|
||||
add_executable(ceph-mds ${ceph_mds_srcs})
|
||||
target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
|
||||
- Boost::thread)
|
||||
+ boost_thread)
|
||||
install(TARGETS ceph-mds DESTINATION bin)
|
||||
|
||||
add_subdirectory(erasure-code)
|
||||
diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
|
||||
index e9d3804c5f..5c6eb58de1 100644
|
||||
--- a/src/rbd_replay/CMakeLists.txt
|
||||
+++ b/src/rbd_replay/CMakeLists.txt
|
||||
@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
|
||||
global
|
||||
babeltrace
|
||||
babeltrace-ctf
|
||||
- Boost::date_time
|
||||
+ boost_date_time
|
||||
)
|
||||
install(TARGETS rbd-replay-prep DESTINATION bin)
|
||||
endif(HAVE_BABELTRACE)
|
||||
diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
|
||||
index c1edd3b882..000c8daaf8 100644
|
||||
--- a/src/rgw/CMakeLists.txt
|
||||
+++ b/src/rgw/CMakeLists.txt
|
||||
@@ -162,7 +162,7 @@ target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_clie
|
||||
|
||||
if (WITH_RADOSGW_BEAST_FRONTEND)
|
||||
target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING)
|
||||
- target_link_libraries(rgw_a Boost::coroutine Boost::context)
|
||||
+ target_link_libraries(rgw_a boost_coroutine boost_context)
|
||||
endif()
|
||||
|
||||
if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL))
|
||||
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
|
||||
index a43335e825..a0d056faaa 100644
|
||||
--- a/src/test/CMakeLists.txt
|
||||
+++ b/src/test/CMakeLists.txt
|
||||
@@ -147,7 +147,7 @@ add_executable(ceph_omapbench
|
||||
)
|
||||
target_link_libraries(ceph_omapbench
|
||||
librados
|
||||
- Boost::program_options
|
||||
+ boost_program_options
|
||||
global
|
||||
${BLKID_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
|
||||
index 4ba31ab2a8..ab66208b57 100644
|
||||
--- a/src/test/erasure-code/CMakeLists.txt
|
||||
+++ b/src/test/erasure-code/CMakeLists.txt
|
||||
@@ -2,15 +2,15 @@
|
||||
add_executable(ceph_erasure_code_benchmark
|
||||
${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
|
||||
ceph_erasure_code_benchmark.cc)
|
||||
-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
|
||||
install(TARGETS ceph_erasure_code_benchmark
|
||||
DESTINATION bin)
|
||||
|
||||
add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
|
||||
-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
|
||||
|
||||
add_executable(ceph_erasure_code ceph_erasure_code.cc)
|
||||
-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
|
||||
install(TARGETS ceph_erasure_code
|
||||
DESTINATION bin)
|
||||
|
||||
diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
|
||||
index 1c909ee1ce..7c1ef32df1 100644
|
||||
--- a/src/test/librados/CMakeLists.txt
|
||||
+++ b/src/test/librados/CMakeLists.txt
|
||||
@@ -61,7 +61,7 @@ set_target_properties(ceph_test_rados_api_asio PROPERTIES COMPILE_FLAGS
|
||||
target_link_libraries(ceph_test_rados_api_asio global
|
||||
librados ${UNITTEST_LIBS})
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
|
||||
+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
|
||||
endif()
|
||||
|
||||
# ceph_test_rados_api_list
|
||||
@@ -147,7 +147,7 @@ add_executable(ceph_test_rados_api_tier
|
||||
set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS
|
||||
${UNITTEST_CXX_FLAGS})
|
||||
target_link_libraries(ceph_test_rados_api_tier
|
||||
- librados global ${UNITTEST_LIBS} Boost::system radostest)
|
||||
+ librados global ${UNITTEST_LIBS} boost_system radostest)
|
||||
|
||||
# ceph_test_rados_api_snapshots
|
||||
add_executable(ceph_test_rados_api_snapshots
|
||||
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
|
||||
index e0844ec0c7..886839302c 100644
|
||||
--- a/src/tools/CMakeLists.txt
|
||||
+++ b/src/tools/CMakeLists.txt
|
||||
@@ -29,20 +29,20 @@ install(PROGRAMS
|
||||
endif(WITH_TESTS)
|
||||
|
||||
add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
|
||||
-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
|
||||
+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
|
||||
install(TARGETS ceph-osdomap-tool DESTINATION bin)
|
||||
|
||||
add_executable(ceph-monstore-tool
|
||||
ceph_monstore_tool.cc
|
||||
../mgr/mgr_commands.cc)
|
||||
-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
|
||||
+target_link_libraries(ceph-monstore-tool os global boost_program_options)
|
||||
install(TARGETS ceph-monstore-tool DESTINATION bin)
|
||||
|
||||
add_executable(ceph-objectstore-tool
|
||||
ceph_objectstore_tool.cc
|
||||
rebuild_mondb.cc
|
||||
RadosDump.cc)
|
||||
-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
|
||||
if(WITH_FUSE)
|
||||
target_link_libraries(ceph-objectstore-tool fuse)
|
||||
endif(WITH_FUSE)
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
|
||||
index c996cd9402..f99765702b 100644
|
||||
--- a/src/pybind/CMakeLists.txt
|
||||
+++ b/src/pybind/CMakeLists.txt
|
||||
@@ -62,11 +62,6 @@ foreach(python_version ${py_vers})
|
||||
endforeach()
|
||||
|
||||
if(WITH_MGR)
|
||||
- if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2)
|
||||
- message(FATAL_ERROR "mgr plugins require python2 binding")
|
||||
- elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3)
|
||||
- message(FATAL_ERROR "mgr plugins require python3 binding")
|
||||
- endif()
|
||||
# Location needs to match default setting for mgr_module_path, currently:
|
||||
# OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr")
|
||||
install(DIRECTORY
|
||||
@@ -1,78 +0,0 @@
|
||||
diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt
|
||||
index 6e5946b784..233cccfc9b 100644
|
||||
--- a/src/ceph-detect-init/CMakeLists.txt
|
||||
+++ b/src/ceph-detect-init/CMakeLists.txt
|
||||
@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua
|
||||
|
||||
add_custom_target(ceph-detect-init
|
||||
COMMAND
|
||||
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
|
||||
- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
|
||||
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
|
||||
+ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
|
||||
COMMENT "ceph-detect-init is being created")
|
||||
add_dependencies(tests ceph-detect-init)
|
||||
diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
|
||||
index 00aaec4a80..b0700c488f 100644
|
||||
--- a/src/ceph-disk/CMakeLists.txt
|
||||
+++ b/src/ceph-disk/CMakeLists.txt
|
||||
@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
|
||||
|
||||
add_custom_target(ceph-disk
|
||||
COMMAND
|
||||
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
|
||||
- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
|
||||
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
|
||||
+ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
|
||||
COMMENT "ceph-disk is being created")
|
||||
add_dependencies(tests ceph-disk)
|
||||
diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
index 2b050f6c6e..e9fb87f76b 100644
|
||||
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
|
||||
|
||||
add_custom_target(mgr-dashboard-test-venv
|
||||
COMMAND
|
||||
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
||||
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
|
||||
COMMENT "dashboard tests virtualenv is being created")
|
||||
add_dependencies(tests mgr-dashboard-test-venv)
|
||||
@@ -13,9 +13,9 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env)
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "${mgr-dashboard-nodeenv}/bin/npm"
|
||||
- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
|
||||
- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
|
||||
- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0
|
||||
+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
|
||||
+ #COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
|
||||
+ #COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
COMMENT "dashboard nodeenv is being installed"
|
||||
)
|
||||
@@ -27,7 +27,7 @@ add_custom_target(mgr-dashboard-nodeenv
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
|
||||
- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate
|
||||
+ #COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate
|
||||
DEPENDS frontend/package.json
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
|
||||
COMMENT "dashboard frontend dependencies are being installed"
|
||||
@@ -62,9 +62,11 @@ else()
|
||||
set(npm_command npm run build)
|
||||
endif()
|
||||
|
||||
+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin)
|
||||
+
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
|
||||
- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate
|
||||
+ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command}
|
||||
DEPENDS ${frontend_src} frontend/node_modules
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
|
||||
COMMENT "dashboard frontend is being created"
|
||||
@@ -1,37 +0,0 @@
|
||||
--- ceph-13.2.5.orig/src/rocksdb/CMakeLists.txt 2019-03-20 11:39:25.065954652 -0700
|
||||
+++ ceph-13.2.5/src/rocksdb/CMakeLists.txt 2019-03-20 13:18:01.548085828 -0700
|
||||
@@ -286,18 +286,24 @@
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-find_package(NUMA)
|
||||
-if(NUMA_FOUND)
|
||||
- add_definitions(-DNUMA)
|
||||
- include_directories(${NUMA_INCLUDE_DIR})
|
||||
- list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
|
||||
+option(WITH_NUMA "build with UBSAN" OFF)
|
||||
+if(WITH_NUMA)
|
||||
+ find_package(NUMA)
|
||||
+ if(NUMA_FOUND)
|
||||
+ add_definitions(-DNUMA)
|
||||
+ include_directories(${NUMA_INCLUDE_DIR})
|
||||
+ list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
-find_package(TBB)
|
||||
-if(TBB_FOUND)
|
||||
- add_definitions(-DTBB)
|
||||
- include_directories(${TBB_INCLUDE_DIR})
|
||||
- list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
|
||||
+option(WITH_TBB "build with UBSAN" OFF)
|
||||
+if(WITH_TBB)
|
||||
+ find_package(TBB)
|
||||
+ if(TBB_FOUND)
|
||||
+ add_definitions(-DTBB)
|
||||
+ include_directories(${TBB_INCLUDE_DIR})
|
||||
+ list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
# Used to run CI build and tests so we can run faster
|
||||
@@ -1,14 +0,0 @@
|
||||
diff --git a/src/spdk/dpdk/lib/librte_net/rte_ether.h b/src/spdk/dpdk/lib/librte_net/rte_ether.h
|
||||
index 3a87ff184..8090b7c01 100644
|
||||
--- a/src/spdk/dpdk/lib/librte_net/rte_ether.h
|
||||
+++ b/src/spdk/dpdk/lib/librte_net/rte_ether.h
|
||||
@@ -55,7 +55,8 @@ extern "C" {
|
||||
* See http://standards.ieee.org/regauth/groupmac/tutorial.html
|
||||
*/
|
||||
struct ether_addr {
|
||||
- uint8_t addr_bytes[ETHER_ADDR_LEN]; /**< Addr bytes in tx order */
|
||||
+ /** Addr bytes in tx order */
|
||||
+ uint8_t addr_bytes[ETHER_ADDR_LEN] __rte_aligned(2);
|
||||
} __attribute__((__packed__));
|
||||
|
||||
#define ETHER_LOCAL_ADMIN_ADDR 0x02 /**< Locally assigned Eth. address. */
|
||||
@@ -1,74 +0,0 @@
|
||||
diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt
|
||||
index 6e5946b784..233cccfc9b 100644
|
||||
--- a/src/ceph-detect-init/CMakeLists.txt
|
||||
+++ b/src/ceph-detect-init/CMakeLists.txt
|
||||
@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua
|
||||
|
||||
add_custom_target(ceph-detect-init
|
||||
COMMAND
|
||||
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
|
||||
- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
|
||||
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
|
||||
+ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
|
||||
COMMENT "ceph-detect-init is being created")
|
||||
add_dependencies(tests ceph-detect-init)
|
||||
diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
|
||||
index 00aaec4a80..b0700c488f 100644
|
||||
--- a/src/ceph-disk/CMakeLists.txt
|
||||
+++ b/src/ceph-disk/CMakeLists.txt
|
||||
@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
|
||||
|
||||
add_custom_target(ceph-disk
|
||||
COMMAND
|
||||
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
|
||||
- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
|
||||
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
|
||||
+ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
|
||||
COMMENT "ceph-disk is being created")
|
||||
add_dependencies(tests ceph-disk)
|
||||
diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
index 88ca8a60bb..77c716cdb1 100644
|
||||
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
|
||||
|
||||
add_custom_target(mgr-dashboard-test-venv
|
||||
COMMAND
|
||||
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
||||
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
|
||||
COMMENT "dashboard tests virtualenv is being created")
|
||||
add_dependencies(tests mgr-dashboard-test-venv)
|
||||
@@ -13,9 +13,6 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env)
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "${mgr-dashboard-nodeenv}/bin/npm"
|
||||
- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
|
||||
- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
|
||||
- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 10.13.0
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
COMMENT "dashboard nodeenv is being installed"
|
||||
)
|
||||
@@ -27,7 +24,6 @@ add_custom_target(mgr-dashboard-nodeenv
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
|
||||
- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm ci && deactivate
|
||||
DEPENDS frontend/package.json
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
|
||||
COMMENT "dashboard frontend dependencies are being installed"
|
||||
@@ -62,9 +58,11 @@ else()
|
||||
set(npm_command npm run build)
|
||||
endif()
|
||||
|
||||
+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin)
|
||||
+
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
|
||||
- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate
|
||||
+ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command}
|
||||
DEPENDS ${frontend_src} frontend/node_modules
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
|
||||
COMMENT "dashboard frontend is being created"
|
||||
@@ -1,54 +0,0 @@
|
||||
diff --git a/.gitignore b/.gitignore
|
||||
index 2c2afc282e..80c05ee2f0 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -13,10 +13,8 @@
|
||||
*.swp
|
||||
*.swo
|
||||
*.tmp
|
||||
-*.orig
|
||||
*.patch
|
||||
!debian/patches/*.patch
|
||||
-*.rej
|
||||
*.rpm
|
||||
*.pyc
|
||||
ceph.spec
|
||||
diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
index 24a2efc9e2..b11d4d0303 100644
|
||||
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
|
||||
|
||||
add_custom_target(mgr-dashboard-test-venv
|
||||
COMMAND
|
||||
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
||||
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
|
||||
COMMENT "dashboard tests virtualenv is being created")
|
||||
add_dependencies(tests mgr-dashboard-test-venv)
|
||||
@@ -14,9 +14,9 @@ function(add_npm_command)
|
||||
set(multi_kw COMMAND DEPENDS)
|
||||
cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
|
||||
string(REPLACE ";" " " command "${NC_COMMAND}")
|
||||
- if(NC_NODEENV)
|
||||
- string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
|
||||
- endif()
|
||||
+ #if(NC_NODEENV)
|
||||
+ # string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
|
||||
+ #endif()
|
||||
string(REPLACE " " ";" command "${command}")
|
||||
add_custom_command(
|
||||
OUTPUT "${NC_OUTPUT}"
|
||||
@@ -41,9 +41,9 @@ else()
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
|
||||
- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
|
||||
- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
|
||||
- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
|
||||
+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
|
||||
+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
|
||||
+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
COMMENT "dashboard nodeenv is being installed"
|
||||
)
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 05d1e61270..8b939b8af6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
|
||||
|
||||
if(WITH_MGR)
|
||||
list(APPEND BOOST_COMPONENTS
|
||||
- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
|
||||
+ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
|
||||
endif()
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
list(APPEND BOOST_COMPONENTS context coroutine)
|
||||
diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
|
||||
index f46cc0d485..3cc6340b2c 100644
|
||||
--- a/cmake/modules/BuildBoost.cmake
|
||||
+++ b/cmake/modules/BuildBoost.cmake
|
||||
@@ -205,7 +205,7 @@ macro(build_boost version)
|
||||
endif()
|
||||
add_dependencies(Boost::${c} Boost)
|
||||
if(c MATCHES "^python")
|
||||
- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
|
||||
+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
|
||||
endif()
|
||||
if(Boost_USE_STATIC_LIBS)
|
||||
set(Boost_${upper_c}_LIBRARY
|
||||
@@ -1,78 +0,0 @@
|
||||
diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
|
||||
index e4be074ec7..4af3695dc1 100644
|
||||
--- a/src/rgw/rgw_asio_frontend.cc
|
||||
+++ b/src/rgw/rgw_asio_frontend.cc
|
||||
@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO {
|
||||
using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
|
||||
|
||||
template <typename Stream>
|
||||
-void handle_connection(RGWProcessEnv& env, Stream& stream,
|
||||
+void handle_connection(boost::asio::io_context& context,
|
||||
+ RGWProcessEnv& env, Stream& stream,
|
||||
boost::beast::flat_buffer& buffer, bool is_ssl,
|
||||
SharedMutex& pause_mutex,
|
||||
rgw::dmclock::Scheduler *scheduler,
|
||||
@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
|
||||
rgw::io::add_conlen_controlling(
|
||||
&real_client))));
|
||||
RGWRestfulIO client(cct, &real_client_io);
|
||||
- auto y = optional_yield{socket.get_io_context(), yield};
|
||||
+ auto y = optional_yield{context, yield};
|
||||
process_request(env.store, env.rest, &req, env.uri_prefix,
|
||||
*env.auth_registry, &client, env.olog, y, scheduler);
|
||||
}
|
||||
@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
|
||||
return;
|
||||
}
|
||||
buffer.consume(bytes);
|
||||
- handle_connection(env, stream, buffer, true, pause_mutex,
|
||||
+ handle_connection(context, env, stream, buffer, true, pause_mutex,
|
||||
scheduler.get(), ec, yield);
|
||||
if (!ec) {
|
||||
// ssl shutdown (ignoring errors)
|
||||
@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
|
||||
auto c = connections.add(conn);
|
||||
boost::beast::flat_buffer buffer;
|
||||
boost::system::error_code ec;
|
||||
- handle_connection(env, s, buffer, false, pause_mutex,
|
||||
+ handle_connection(context, env, s, buffer, false, pause_mutex,
|
||||
scheduler.get(), ec, yield);
|
||||
s.shutdown(tcp::socket::shutdown_both, ec);
|
||||
});
|
||||
diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
|
||||
index 70487a5253..1d454acd2e 100644
|
||||
--- a/src/rgw/rgw_dmclock_async_scheduler.h
|
||||
+++ b/src/rgw/rgw_dmclock_async_scheduler.h
|
||||
@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
|
||||
using Completion = async::Completion<Signature, async::AsBase<Request>>;
|
||||
|
||||
using Clock = ceph::coarse_real_clock;
|
||||
+#if BOOST_VERSION < 107000
|
||||
using Timer = boost::asio::basic_waitable_timer<Clock>;
|
||||
+#else
|
||||
+ using Timer = boost::asio::basic_waitable_timer<Clock,
|
||||
+ boost::asio::wait_traits<Clock>, executor_type>;
|
||||
+#endif
|
||||
Timer timer; //< timer for the next scheduled request
|
||||
|
||||
CephContext *const cct;
|
||||
diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
|
||||
index d99a6ff68d..213fc238d2 100644
|
||||
--- a/src/rgw/rgw_reshard.h
|
||||
+++ b/src/rgw/rgw_reshard.h
|
||||
@@ -183,7 +183,14 @@ class RGWReshardWait {
|
||||
ceph::condition_variable cond;
|
||||
|
||||
struct Waiter : boost::intrusive::list_base_hook<> {
|
||||
- boost::asio::basic_waitable_timer<Clock> timer;
|
||||
+#if BOOST_VERSION < 107000
|
||||
+ using Timer = boost::asio::basic_waitable_timer<Clock>;
|
||||
+#else
|
||||
+ using Executor = boost::asio::io_context::executor_type;
|
||||
+ using Timer = boost::asio::basic_waitable_timer<Clock,
|
||||
+ boost::asio::wait_traits<Clock>, Executor>;
|
||||
+#endif
|
||||
+ Timer timer;
|
||||
explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
|
||||
};
|
||||
boost::intrusive::list<Waiter> waiters;
|
||||
@@ -1,321 +0,0 @@
|
||||
diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
|
||||
index dd08ba5e45..19d3b8ad37 100644
|
||||
--- a/cmake/modules/FindBoost.cmake
|
||||
+++ b/cmake/modules/FindBoost.cmake
|
||||
@@ -1235,10 +1235,10 @@ endif()
|
||||
# on all platforms to keep end user code free from platform dependent
|
||||
# code. Also provide convenience targets to disable autolinking and
|
||||
# enable dynamic linking.
|
||||
-if(NOT TARGET Boost::diagnostic_definitions)
|
||||
- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
|
||||
- add_library(Boost::disable_autolinking INTERFACE IMPORTED)
|
||||
- add_library(Boost::dynamic_linking INTERFACE IMPORTED)
|
||||
+if(NOT TARGET boost_diagnostic_definitions)
|
||||
+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
|
||||
+ add_library(boost_disable_autolinking INTERFACE IMPORTED)
|
||||
+ add_library(boost_dynamic_linking INTERFACE IMPORTED)
|
||||
endif()
|
||||
if(WIN32)
|
||||
# In windows, automatic linking is performed, so you do not have
|
||||
@@ -1259,11 +1259,11 @@ if(WIN32)
|
||||
# code to emit a #pragma message each time a library is selected
|
||||
# for linking.
|
||||
set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
|
||||
- set_target_properties(Boost::diagnostic_definitions PROPERTIES
|
||||
+ set_target_properties(boost_diagnostic_definitions PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
|
||||
- set_target_properties(Boost::disable_autolinking PROPERTIES
|
||||
+ set_target_properties(boost_disable_autolinking PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
|
||||
- set_target_properties(Boost::dynamic_linking PROPERTIES
|
||||
+ set_target_properties(boost_dynamic_linking PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
|
||||
endif()
|
||||
|
||||
@@ -2088,52 +2088,52 @@ if(Boost_FOUND)
|
||||
endif()
|
||||
|
||||
foreach(COMPONENT ${Boost_FIND_COMPONENTS})
|
||||
- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
|
||||
+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
|
||||
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
|
||||
if(Boost_${UPPERCOMPONENT}_FOUND)
|
||||
if(Boost_USE_STATIC_LIBS)
|
||||
- add_library(Boost::${COMPONENT} STATIC IMPORTED)
|
||||
+ add_library(boost_${COMPONENT} STATIC IMPORTED)
|
||||
else()
|
||||
# Even if Boost_USE_STATIC_LIBS is OFF, we might have static
|
||||
# libraries as a result.
|
||||
- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
|
||||
+ add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
|
||||
endif()
|
||||
if(Boost_INCLUDE_DIRS)
|
||||
- set_target_properties(Boost::${COMPONENT} PROPERTIES
|
||||
+ set_target_properties(boost_${COMPONENT} PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
|
||||
endif()
|
||||
if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
|
||||
- set_target_properties(Boost::${COMPONENT} PROPERTIES
|
||||
+ set_target_properties(boost_${COMPONENT} PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
|
||||
IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
|
||||
endif()
|
||||
if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
|
||||
- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
|
||||
+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
|
||||
IMPORTED_CONFIGURATIONS RELEASE)
|
||||
- set_target_properties(Boost::${COMPONENT} PROPERTIES
|
||||
+ set_target_properties(boost_${COMPONENT} PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
|
||||
IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
|
||||
endif()
|
||||
if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
|
||||
- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
|
||||
+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
|
||||
IMPORTED_CONFIGURATIONS DEBUG)
|
||||
- set_target_properties(Boost::${COMPONENT} PROPERTIES
|
||||
+ set_target_properties(boost_${COMPONENT} PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
|
||||
IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
|
||||
endif()
|
||||
if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
|
||||
unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
|
||||
foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
|
||||
- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
|
||||
+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
|
||||
endforeach()
|
||||
if(COMPONENT STREQUAL "thread")
|
||||
list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
|
||||
endif()
|
||||
- set_target_properties(Boost::${COMPONENT} PROPERTIES
|
||||
+ set_target_properties(boost_${COMPONENT} PROPERTIES
|
||||
INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
|
||||
endif()
|
||||
if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
|
||||
- set_target_properties(Boost::${COMPONENT} PROPERTIES
|
||||
+ set_target_properties(boost_${COMPONENT} PROPERTIES
|
||||
INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
|
||||
endif()
|
||||
endif()
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 4895e84df6..55814e3b96 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -356,12 +356,12 @@ set(ceph_common_objs
|
||||
set(ceph_common_deps
|
||||
json_spirit erasure_code arch crc32
|
||||
${LIB_RESOLV}
|
||||
- Boost::thread
|
||||
- Boost::system
|
||||
- Boost::random
|
||||
- Boost::program_options
|
||||
- Boost::date_time
|
||||
- Boost::iostreams
|
||||
+ boost_thread
|
||||
+ boost_system
|
||||
+ boost_random
|
||||
+ boost_program_options
|
||||
+ boost_date_time
|
||||
+ boost_iostreams
|
||||
${BLKID_LIBRARIES}
|
||||
${Backtrace_LIBRARIES}
|
||||
${BLKIN_LIBRARIES}
|
||||
@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
|
||||
ceph_mds.cc)
|
||||
add_executable(ceph-mds ${ceph_mds_srcs})
|
||||
target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
|
||||
- Boost::thread)
|
||||
+ boost_thread)
|
||||
install(TARGETS ceph-mds DESTINATION bin)
|
||||
endif()
|
||||
|
||||
diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
|
||||
index d7b58521d4..e1533af33f 100644
|
||||
--- a/src/crimson/CMakeLists.txt
|
||||
+++ b/src/crimson/CMakeLists.txt
|
||||
@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
|
||||
PRIVATE
|
||||
crc32
|
||||
crimson::cflags
|
||||
- Boost::iostreams
|
||||
- Boost::random
|
||||
+ boost_iostreams
|
||||
+ boost_random
|
||||
${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
|
||||
|
||||
set(crimson_auth_srcs
|
||||
diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
|
||||
index 252fb3e5e3..213482da16 100644
|
||||
--- a/src/mgr/CMakeLists.txt
|
||||
+++ b/src/mgr/CMakeLists.txt
|
||||
@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
|
||||
target_link_libraries(ceph-mgr
|
||||
osdc client heap_profiler
|
||||
global-static ceph-common
|
||||
- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
|
||||
+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
|
||||
${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
|
||||
set_target_properties(ceph-mgr PROPERTIES
|
||||
POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
|
||||
diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
|
||||
index e9d3804c5f..5c6eb58de1 100644
|
||||
--- a/src/rbd_replay/CMakeLists.txt
|
||||
+++ b/src/rbd_replay/CMakeLists.txt
|
||||
@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
|
||||
global
|
||||
babeltrace
|
||||
babeltrace-ctf
|
||||
- Boost::date_time
|
||||
+ boost_date_time
|
||||
)
|
||||
install(TARGETS rbd-replay-prep DESTINATION bin)
|
||||
endif(HAVE_BABELTRACE)
|
||||
diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
|
||||
index 8d5b0638a0..a147c55bc3 100644
|
||||
--- a/src/rgw/CMakeLists.txt
|
||||
+++ b/src/rgw/CMakeLists.txt
|
||||
@@ -196,7 +196,7 @@ if(WITH_CURL_OPENSSL)
|
||||
endif()
|
||||
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
|
||||
+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
|
||||
endif()
|
||||
|
||||
set(rgw_libs rgw_a)
|
||||
@@ -347,7 +347,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
|
||||
target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
|
||||
endif()
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
|
||||
+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
|
||||
endif()
|
||||
|
||||
if(WITH_TESTS)
|
||||
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
|
||||
index 5dcee1694d..60743be698 100644
|
||||
--- a/src/test/CMakeLists.txt
|
||||
+++ b/src/test/CMakeLists.txt
|
||||
@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
|
||||
)
|
||||
target_link_libraries(ceph_omapbench
|
||||
librados
|
||||
- Boost::program_options
|
||||
+ boost_program_options
|
||||
global
|
||||
${BLKID_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
|
||||
index 71fb77cda9..aff8fb6565 100644
|
||||
--- a/src/test/common/CMakeLists.txt
|
||||
+++ b/src/test/common/CMakeLists.txt
|
||||
@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
|
||||
|
||||
add_executable(unittest_async_completion test_async_completion.cc)
|
||||
add_ceph_unittest(unittest_async_completion)
|
||||
-target_link_libraries(unittest_async_completion Boost::system)
|
||||
+target_link_libraries(unittest_async_completion boost_system)
|
||||
|
||||
add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
|
||||
add_ceph_unittest(unittest_async_shared_mutex)
|
||||
-target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
|
||||
+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
|
||||
diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
|
||||
index 721f6c3675..1cd9635c77 100644
|
||||
--- a/src/test/erasure-code/CMakeLists.txt
|
||||
+++ b/src/test/erasure-code/CMakeLists.txt
|
||||
@@ -2,15 +2,15 @@
|
||||
add_executable(ceph_erasure_code_benchmark
|
||||
${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
|
||||
ceph_erasure_code_benchmark.cc)
|
||||
-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
|
||||
install(TARGETS ceph_erasure_code_benchmark
|
||||
DESTINATION bin)
|
||||
|
||||
add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
|
||||
-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
|
||||
|
||||
add_executable(ceph_erasure_code ceph_erasure_code.cc)
|
||||
-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
|
||||
install(TARGETS ceph_erasure_code
|
||||
DESTINATION bin)
|
||||
|
||||
diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
|
||||
index 4fc53d2406..e6304394f8 100644
|
||||
--- a/src/test/librados/CMakeLists.txt
|
||||
+++ b/src/test/librados/CMakeLists.txt
|
||||
@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
|
||||
target_link_libraries(ceph_test_rados_api_asio global
|
||||
librados ${UNITTEST_LIBS})
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
|
||||
+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
|
||||
endif()
|
||||
|
||||
add_executable(ceph_test_rados_api_list
|
||||
@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
|
||||
tier_cxx.cc
|
||||
$<TARGET_OBJECTS:unit-main>)
|
||||
target_link_libraries(ceph_test_rados_api_tier_pp
|
||||
- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
|
||||
+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
|
||||
|
||||
add_executable(ceph_test_rados_api_snapshots
|
||||
snapshots.cc)
|
||||
diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
|
||||
index 3988e94bd3..b2a720b8a0 100644
|
||||
--- a/src/test/librbd/CMakeLists.txt
|
||||
+++ b/src/test/librbd/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
|
||||
radostest
|
||||
radostest-cxx
|
||||
librados
|
||||
- Boost::thread
|
||||
+ boost_thread
|
||||
GMock::GMock
|
||||
GTest::GTest)
|
||||
|
||||
diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
|
||||
index 36df883a66..43d3456089 100644
|
||||
--- a/src/test/rgw/CMakeLists.txt
|
||||
+++ b/src/test/rgw/CMakeLists.txt
|
||||
@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
|
||||
target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
|
||||
if(WITH_BOOST_CONTEXT)
|
||||
target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
|
||||
- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
|
||||
+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
|
||||
endif()
|
||||
|
||||
if(WITH_RADOSGW_AMQP_ENDPOINT)
|
||||
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
|
||||
index d31f3d2408..6945018b11 100644
|
||||
--- a/src/tools/CMakeLists.txt
|
||||
+++ b/src/tools/CMakeLists.txt
|
||||
@@ -35,20 +35,20 @@ install(PROGRAMS
|
||||
endif(WITH_TESTS)
|
||||
|
||||
add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
|
||||
-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
|
||||
+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
|
||||
install(TARGETS ceph-osdomap-tool DESTINATION bin)
|
||||
|
||||
add_executable(ceph-monstore-tool
|
||||
ceph_monstore_tool.cc
|
||||
../mgr/mgr_commands.cc)
|
||||
-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
|
||||
+target_link_libraries(ceph-monstore-tool os global boost_program_options)
|
||||
install(TARGETS ceph-monstore-tool DESTINATION bin)
|
||||
|
||||
add_executable(ceph-objectstore-tool
|
||||
ceph_objectstore_tool.cc
|
||||
rebuild_mondb.cc
|
||||
RadosDump.cc)
|
||||
-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
|
||||
if(WITH_FUSE)
|
||||
target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
|
||||
endif(WITH_FUSE)
|
||||
@@ -1,70 +0,0 @@
|
||||
# /etc/conf.d/ceph: startup configurations for ceph
|
||||
|
||||
# default ceph conf file
|
||||
#ceph_conf="/etc/ceph/ceph.conf"
|
||||
|
||||
# Set ulimits for Ceph services.
|
||||
#rc_ulimit="-n 1048576 -u 1048576"
|
||||
|
||||
# the directory under /run to store runtime information in
|
||||
#rundir=/run/ceph
|
||||
|
||||
# the user and group to run ceph as
|
||||
#user="ceph"
|
||||
#group="ceph"
|
||||
|
||||
# tell openrc to use control groups to make sure everything gets killed
|
||||
# properly on stop. Highly reccommended to leave this enabled.
|
||||
rc_cgroup_cleanup=1
|
||||
|
||||
# settings for openrc supervisor for various ceph daemons
|
||||
#
|
||||
# defaults (can be overidden for each daemon)
|
||||
# stderr and stdout values get .${id}-std{out,err}.log appended
|
||||
# to the provided value
|
||||
#
|
||||
#respawn_delay=20
|
||||
#respawn_max=5
|
||||
#respawn_period=1800
|
||||
#stdout="/dev/null"
|
||||
#stderr="/dev/null"
|
||||
|
||||
# radosgw
|
||||
#radosgw_respawn_max
|
||||
#radosgw_respawn_delay=20
|
||||
#radosgw_respawn_period=1800
|
||||
#radosgw_stdout="/dev/null"
|
||||
#radosgw_stderr="/dev/null"
|
||||
|
||||
# mon
|
||||
#mon_respawn_max=5
|
||||
#mon_respawn_delay=20
|
||||
#mon_respawn_period=1800
|
||||
#mon_stdout="/dev/null"
|
||||
#mon_stderr="/dev/null"
|
||||
|
||||
# osd
|
||||
#osd_respawn_max=5
|
||||
#osd_respawn_delay=30
|
||||
#osd_respawn_period=1800
|
||||
#osd_stdout="/dev/null"
|
||||
#osd_stderr="/dev/null"
|
||||
|
||||
# mds
|
||||
#mds_respawn_max=5
|
||||
#mds_respawn_delay=20
|
||||
#mds_respawn_period=1800
|
||||
#mds_stdout="/dev/null"
|
||||
#mds_stderr="/dev/null"
|
||||
|
||||
# mgr
|
||||
#mgr_respawn_max=5
|
||||
#mgr_respawn_delay=20
|
||||
#mgr_respawn_period=1800
|
||||
#mgr_stdout="/dev/null"
|
||||
#mgr_stderr="/dev/null"
|
||||
|
||||
# initd stop timeout.
|
||||
#CEPH_TERMTIMEOUT="TERM/120/KILL/5"
|
||||
#
|
||||
# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet:
|
||||
@@ -1,115 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
|
||||
# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
|
||||
_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
|
||||
if [ -r "${_CONFD_FILE}" ]; then
|
||||
. "${_CONFD_FILE}" || exit 1
|
||||
fi
|
||||
|
||||
: "${ceph_conf:=/etc/ceph/ceph.conf}"
|
||||
daemon_type="${RC_SVCNAME#ceph-}"
|
||||
daemon_type="${daemon_type%%.*}"
|
||||
daemon_id="${RC_SVCNAME#ceph-*.}"
|
||||
daemon_id="${daemon_id:-0}"
|
||||
: "${rundir:=/run/ceph}"
|
||||
: "${user:=ceph}"
|
||||
: "${group:=ceph}"
|
||||
: "${rc_ulimit:=-n 1048576 -u 1048576}"
|
||||
|
||||
pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
|
||||
daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
|
||||
|
||||
command="/usr/bin/${RC_SVCNAME%%.*}"
|
||||
command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
|
||||
extra_commands="reload"
|
||||
command_args_foreground="--foreground"
|
||||
|
||||
retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
|
||||
start_stop_daemon_args="--user ${user} --group ${group}"
|
||||
supervise_daemon_args="--user ${user} --group ${group}"
|
||||
|
||||
: "${supervisor:=supervise-daemon}"
|
||||
: "${stdout:=/var/log/ceph/ceph}"
|
||||
: "${stderr:=/var/log/ceph/ceph}"
|
||||
: "${respawn_delay:=10}"
|
||||
: "${respawn_max:=5}"
|
||||
: "${respawn_period:=1800}"
|
||||
|
||||
: "${osd_respawn_delay:=15}"
|
||||
: "{osd_respawn_max:=10}"
|
||||
|
||||
: "{radosgw_respawn_max:=5}"
|
||||
: "${radosgw_respawn_period:=30}"
|
||||
|
||||
depend() {
|
||||
use dns logger
|
||||
after net ntpd ntp-client chronyd
|
||||
before netmount
|
||||
}
|
||||
|
||||
is_type_valid() {
|
||||
case ${daemon_type} in
|
||||
mon|mds|osd|mgr|radosgw) return 0;;
|
||||
*) return 1;;
|
||||
esac
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
local log_dir
|
||||
export CEPH_CONF="${ceph_conf}"
|
||||
|
||||
checkpath -d -q -o "${user}:${group}" "${rundir}"
|
||||
|
||||
if ! is_type_valid ;then
|
||||
eerror "Please give valid Ceph Server Type: mds, mon, osd"
|
||||
return 1
|
||||
|
||||
elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
|
||||
eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ -n "${bluestore_osd_fsid}" ]; then
|
||||
einfo "Mounting Bluestore"
|
||||
ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
|
||||
fi
|
||||
|
||||
if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
|
||||
command_args="${command_args} --name client.${daemon_id}"
|
||||
fi
|
||||
|
||||
local arg_name arg_val repl_arg_name
|
||||
for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
|
||||
eval arg_val="\${${daemon_type}_${arg_name}}"
|
||||
|
||||
if [ -z "${arg_val}" ]; then
|
||||
eval arg_val="\${${arg_name}}"
|
||||
else
|
||||
eval "${arg_name}=\"${arg_val}\""
|
||||
fi
|
||||
|
||||
if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
|
||||
local log_file log_postfix
|
||||
log_postfix=".${daemon_id}-${arg_name}.log"
|
||||
log_file="${arg_val}"
|
||||
|
||||
if [ "${log_file}" != /dev/null ]; then
|
||||
log_file="${log_file}${log_postfix}"
|
||||
|
||||
log_dir="$(dirname "${log_file}")"
|
||||
checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
|
||||
fi
|
||||
|
||||
repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
|
||||
supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
|
||||
start-stop-daemon --signal 1 "${start_stop_daemon_args}"
|
||||
eend ${?}
|
||||
}
|
||||
|
||||
# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
|
||||
@@ -1,97 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
|
||||
ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
|
||||
extra_commands="reload"
|
||||
daemon_type="${RC_SVCNAME#ceph-}"
|
||||
daemon_type="${daemon_type%%.*}"
|
||||
daemon_id="${RC_SVCNAME#ceph-*.}"
|
||||
daemon_id="${daemon_id:-0}"
|
||||
: ${rundir:=/run/ceph}
|
||||
: ${user:=ceph}
|
||||
: ${group:=ceph}
|
||||
: ${rc_ulimit:=-n 1048576 -u 1048576}
|
||||
|
||||
pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
|
||||
daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
|
||||
|
||||
command="/usr/bin/${RC_SVCNAME%%.*}"
|
||||
command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
|
||||
command_args_foreground="--foreground"
|
||||
|
||||
retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
|
||||
start_stop_daemon_args="--user ${user} --group ${group}"
|
||||
supervise_daemon_args="--user ${user} --group ${group}"
|
||||
|
||||
: ${supervisor:=supervise-daemon}
|
||||
: ${stdout:=/var/log/ceph/ceph}
|
||||
: ${stderr:=/var/log/ceph/ceph}
|
||||
: ${respawn_delay:=10}
|
||||
: ${respawn_max:=5}
|
||||
: ${respawn_period:=1800}
|
||||
|
||||
: ${osd_respawn_delay:=15}
|
||||
: ${osd_respawn_max:=10}
|
||||
|
||||
: ${radosgw_respawn_max:=5}
|
||||
: ${radosgw_respawn_period:=30}
|
||||
|
||||
depend() {
|
||||
use dns logger
|
||||
after net ntpd ntp-client chronyd
|
||||
before netmount
|
||||
}
|
||||
|
||||
is_type_valid() {
|
||||
case ${daemon_type} in
|
||||
mon|mds|osd|mgr|radosgw) return 0;;
|
||||
*) return 1;;
|
||||
esac
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
export CEPH_CONF="${ceph_conf}"
|
||||
|
||||
checkpath -d -q -o "${user}:${group}" "${rundir}"
|
||||
|
||||
if ! is_type_valid ;then
|
||||
eerror "Please give valid Ceph Server Type: mds, mon, osd"
|
||||
return 1
|
||||
|
||||
elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
|
||||
eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local arg_name arg_val
|
||||
for arg_name in std{out,err} respawn_{delay,max,period}; do
|
||||
eval arg_val="\${${daemon_type}_${arg_name}}"
|
||||
|
||||
if [ -z "${arg_val}" ]; then
|
||||
eval arg_val="\${${arg_name}}"
|
||||
else
|
||||
eval "${arg_name}=\"${arg_val}\""
|
||||
fi
|
||||
|
||||
if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
|
||||
local log_file log_postfix
|
||||
log_postfix=".${daemon_id}-${arg_name}.log"
|
||||
log_file="${arg_val}"
|
||||
|
||||
if [ "${log_file}" != /dev/null ]; then
|
||||
log_file="${log_file}${log_postfix}"
|
||||
fi
|
||||
|
||||
checkpath -m 0755 -o "${user}:${group}" -d $(dirname "${log_file}")
|
||||
|
||||
supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
|
||||
start-stop-daemon --signal 1 "${start_stop_daemon_args}"
|
||||
eend ${?}
|
||||
}
|
||||
|
||||
# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
|
||||
Reference in New Issue
Block a user