From 8203e42181bfc6c674f14e3c811bb01a1de5ea0e Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 12 Sep 2018 09:21:28 -0400 Subject: [PATCH] rgw: remove dependencies on cls_statelog Signed-off-by: Casey Bodley --- src/rgw/CMakeLists.txt | 14 ++++++-------- src/rgw/rgw_rados.cc | 3 --- src/rgw/rgw_rados.h | 1 - src/test/rgw/CMakeLists.txt | 4 ---- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 0e5d9199266fa..d4e6100b01034 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -161,7 +161,7 @@ add_dependencies(rgw_a civetweb_h) target_include_directories(rgw_a SYSTEM PUBLIC "../rapidjson/include") target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_client cls_refcount_client - cls_log_client cls_statelog_client cls_timeindex_client cls_version_client + cls_log_client cls_timeindex_client cls_version_client cls_user_client ceph-common common_utf8 global ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} @@ -200,14 +200,14 @@ target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES}) add_executable(radosgw rgw_main.cc) target_link_libraries(radosgw radosgw_a librados cls_rgw_client cls_otp_client cls_lock_client cls_refcount_client - cls_log_client cls_statelog_client cls_timeindex_client + cls_log_client cls_timeindex_client cls_version_client cls_user_client global ${FCGI_LIBRARY} ${LIB_RESOLV} ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${BLKID_LIBRARIES} ${ALLOC_LIBS}) # radosgw depends on cls libraries at runtime, but not as link dependencies add_dependencies(radosgw cls_rgw cls_lock cls_refcount - cls_log cls_statelog cls_timeindex + cls_log cls_timeindex cls_version cls_user cls_otp) install(TARGETS radosgw DESTINATION bin) @@ -217,7 +217,7 @@ set(radosgw_admin_srcs add_executable(radosgw-admin ${radosgw_admin_srcs}) target_link_libraries(radosgw-admin rgw_a librados cls_rgw_client cls_otp_client cls_lock_client cls_refcount_client - cls_log_client cls_statelog_client cls_timeindex_client + cls_log_client cls_timeindex_client cls_version_client cls_user_client global ${FCGI_LIBRARY} ${LIB_RESOLV} ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${SSL_LIBRARIES} ${BLKID_LIBRARIES}) @@ -228,7 +228,7 @@ set(radosgw_es_srcs add_executable(radosgw-es ${radosgw_es_srcs}) target_link_libraries(radosgw-es rgw_a librados cls_rgw_client cls_otp_client cls_lock_client cls_refcount_client - cls_log_client cls_statelog_client cls_timeindex_client + cls_log_client cls_timeindex_client cls_version_client cls_user_client global ${FCGI_LIBRARY} ${LIB_RESOLV} ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${SSL_LIBRARIES} ${BLKID_LIBRARIES}) @@ -246,7 +246,7 @@ set(radosgw_object_expirer_srcs add_executable(radosgw-object-expirer ${radosgw_object_expirer_srcs}) target_link_libraries(radosgw-object-expirer rgw_a librados cls_rgw_client cls_otp_client cls_lock_client cls_refcount_client - cls_log_client cls_statelog_client cls_timeindex_client + cls_log_client cls_timeindex_client cls_version_client cls_user_client global ${FCGI_LIBRARY} ${LIB_RESOLV} ${CURL_LIBRARIES} ${EXPAT_LIBRARIES}) @@ -264,7 +264,6 @@ target_link_libraries(rgw PRIVATE cls_lock_client cls_refcount_client cls_log_client - cls_statelog_client cls_timeindex_client cls_version_client cls_user_client @@ -293,7 +292,6 @@ target_link_libraries(rgw_admin_user PRIVATE cls_lock_client cls_refcount_client cls_log_client - cls_statelog_client cls_timeindex_client cls_version_client cls_user_client diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index ee10dc526db64..4b38d3ebcf553 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -35,7 +35,6 @@ #include "cls/refcount/cls_refcount_client.h" #include "cls/version/cls_version_client.h" #include "cls/log/cls_log_client.h" -#include "cls/statelog/cls_statelog_client.h" #include "cls/timeindex/cls_timeindex_client.h" #include "cls/lock/cls_lock_client.h" #include "cls/user/cls_user_client.h" @@ -120,8 +119,6 @@ static string RGW_DEFAULT_ZONEGROUP_ROOT_POOL = "rgw.root"; static string RGW_DEFAULT_REALM_ROOT_POOL = "rgw.root"; static string RGW_DEFAULT_PERIOD_ROOT_POOL = "rgw.root"; -#define RGW_STATELOG_OBJ_PREFIX "statelog." - #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 648dec6a3d8fe..28618413ff701 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -18,7 +18,6 @@ #include "cls/rgw/cls_rgw_types.h" #include "cls/version/cls_version_types.h" #include "cls/log/cls_log_types.h" -#include "cls/statelog/cls_statelog_types.h" #include "cls/timeindex/cls_timeindex_types.h" #include "cls/otp/cls_otp_types.h" #include "rgw_log.h" diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt index b050b4c7b8337..6ba12e3177df0 100644 --- a/src/test/rgw/CMakeLists.txt +++ b/src/test/rgw/CMakeLists.txt @@ -36,7 +36,6 @@ target_link_libraries(ceph_test_rgw_manifest cls_lock_client cls_refcount_client cls_log_client - cls_statelog_client cls_timeindex_client cls_version_client cls_user_client @@ -60,7 +59,6 @@ target_link_libraries(ceph_test_rgw_obj cls_lock_client cls_refcount_client cls_log_client - cls_statelog_client cls_version_client cls_user_client librados @@ -83,7 +81,6 @@ target_link_libraries(unittest_rgw_crypto cls_lock_client cls_refcount_client cls_log_client - cls_statelog_client cls_version_client cls_user_client librados @@ -103,7 +100,6 @@ target_link_libraries(unittest_rgw_iam_policy cls_lock_client cls_refcount_client cls_log_client - cls_statelog_client cls_version_client cls_user_client librados -- 2.39.5