RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-15 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: building the beast frontend is no longer optional

Browse Source 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2021-05-11 10:01:20 -04:00
parent a335304042
commit bf33951219
4 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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)

3
src/include/config-h.in.cmake
View File

@ -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

26
src/rgw/CMakeLists.txt
View File

@ -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)

4
src/rgw/rgw_main.cc
View File

@ -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();