Merge pull request ceph#62325 from Matan-B/wip-matanb-with-crimson

src: sed -i 's/WITH_SEASTAR/WITH_CRIMSON/'

Reviewed-by: Samuel Just <[email protected]>
Reviewed-by: Yingxin Cheng <[email protected]>
Reviewed-by: Casey Bodley <[email protected]>

Author: Matan-B

CMakeLists.txt

@@ -705,8 +705,8 @@ if (WITH_SYSTEM_ROCKSDB)
   find_package(RocksDB 5.14 REQUIRED)
 endif()
 
-option(WITH_SEASTAR "Build seastar components")
-set(HAVE_SEASTAR ${WITH_SEASTAR})
+option(WITH_CRIMSON "Build seastar components")
+set(HAVE_SEASTAR ${WITH_CRIMSON})
 
 # Boost
 option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)
@@ -721,7 +721,7 @@ if(WITH_MGR)
   list(APPEND BOOST_COMPONENTS
     python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
 endif()
-if(WITH_SEASTAR)
+if(WITH_CRIMSON)
   list(APPEND BOOST_COMPONENTS timer)
 endif()
 

ceph.spec.in

@@ -91,7 +91,7 @@
 %bcond_with lua_packages
 %endif
 %endif
-%bcond_with seastar
+%bcond_with crimson
 %if 0%{?suse_version} || 0%{?openEuler}
 %bcond_with jaeger
 %else
@@ -150,7 +150,7 @@
 %{!?python3_pkgversion: %global python3_pkgversion 3}
 %{!?python3_version_nodots: %global python3_version_nodots 3}
 %{!?python3_version: %global python3_version 3}
-%if 0%{with seastar}
+%if 0%{with crimson}
 %{!?gts_version: %global gts_version 13}
 %else
 %if 0%{?rhel} == 8
@@ -325,7 +325,7 @@ BuildRequires:	xmlstarlet
 BuildRequires:	nasm
 BuildRequires:	lua-devel
 BuildRequires:  lmdb-devel
-%if 0%{with seastar} || 0%{with jaeger}
+%if 0%{with crimson} || 0%{with jaeger}
 BuildRequires:  yaml-cpp-devel >= 0.6
 %endif
 %if 0%{with amqp_endpoint}
@@ -387,7 +387,7 @@ BuildRequires:  utf8proc-devel
 BuildRequires:  qatlib-devel
 BuildRequires:  qatzip-devel
 %endif
-%if 0%{with seastar}
+%if 0%{with crimson}
 BuildRequires:  c-ares-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  hwloc-devel
@@ -514,7 +514,7 @@ BuildRequires:  redhat-rpm-config
 %if 0%{?openEuler}
 BuildRequires:  openEuler-rpm-config
 %endif
-%if 0%{with seastar}
+%if 0%{with crimson}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 BuildRequires:  cryptopp-devel
 %endif
@@ -943,7 +943,7 @@ Provides:	ceph-test:/usr/bin/ceph-osdomap-tool
 Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
 Requires:	sudo
 Requires:	libstoragemgmt
-%if 0%{with seastar}
+%if 0%{with crimson}
 Requires:	protobuf
 %endif
 %if 0%{?weak_deps}
@@ -954,7 +954,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.
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 %package crimson-osd
 Summary:	Ceph Object Storage Daemon (crimson)
 %if 0%{?suse_version}
@@ -1431,7 +1431,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 # seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk()
 export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
 # remove from CFLAGS too because it causes the arrow submodule to fail with:
@@ -1543,8 +1543,8 @@ cmake .. \
     -DWITH_SYSTEM_QATLIB:BOOL=ON \
     -DWITH_SYSTEM_QATZIP:BOOL=ON \
 %endif
-%if 0%{with seastar}
-    -DWITH_SEASTAR:BOOL=ON \
+%if 0%{with crimson}
+    -DWITH_CRIMSON:BOOL=ON \
     -DWITH_JAEGER:BOOL=OFF \
 %endif
     -DWITH_GRAFANA:BOOL=ON \
@@ -1591,7 +1591,7 @@ pushd %{_vpath_builddir}
 rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
 popd
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 # package crimson-osd with the name of ceph-osd
 install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd
 %endif
@@ -2364,7 +2364,7 @@ if [ $1 -ge 1 ] ; then
   fi
 fi
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 %files crimson-osd
 %{_bindir}/crimson-osd
 %endif
@@ -2614,7 +2614,7 @@ fi
 %{_bindir}/ceph-debugpack
 %{_bindir}/ceph-dedup-tool
 %{_bindir}/ceph-dedup-daemon
-%if 0%{with seastar}
+%if 0%{with crimson}
 %{_bindir}/crimson-store-nbd
 %endif
 %{_mandir}/man8/ceph-debugpack.8*

debian/rules

@@ -12,7 +12,7 @@ ifneq (,$(findstring WITH_STATIC_LIBSTDCXX,$(CEPH_EXTRA_CMAKE_ARGS)))
   # see http://tracker.ceph.com/issues/25209
   export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
 endif
-ifeq (,$(findstring WITH_SEASTAR,$(CEPH_EXTRA_CMAKE_ARGS)))
+ifeq (,$(findstring WITH_CRIMSON,$(CEPH_EXTRA_CMAKE_ARGS)))
   export CEPH_OSD_BASENAME = ceph-osd
 else
   export CEPH_OSD_BASENAME = crimson-osd

do_freebsd.sh

@@ -49,7 +49,7 @@ mkdir ${BUILD_DIR}
 	-D WITH_SYSTEM_NPM=ON \
 	-D WITH_LTTNG=OFF \
 	-D WITH_BABELTRACE=OFF \
-	-D WITH_SEASTAR=OFF \
+	-D WITH_CRIMSON=OFF \
 	-D WITH_FUSE=ON \
 	-D WITH_KRBD=OFF \
 	-D WITH_XFS=OFF \

doc/dev/crimson/crimson.rst

@@ -15,8 +15,8 @@ Building Crimson
 
 Crimson is not enabled by default. Enable it at build time by running::
 
-  $ WITH_SEASTAR=true ./install-deps.sh
-  $ ./do_cmake.sh -DWITH_SEASTAR=ON
+  $ WITH_CRIMSON=true ./install-deps.sh
+  $ ./do_cmake.sh -DWITH_CRIMSON=ON
 
 Please note, `ASan`_ is enabled by default if Crimson is built from a source
 cloned using ``git``.

etc/sysctl/CMakeLists.txt

@@ -4,7 +4,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(sysctl_pid_max "kernel.pid_max = 4194304")
 endif()
 
-if(WITH_SEASTAR)
+if(WITH_CRIMSON)
   configure_file(90-crimson-osd.conf.in
     ${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
     @ONLY)

install-deps.sh

@@ -32,15 +32,15 @@ ARCH=$(uname -m)
 
 
 function munge_ceph_spec_in {
-    local with_seastar=$1
+    local with_crimson=$1
     shift
     local for_make_check=$1
     shift
     local OUTFILE=$1
     sed -e 's/@//g' < ceph.spec.in > $OUTFILE
     # http://rpm.org/user_doc/conditional_builds.html
-    if $with_seastar; then
-        sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE
+    if $with_crimson; then
+        sed -i -e 's/%bcond_with crimson/%bcond_without crimson/g' $OUTFILE
     fi
     if $for_make_check; then
         sed -i -e 's/%bcond_with make_check/%bcond_without make_check/g' $OUTFILE
@@ -372,7 +372,7 @@ if [ x$(uname)x = xFreeBSDx ]; then
         sysutils/fusefs-libs \
     exit
 else
-    [ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false
+    [ $WITH_CRIMSON ] && with_crimson=true || with_crimson=false
     [ $WITH_PMEM ] && with_pmem=true || with_pmem=false
     source /etc/os-release
     case "$ID" in
@@ -435,15 +435,15 @@ else
         if $for_make_check; then
             build_profiles+=",pkg.ceph.check"
         fi
-        if $with_seastar; then
+        if $with_crimson; then
             build_profiles+=",pkg.ceph.crimson"
         fi
         if $with_pmem; then
             build_profiles+=",pkg.ceph.pmdk"
         fi
 
         ci_debug "for_make_check=$for_make_check"
-        ci_debug "with_seastar=$with_seastar"
+        ci_debug "with_crimson=$with_crimson"
         ci_debug "with_jaeger=$with_jaeger"
         ci_debug "build_profiles=$build_profiles"
         ci_debug "Now running 'mk-build-deps' and installing ceph-build-deps package"
@@ -502,7 +502,7 @@ else
         if [ "$INSTALL_EXTRA_PACKAGES" ]; then
             $SUDO dnf install -y $INSTALL_EXTRA_PACKAGES
         fi
-        munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec
+        munge_ceph_spec_in $with_crimson $for_make_check $DIR/ceph.spec
         # for python3_pkgversion macro defined by python-srpm-macros, which is required by python3-devel
         $SUDO dnf install -y python3-devel
         $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
@@ -520,7 +520,7 @@ else
         if [ "$INSTALL_EXTRA_PACKAGES" ]; then
             $SUDO $zypp_install $INSTALL_EXTRA_PACKAGES
         fi
-        munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec
+        munge_ceph_spec_in $with_crimson $for_make_check $DIR/ceph.spec
         $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
         ;;
     *)

src/CMakeLists.txt

@@ -391,7 +391,7 @@ set_target_properties(Boost::MPL PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS
     "BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_LIST_SIZE=30")
 
-if(WITH_SEASTAR)
+if(WITH_CRIMSON)
   find_package(c-ares 1.13.0 QUIET)
   if(NOT c-ares_FOUND)
     message(STATUS "Could not find c-ares, will build it")

src/auth/AuthSessionHandler.cc

@@ -31,7 +31,7 @@ AuthSessionHandler *get_auth_session_handler(
 {
 
   // Should add code to only print the SHA1 hash of the key, unless in secure debugging mode
-#ifndef WITH_SEASTAR
+#ifndef WITH_CRIMSON
   ldout(cct,10) << "In get_auth_session_handler for protocol " << protocol << dendl;
 #endif
   switch (protocol) {

src/auth/cephx/CephxProtocol.cc

@@ -526,7 +526,7 @@ bool cephx_verify_authorizer(CephContext *cct, const KeyStore& keys,
     // generate a connection secret
     connection_secret->resize(connection_secret_required_len);
     if (connection_secret_required_len) {
-#ifdef WITH_SEASTAR
+#ifdef WITH_CRIMSON
       std::random_device rd;
       std::generate_n(connection_secret->data(),
 		      connection_secret_required_len,