From bf33951219e42271469f64e8cffa68d9628ef826 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 11 May 2021 10:01:20 -0400
Subject: [PATCH] rgw: building the beast frontend is no longer optional

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---
 CMakeLists.txt                |  1 -
 src/include/config-h.in.cmake |  3 ---
 src/rgw/CMakeLists.txt        | 26 +++++++++-----------------
 src/rgw/rgw_main.cc           |  4 ----
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fcd55b6d84c3..65ef01f9ac477 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -409,7 +409,6 @@ endif()
 
 #option for RGW
 option(WITH_RADOSGW "Rados Gateway is enabled" ON)
-option(WITH_RADOSGW_BEAST_FRONTEND "Rados Gateway's Beast frontend is enabled" ON)
 option(WITH_RADOSGW_BEAST_OPENSSL "Rados Gateway's Beast frontend uses OpenSSL" ON)
 option(WITH_RADOSGW_AMQP_ENDPOINT "Rados Gateway's pubsub support for AMQP push endpoint" ON)
 option(WITH_RADOSGW_KAFKA_ENDPOINT "Rados Gateway's pubsub support for Kafka push endpoint" ON)
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 22a70a8eb8516..a1d89447356d1 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -160,9 +160,6 @@
 /* define if leveldb is enabled */
 #cmakedefine WITH_LEVELDB
 
-/* define if radosgw's beast frontend enabled */
-#cmakedefine WITH_RADOSGW_BEAST_FRONTEND
-
 /* define if radosgw has openssl support */
 #cmakedefine WITH_CURL_OPENSSL
 
diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index ae5111aa6c351..a5c556611d308 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -286,21 +286,16 @@ endif()
 
 set(rgw_schedulers_srcs
   rgw_dmclock_scheduler_ctx.cc
-  rgw_dmclock_sync_scheduler.cc)
+  rgw_dmclock_sync_scheduler.cc
+  rgw_dmclock_async_scheduler.cc)
 set(radosgw_srcs
-  rgw_loadgen_process.cc)
-
-if(WITH_RADOSGW_BEAST_FRONTEND)
-  list(APPEND radosgw_srcs
-    rgw_asio_client.cc
-    rgw_asio_frontend.cc)
-  list(APPEND rgw_schedulers_srcs
-    rgw_dmclock_async_scheduler.cc)
-endif()
+  rgw_loadgen_process.cc
+  rgw_asio_client.cc
+  rgw_asio_frontend.cc)
 
 add_library(rgw_schedulers STATIC ${rgw_schedulers_srcs})
 target_link_libraries(rgw_schedulers
-  PUBLIC dmclock::dmclock)
+  PUBLIC dmclock::dmclock spawn)
 
 add_library(radosgw SHARED ${radosgw_srcs} ${rgw_a_srcs} rgw_main.cc
   $<TARGET_OBJECTS:rgw_kmip>)
@@ -313,12 +308,9 @@ target_link_libraries(radosgw
   PRIVATE ${rgw_libs} rgw_schedulers kmip
   PUBLIC dmclock::dmclock
 )
-if(WITH_RADOSGW_BEAST_FRONTEND)
-  target_link_libraries(rgw_schedulers PUBLIC spawn)
-  if(WITH_RADOSGW_BEAST_OPENSSL)
-    # used by rgw_asio_frontend.cc
-    target_link_libraries(radosgw PRIVATE OpenSSL::SSL)
-  endif()
+if(WITH_RADOSGW_BEAST_OPENSSL)
+  # used by rgw_asio_frontend.cc
+  target_link_libraries(radosgw PRIVATE OpenSSL::SSL)
 endif()
 set_target_properties(radosgw PROPERTIES OUTPUT_NAME radosgw VERSION 2.0.0
   SOVERSION 2)
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 3e2c2e8618a50..0e3c4973cafc0 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -48,9 +48,7 @@
 #ifdef WITH_RADOSGW_KAFKA_ENDPOINT
 #include "rgw_kafka.h"
 #endif
-#if defined(WITH_RADOSGW_BEAST_FRONTEND)
 #include "rgw_asio_frontend.h"
-#endif /* WITH_RADOSGW_BEAST_FRONTEND */
 #include "rgw_dmclock_scheduler_ctx.h"
 #ifdef WITH_RADOSGW_LUA_PACKAGES
 #include "rgw_lua.h"
@@ -562,7 +560,6 @@ int radosgw_Main(int argc, const char **argv)
 
       fe = new RGWLoadGenFrontend(env, config);
     }
-#if defined(WITH_RADOSGW_BEAST_FRONTEND)
     else if (framework == "beast") {
       int port;
       config->get_val("port", 80, &port);
@@ -571,7 +568,6 @@ int radosgw_Main(int argc, const char **argv)
       RGWProcessEnv env{ store, &rest, olog, port, uri_prefix, auth_registry };
       fe = new RGWAsioFrontend(env, config, sched_ctx);
     }
-#endif /* WITH_RADOSGW_BEAST_FRONTEND */
 
     service_map_meta["frontend_type#" + stringify(fe_count)] = framework;
     service_map_meta["frontend_config#" + stringify(fe_count)] = config->get_config();