commit: a3443322e8e9bc414b4a128118d8ae8f5c985338 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 09:59:19 2025 +0000 Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 10:01:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3443322
sys-cluster/ceph: Fix ipv6 issues Closes: https://bugs.gentoo.org/956966 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org> sys-cluster/ceph/ceph-19.2.2-r4.ebuild | 532 ++++++++++++++++++++++++++ sys-cluster/ceph/files/ceph-19.2.2-ipv6.patch | 273 +++++++++++++ 2 files changed, 805 insertions(+) diff --git a/sys-cluster/ceph/ceph-19.2.2-r4.ebuild b/sys-cluster/ceph/ceph-19.2.2-r4.ebuild new file mode 100644 index 000000000000..27ebfe4f3618 --- /dev/null +++ b/sys-cluster/ceph/ceph-19.2.2-r4.ebuild @@ -0,0 +1,532 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +LUA_COMPAT=( lua5-{3..4} ) + +inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ + python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles + +XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2" + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="https://ceph.com/"; + +SRC_URI=" + https://download.ceph.com/tarballs/${P}.tar.gz + parquet? ( https://github.com/xtensor-stack/xsimd/archive/${XSIMD_HASH}.tar.gz -> ceph-xsimd-${PV}.tar.gz + mirror://apache/arrow/arrow-17.0.0/apache-arrow-17.0.0.tar.gz ) +" + +LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain" +SLOT="0" +KEYWORDS="amd64 ~arm64 ppc64" + +CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3) + +IUSE=" + babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana + jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq + +radosgw rbd-rwl rbd-ssd rdma rgw-lua selinux +ssl spdk +sqlite +system-boost + systemd +tcmalloc test +uring xfs zbd +" + +IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +DEPEND=" + ${LUA_DEPS} + ${PYTHON_DEPS} + acct-group/ceph + acct-user/ceph + virtual/libudev:= + app-arch/bzip2:= + app-arch/lz4:= + app-arch/snappy:= + >=app-arch/snappy-1.1.9-r1 + app-arch/zstd:= + app-shells/bash:0 + app-misc/jq:= + dev-cpp/gflags:= + dev-db/lmdb:= + dev-lang/jsonnet:= + dev-libs/libaio:= + dev-libs/libnl:3= + dev-libs/libxml2:= + dev-libs/libevent:= + dev-libs/libutf8proc:= + dev-libs/nss:= + dev-libs/openssl:= + <dev-libs/rocksdb-7.9.3:= + dev-libs/thrift:= + dev-libs/xmlsec:=[openssl] + dev-cpp/yaml-cpp:= + dev-python/natsort[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-vcs/git + net-dns/c-ares:= + net-libs/gnutls:= + sys-auth/oath-toolkit:= + sys-apps/coreutils + sys-apps/hwloc:= + sys-apps/keyutils:= + sys-apps/util-linux:= + sys-libs/libcap-ng:= + sys-libs/ncurses:0= + sys-libs/zlib:= + sys-process/numactl:= + virtual/libcrypt:= + x11-libs/libpciaccess:= + babeltrace? ( dev-util/babeltrace:0/1 ) + fuse? ( sys-fs/fuse:3= ) + jemalloc? ( dev-libs/jemalloc:= ) + !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) + jaeger? ( + dev-cpp/nlohmann_json:= + <dev-cpp/opentelemetry-cpp-1.10.0:=[jaeger] + ) + kafka? ( dev-libs/librdkafka:= ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + lttng? ( dev-util/lttng-ust:= ) + parquet? ( + >=app-arch/lz4-1.10 + dev-cpp/xsimd + dev-libs/re2:= + ) + pmdk? ( + >=dev-libs/pmdk-1.10.0:= + sys-block/ndctl:= + ) + rabbitmq? ( net-libs/rabbitmq-c:= ) + radosgw? ( + dev-libs/icu:= + dev-libs/expat:= + net-misc/curl:=[curl_ssl_openssl] + ) + rbd-rwl? ( dev-libs/pmdk:= ) + rdma? ( sys-cluster/rdma-core:= ) + spdk? ( dev-util/cunit ) + sqlite? ( dev-db/sqlite:= ) + system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] ) + uring? ( sys-libs/liburing:= ) + xfs? ( sys-fs/xfsprogs:= ) + zbd? ( sys-block/libzbd:= ) +" +BDEPEND=" + amd64? ( dev-lang/nasm ) + x86? ( dev-lang/yasm ) + app-alternatives/cpio + dev-debug/valgrind + >=dev-build/cmake-3.5.0 + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/sphinx + dev-util/gperf + dev-util/ragel + sys-apps/coreutils + sys-apps/grep + sys-apps/util-linux + sys-apps/which + app-alternatives/bc + sys-devel/patch + virtual/pkgconfig + jaeger? ( + app-alternatives/yacc + app-alternatives/lex + ) + test? ( + dev-util/cunit + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + sys-apps/grep[pcre] + sys-fs/btrfs-progs + ) +" +RDEPEND=" + ${DEPEND} + app-admin/sudo + net-misc/socat + sys-apps/gptfdisk + sys-apps/nvme-cli + >=sys-apps/smartmontools-7.0 + sys-block/parted + sys-fs/cryptsetup + sys-fs/lsscsi + sys-fs/lvm2[lvm] + app-alternatives/awk + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] + dev-python/pecan[${PYTHON_USEDEP}] + dev-python/prettytable[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/werkzeug[${PYTHON_USEDEP}] + mgr? ( + dev-python/jsonpatch[${PYTHON_USEDEP}] + dev-python/more-itertools[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pyjwt[${PYTHON_USEDEP}] + dev-python/routes[${PYTHON_USEDEP}] + diskprediction? ( + >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] + ) + dev-python/scikit-learn[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ) + selinux? ( sec-policy/selinux-ceph ) +" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ${LUA_REQUIRED_USE} + ?? ( jemalloc tcmalloc ) + diskprediction? ( mgr ) + kafka? ( radosgw ) + mgr? ( cephfs ) + rabbitmq? ( radosgw ) + rgw-lua? ( radosgw ) +" + +RESTRICT=" + !test? ( test ) +" + +# tests need root access, and network access +RESTRICT+="test" + +# false positives unless all USE flags are on +CMAKE_WARN_UNUSED_CLI=no + +PATCHES=( + "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" + "${FILESDIR}/ceph-14.2.0-cflags.patch" + "${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch" + "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" + "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" + "${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch" + "${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch" + "${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch" + "${FILESDIR}/ceph-17.2.0-pybind-boost-1.74.patch" + "${FILESDIR}/ceph-17.2.0-findre2.patch" + "${FILESDIR}/ceph-18.2.0-system-opentelemetry.patch" + "${FILESDIR}/ceph-17.2.0-osd_class_dir.patch" + "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" + "${FILESDIR}/ceph-17.2.3-flags.patch" + # https://bugs.gentoo.org/866165 + "${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" + "${FILESDIR}/ceph-17.2.5-gcc13-deux.patch" + # https://bugs.gentoo.org/905626 + "${FILESDIR}/ceph-17.2.6-arrow-flatbuffers-c++14.patch" + # https://bugs.gentoo.org/868891 + "${FILESDIR}/ceph-17.2.6-cmake.patch" + "${FILESDIR}/ceph-18.2.0-cyclic-deps.patch" + # https://bugs.gentoo.org/907739 + "${FILESDIR}/ceph-18.2.0-cython3.patch" + # https://bugs.gentoo.org/936889 + "${FILESDIR}/ceph-18.2.4-liburing.patch" + "${FILESDIR}/ceph-18.2.4-spdk.patch" + # https://bugs.gentoo.org/941069 + "${FILESDIR}/ceph-19.2.0-importlib.patch" + "${FILESDIR}/ceph-19.2.1-uuid.patch" + "${FILESDIR}/ceph-19.2.1-graylog.patch" + "${FILESDIR}/ceph-19.2.1-librbd.patch" + "${FILESDIR}/ceph-19.2.1-rgw.patch" + "${FILESDIR}/ceph-19.2.1-immutableobjectcache.patch" + "${FILESDIR}/ceph-19.2.1-mgr.patch" + "${FILESDIR}/ceph-19.2.1-exporter.patch" + "${FILESDIR}/ceph-19.2.1-isa-l.patch" + "${FILESDIR}/ceph-19.2.1-quiet-stringop-truncation.patch" + "${FILESDIR}/ceph-19.2.2-py313-1.patch" + "${FILESDIR}/ceph-19.2.2-py313-2.patch" + "${FILESDIR}/ceph-19.2.2-py313-3.patch" + "${FILESDIR}/ceph-19.2.2-gcc15.patch" + "${FILESDIR}/ceph-19.2.2-ipv6.patch" +) + +check-reqs_export_vars() { + CHECKREQS_DISK_BUILD="6G" + + if use system-boost; then + CHECKREQS_DISK_USR="350M" + else + CHECKREQS_DISK_USR="510M" + fi + + export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR +} + +pkg_pretend() { + check-reqs_export_vars + check-reqs_pkg_pretend +} + +pkg_setup() { + python_setup + lua_setup + check-reqs_export_vars + check-reqs_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + if use system-boost; then + if has_version '>=dev-libs/boost-1.88'; then + eapply "${FILESDIR}/ceph-19.2.2-boost188.patch" + eapply "${FILESDIR}/ceph-19.2.2-boost-linking.patch" + fi + find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ + | xargs --null sed -r \ + -e 's|Boost::|boost_|g' \ + -e 's|Boost_|boost_|g' \ + -e 's|[Bb]oost_boost|boost_system|g' \ + -i || die + fi + + if ! use systemd; then + find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \ + | xargs --null sed \ + -e '/^from ceph_volume.systemd import systemctl/ d' \ + -i || die + fi + + sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ + -i src/bash_completion/CMakeLists.txt || die + + sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die + + # force lua version to use selected version + local lua_version + lua_version=$(ver_cut 1-2 $(lua_get_version)) + sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \ + -i src/CMakeLists.txt + + if use spdk; then + # https://bugs.gentoo.org/871942 + sed -i 's/[#]ifndef HAVE_ARC4RANDOM/#if 0/' src/spdk/lib/iscsi/iscsi.c || die + # unittests fail to build (??!?) + sed -i -e 's/CONFIG_UNIT_TESTS=y/CONFIG_UNIT_TESTS=n/' src/spdk/CONFIG || die + fi + + # remove tests that need root access + rm src/test/cli/ceph-authtool/cap*.t || die + + if use parquet; then + # hammer in newer version of parquet/arrow + rm -rf src/arrow/ + mv "${WORKDIR}/apache-arrow-17.0.0" src/arrow || die + fi + + # newer boost don't support no header-only + sed -i -e 's~#include <boost/url/src.hpp>~#include <boost/url.hpp>~' src/mds/BoostUrlImpl.cc || die + + # everyone forgot to link to boost_url + sed -i -e 's~target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common~target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common boost_url~' src/CMakeLists.txt || die + sed -i -e 's/target_link_libraries(journal cls_journal_client)/target_link_libraries(journal cls_journal_client boost_url)/' src/journal/CMakeLists.txt || die + sed -i -e 's/${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})/${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} boost_url)/g' src/tools/cephfs/CMakeLists.txt || die +} + +ceph_src_configure() { + local mycmakeargs=( + # Don't break installed bundled libraries (bug #942680) + -DBUILD_SHARED_LIBS=OFF + -DWITH_BABELTRACE:BOOL=$(usex babeltrace) + -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) + -DWITH_CEPHFS:BOOL=$(usex cephfs) + -DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs) + -DWITH_DPDK:BOOL=$(usex dpdk) + -DWITH_SPDK:BOOL=$(usex spdk) + -DWITH_FUSE:BOOL=$(usex fuse) + -DWITH_LTTNG:BOOL=$(usex lttng) + -DWITH_GSSAPI:BOOL=$(usex kerberos) + -DWITH_GRAFANA:BOOL=$(usex grafana) + -DWITH_MGR:BOOL=$(usex mgr) + -DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF + -DWITH_OPENLDAP:BOOL=$(usex ldap) + -DWITH_PYTHON3:STRING=3 + -DWITH_RADOSGW:BOOL=$(usex radosgw) + -DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq) + -DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka) + -DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO") + -DWITH_RBD_RWL:BOOL=$(usex rbd-rwl) + -DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd) + -DWITH_SYSTEMD:BOOL=$(usex systemd) + -DWITH_TESTS:BOOL=$(usex test) + -DWITH_LIBURING:BOOL=$(usex uring) + -DWITH_SYSTEM_LIBURING:BOOL=$(usex uring) + -DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite) + -DWITH_XFS:BOOL=$(usex xfs) + -DWITH_ZBD:BOOL=$(usex zbd) + -DENABLE_SHARED:BOOL=ON + -DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") + -DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl '')") + -DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost) + -DWITH_SYSTEM_ROCKSDB:BOOL=ON + -DWITH_SYSTEM_ZSTD:BOOL=ON + -DWITH_RDMA:BOOL=$(usex rdma) + -DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}" + -DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc" + # use the bundled libfmt for now since they seem to constantly break their API + -DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON + -Wno-dev + -DCEPHADM_BUNDLED_DEPENDENCIES=none + ) + + # this breaks when re-configuring for python impl + if [[ ${EBUILD_PHASE} == configure ]]; then + mycmakeargs+=( + -DWITH_JAEGER:BOOL=$(usex jaeger) + -DWITH_RADOSGW_SELECT_PARQUET:BOOL=$(usex parquet) + ) + else + mycmakeargs+=( + -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF + -DWITH_JAEGER:BOOL=OFF + # don't want to warn about unused CLI when reconfiguring for python + -DCMAKE_WARN_UNUSED_CLI:BOOL=OFF + ) + fi + + # conditionally used cmake args + use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) ) + use systemd && mycmakeargs+=( -DSYSTEMD_SYSTEM_UNIT_DIR:PATH=$(systemd_get_systemunitdir) ) + + if use amd64 || use x86; then + local flag + for flag in "${CPU_FLAGS_X86[@]}"; do + case "${flag}" in + avx*) + local var=${flag%f} + mycmakeargs+=( + "-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})" + ) + ;; + *) mycmakeargs+=( + "-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})" + );; + esac + done + fi + + # needed for >=glibc-2.32 + has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON ) + + rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ + || die "failed to remove cmake cache" + + # hopefully this will not be necessary in the next release + use parquet && export ARROW_XSIMD_URL="file:///${DISTDIR}/ceph-xsimd-${PV}.tar.gz" + + # https://bugs.gentoo.org/927066 + filter-lto + + cmake_src_configure + + # bug #630232 + sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ + "${BUILD_DIR:-${S}}"/include/acconfig.h \ + || die "sed failed" +} + +src_configure() { + use custom-cflags || strip-flags + ceph_src_configure +} + +src_compile() { + cmake_build all + + # we have to do this here to prevent from building everything multiple times + python_copy_sources + python_foreach_impl python_compile +} + +python_compile() { + local CMAKE_USE_DIR="${S}" + ceph_src_configure + + cmake_build src/pybind/CMakeFiles/cython_modules + cmake_build cephadm +} + +src_install() { + python_foreach_impl python_install + + python_setup + cmake_src_install + + python_optimize + + find "${ED}" -name '*.la' -type f -delete || die + + exeinto /usr/$(get_libdir)/ceph + newexe "${BUILD_DIR}/bin/init-ceph" init-ceph + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} + + keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console + + fowners -R ceph:ceph /var/log/ceph + + newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap + newinitd "${FILESDIR}/${PN}.initd-r14" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} + + insinto /etc/sudoers.d + doins sudoers.d/* + + insinto /etc/sysctl.d + newins "${FILESDIR}"/sysctld 90-${PN}.conf + + use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc + + # units aren't installed by the build system unless systemd is enabled + # so no point installing these with the USE flag disabled + if use systemd; then + systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "[email protected]" + systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "[email protected]" + fi + + udev_dorules udev/*.rules + newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf + + readme.gentoo_create_doc + + # bug #630232 + sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ + || die "sed failed" + + python_fix_shebang "${ED}"/usr/{,s}bin/ + + # python_fix_shebang apparently is not idempotent + local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' + grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ + | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die + + local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${ED}}" +} + +python_install() { + local CMAKE_USE_DIR="${S}" + DESTDIR="${ED}" cmake_build src/pybind/install + DESTDIR="${ED}" cmake_build src/cephadm/install + + python_optimize +} + +pkg_postinst() { + readme.gentoo_print_elog + tmpfiles_process ${PN}.conf + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sys-cluster/ceph/files/ceph-19.2.2-ipv6.patch b/sys-cluster/ceph/files/ceph-19.2.2-ipv6.patch new file mode 100644 index 000000000000..881161f7dfd5 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-19.2.2-ipv6.patch @@ -0,0 +1,273 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nitzan Mordechai <[email protected]> +Date: Thu, 28 Nov 2024 11:44:00 +0000 +Subject: [PATCH] common/pick_address: Add IPv6 support to is_addr_in_subnet + +Updated the is_addr_in_subnet function to work with both +IPv4 and IPv6 addresses. Previously, it only supported IPv4, +which caused failures when IPv6 addresses were passed in. + +Changes: + - Use inet_pton to detect IPv4 (AF_INET) or IPv6 (AF_INET6). + - Added sockaddr_in6 for IPv6 handling while keeping sockaddr_in for IPv4. + - Adjust the family and ifa_addr dynamically based on the address type. + +Fixes: https://tracker.ceph.com/issues/67517 +Signed-off-by: Nitzan Mordechai <[email protected]> +(cherry picked from commit d68857c1e57e93a68d9301b3beff7e652f327a9e) +Signed-off-by: Thomas Lamprecht <[email protected]> +--- + src/common/pick_address.cc | 29 +++++-- + src/common/pick_address.h | 2 +- + src/osd/OSDMap.cc | 6 +- + src/test/test_ipaddr.cc | 155 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 179 insertions(+), 13 deletions(-) + +diff --git a/src/common/pick_address.cc b/src/common/pick_address.cc +index aa6b765bc56..d7c52ea6c71 100644 +--- a/src/common/pick_address.cc ++++ b/src/common/pick_address.cc +@@ -640,17 +640,24 @@ int get_iface_numa_node( + bool is_addr_in_subnet( + CephContext *cct, + const std::string &networks, +- const std::string &addr) ++ const entity_addr_t &addr) + { + const auto nets = get_str_list(networks); + ceph_assert(!nets.empty()); +- + unsigned ipv = CEPH_PICK_ADDRESS_IPV4; +- struct sockaddr_in public_addr; +- public_addr.sin_family = AF_INET; +- +- if(inet_pton(AF_INET, addr.c_str(), &public_addr.sin_addr) != 1) { +- lderr(cct) << "unable to convert chosen address to string: " << addr << dendl; ++ struct sockaddr_in6 public_addr6; ++ struct sockaddr_in public_addr4; ++ ++ if (addr.is_ipv4() && ++ inet_pton(AF_INET, addr.ip_only_to_str().c_str(), &public_addr4.sin_addr) == 1) { ++ public_addr4.sin_family = AF_INET; ++ } else if (addr.is_ipv6() && ++ inet_pton(AF_INET6, addr.ip_only_to_str().c_str(), &public_addr6.sin6_addr) == 1) { ++ public_addr6.sin6_family = AF_INET6; ++ ipv = CEPH_PICK_ADDRESS_IPV6; ++ } else { ++ std::string_view addr_type = addr.is_ipv4() ? "IPv4" : "IPv6"; ++ lderr(cct) << "IP address " << addr << " is not parseable as " << addr_type << dendl; + return false; + } + +@@ -658,10 +665,16 @@ bool is_addr_in_subnet( + struct ifaddrs ifa; + memset(&ifa, 0, sizeof(ifa)); + ifa.ifa_next = nullptr; +- ifa.ifa_addr = (struct sockaddr*)&public_addr; ++ if (addr.is_ipv4()) { ++ ifa.ifa_addr = (struct sockaddr*)&public_addr4; ++ } else if (addr.is_ipv6()) { ++ ifa.ifa_addr = (struct sockaddr*)&public_addr6; ++ } ++ + if(matches_with_net(cct, ifa, net, ipv)) { + return true; + } + } ++ lderr(cct) << "address " << addr << " is not in networks '" << networks << "'" << dendl; + return false; + } +diff --git a/src/common/pick_address.h b/src/common/pick_address.h +index 40575d7d155..c28a6037ded 100644 +--- a/src/common/pick_address.h ++++ b/src/common/pick_address.h +@@ -98,6 +98,6 @@ int get_iface_numa_node( + bool is_addr_in_subnet( + CephContext *cct, + const std::string &networks, +- const std::string &addr); ++ const entity_addr_t &addr); + + #endif +diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc +index d58a8cbb863..f59543f9579 100644 +--- a/src/osd/OSDMap.cc ++++ b/src/osd/OSDMap.cc +@@ -1642,12 +1642,10 @@ void OSDMap::get_out_of_subnet_osd_counts(CephContext *cct, + for (int i = 0; i < max_osd; i++) { + if (exists(i) && is_up(i)) { + if (const auto& addrs = get_addrs(i).v; addrs.size() >= 2) { +- auto v1_addr = addrs[0].ip_only_to_str(); +- if (!is_addr_in_subnet(cct, public_network, v1_addr)) { ++ if (!is_addr_in_subnet(cct, public_network, addrs[0])) { + unreachable->emplace(i); + } +- auto v2_addr = addrs[1].ip_only_to_str(); +- if (!is_addr_in_subnet(cct, public_network, v2_addr)) { ++ if (!is_addr_in_subnet(cct, public_network, addrs[1])) { + unreachable->emplace(i); + } + } +diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc +index bc8dbef70d7..30e7254de76 100644 +--- a/src/test/test_ipaddr.cc ++++ b/src/test/test_ipaddr.cc +@@ -995,3 +995,158 @@ TEST(pick_address, ipv4_ipv6_enabled2) + ASSERT_EQ(-1, r); + } + } ++ ++// Test for IPv4 address ++TEST(is_addr_in_subnet, ipv4) ++{ ++ std::string public_network = "10.1.1.0/24"; ++ entity_addr_t addr; ++ addr.parse("10.1.1.2", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv4", "true"); ++ cct->_conf.set_val("ms_bind_ipv6", "false"); ++ ++ bool r = is_addr_in_subnet(cct.get(), public_network, addr); ++ ASSERT_EQ(true, r); ++} ++ ++// Test for IPv6 address ++TEST(is_addr_in_subnet, ipv6) ++{ ++ std::string public_network = "2001:db8::/64"; ++ entity_addr_t addr; ++ addr.parse("2001:db8::1", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv6", "true"); ++ cct->_conf.set_val("ms_bind_ipv4", "false"); ++ ++ bool r = is_addr_in_subnet(cct.get(), public_network, addr); ++ ASSERT_EQ(true, r); ++} ++ ++// Test for invalid address ++TEST(is_addr_in_subnet, invalid_address) ++{ ++ std::string public_network = "10.1.1.0/24"; ++ entity_addr_t addr; ++ addr.parse("192.168.1.1", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv4", "true"); ++ cct->_conf.set_val("ms_bind_ipv6", "false"); ++ ++ bool r = is_addr_in_subnet(cct.get(), public_network, addr); ++ ASSERT_EQ(false, r); ++} ++ ++// Test for malformed address ++TEST(is_addr_in_subnet, malformed_address) ++{ ++ std::string public_network = "10.1.1.0/24"; ++ entity_addr_t addr; ++ addr.parse("invalid_address", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv4", "true"); ++ cct->_conf.set_val("ms_bind_ipv6", "false"); ++ ++ // Test with a malformed address ++ bool r = is_addr_in_subnet(cct.get(), public_network, addr); ++ ASSERT_EQ(false, r); ++} ++ ++TEST(is_addr_in_subnet, boundary_ipv4) ++{ ++ std::string public_network = "10.1.1.0/24"; ++ entity_addr_t addr_low; ++ addr_low.parse("10.1.1.0", nullptr); ++ entity_addr_t addr_high; ++ addr_high.parse("10.1.1.255", nullptr); ++ entity_addr_t addr_out; ++ addr_out.parse("10.1.2.0", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv4", "true"); ++ cct->_conf.set_val("ms_bind_ipv6", "false"); ++ ++ ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_low)); ++ ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_high)); ++ ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network, addr_out)); ++} ++ ++TEST(is_addr_in_subnet, boundary_ipv6) ++{ ++ std::string public_network = "2001:db8::/64"; ++ entity_addr_t addr_low; ++ addr_low.parse("2001:db8::", nullptr); ++ entity_addr_t addr_high; ++ addr_high.parse("2001:db8:0:0:ffff:ffff:ffff:ffff", nullptr); ++ entity_addr_t addr_out; ++ addr_out.parse("2001:db9::", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv6", "true"); ++ cct->_conf.set_val("ms_bind_ipv4", "false"); ++ ++ ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_low)); ++ ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network, addr_high)); ++ ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network, addr_out)); ++} ++ ++TEST(is_addr_in_subnet, overlapping_subnets) ++{ ++ std::string public_network_1 = "10.1.1.0/24"; ++ std::string public_network_2 = "10.1.2.0/24"; ++ entity_addr_t addr; ++ addr.parse("10.1.1.5", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv4", "true"); ++ cct->_conf.set_val("ms_bind_ipv6", "false"); ++ ++ ASSERT_TRUE(is_addr_in_subnet(cct.get(), public_network_1, addr)); ++ ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_2, addr)); ++} ++ ++TEST(is_addr_in_subnet, mismatched_family) ++{ ++ std::string public_network_1 = "2001:db8::/64"; ++ entity_addr_t addr_1; ++ addr_1.parse("10.1.1.5", nullptr); ++ ++ std::string public_network_2 = "10.1.1.0/24"; ++ entity_addr_t addr_2; ++ addr_2.parse("2001:db8::1", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ cct->_conf.set_val("ms_bind_ipv4", "true"); ++ cct->_conf.set_val("ms_bind_ipv6", "true"); ++ ++ ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_1, addr_1)); ++ ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_2, addr_2)); ++} ++ ++TEST(is_addr_in_subnet, invalid_subnets) ++{ ++ std::string public_network_1 = "10.1.1.0/33"; ++ std::string public_network_2 = "25.0.0.99/10"; ++ entity_addr_t addr; ++ addr.parse("10.1.1.2", nullptr); ++ ++ boost::intrusive_ptr<CephContext> cct(new CephContext(CEPH_ENTITY_TYPE_OSD), false); ++ cct->_conf._clear_safe_to_start_threads(); ++ ++ ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_1, addr)); // Invalid prefix ++ ASSERT_FALSE(is_addr_in_subnet(cct.get(), public_network_2, addr)); // Invalid subnet string ++} ++
