rgw: integrate Swift object expiration-related things with CMake.

Fixes: #4099
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b8298e1308300e405dba227c7b1a453ccc8a448..402d8a6dc1ba08ac192d87d15d218ffba4ef5a26 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -898,7 +898,8 @@ if(${WITH_RADOSGW})
     rgw/rgw_replica_log.cc
     rgw/rgw_keystone.cc
     rgw/rgw_quota.cc
-    rgw/rgw_dencoder.cc)
+    rgw/rgw_dencoder.cc
+    rgw/rgw_object_expirer_core.cc)
 
   add_library(rgw_a STATIC ${rgw_a_srcs})
 
@@ -931,19 +932,30 @@ if(${WITH_RADOSGW})
     rgw/rgw_admin.cc
     rgw/rgw_orphan.cc)
 
+  set(radosgw_object_expirer_srcs
+    rgw/rgw_object_expirer.cc)
+
   add_executable(radosgw ${radosgw_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
   target_link_libraries(radosgw rgw_a librados
     cls_rgw_client cls_lock_client cls_refcount_client
-    cls_log_client cls_statelog_client cls_version_client
-    cls_replica_log_client cls_user_client
+    cls_log_client cls_statelog_client cls_timeindex_client
+    cls_version_client cls_replica_log_client cls_user_client
     curl expat global fcgi resolv ${BLKID_LIBRARIES} ${TCMALLOC_LIBS})
   install(TARGETS radosgw DESTINATION bin)
 
   add_executable(radosgw-admin ${radosgw_admin_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
   target_link_libraries(radosgw-admin rgw_a librados
     cls_rgw_client cls_lock_client cls_refcount_client
-    cls_log_client cls_statelog_client cls_version_client
-    cls_replica_log_client cls_user_client
+    cls_log_client cls_statelog_client cls_timeindex_client
+    cls_version_client cls_replica_log_client cls_user_client
     curl expat global fcgi resolv ${BLKID_LIBRARIES} ${TCMALLOC_LIBS})
   install(TARGETS radosgw-admin DESTINATION bin)
+
+  add_executable(radosgw-object-expirer ${radosgw_object_expirer_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+  target_link_libraries(radosgw-object-expirer rgw_a librados
+    cls_rgw_client cls_lock_client cls_refcount_client
+    cls_log_client cls_statelog_client cls_timeindex_client
+    cls_version_client cls_replica_log_client cls_user_client
+    curl expat global fcgi resolv ${TCMALLOC_LIBS})
+  install(TARGETS radosgw-object-expirer DESTINATION bin)
 endif(${WITH_RADOSGW})

diff --git a/src/cls/CMakeLists.txt b/src/cls/CMakeLists.txt
index c6abc1f664be731d473026424725cf5be1c36a90..c8befd05c2a51e0e54a8417d1a2a4a5fb6b1b11e 100644 (file)
--- a/src/cls/CMakeLists.txt
+++ b/src/cls/CMakeLists.txt
@@ -60,6 +60,13 @@ install(TARGETS cls_statelog DESTINATION lib/rados-classes)
 
 add_library(cls_statelog_client statelog/cls_statelog_client.cc)
 
+# cls_timeindex
+add_library(cls_timeindex SHARED timeindex/cls_timeindex.cc)
+set_target_properties(cls_timeindex PROPERTIES VERSION "1.0.0" SOVERSION "1")
+install(TARGETS cls_timeindex DESTINATION lib/rados-classes)
+
+add_library(cls_timeindex_client timeindex/cls_timeindex_client.cc)
+
 # cls_replica_log
 add_library(cls_replica_log SHARED replica_log/cls_replica_log.cc)
 set_target_properties(cls_replica_log PROPERTIES VERSION "1.0.0" SOVERSION "1")

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 8763f972f1cfea77996117b364b48d64af811d24..a2f216c5caa3360b629a2f31524d79df5b5d968c 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -931,6 +931,7 @@ if(${WITH_RADOSGW})
     cls_refcount_client
     cls_log_client
     cls_statelog_client
+    cls_timeindex_client
     cls_version_client
     cls_replica_log_client
     cls_kvs
@@ -1017,6 +1018,7 @@ if(${WITH_RADOSGW})
     cls_version_client
     cls_log_client
     cls_statelog_client
+    cls_timeindex_client
     cls_refcount_client
     cls_rgw_client
     cls_user_client