From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:12:03 +0000 (-0400)
Subject: Merge pull request #47709 from zalsader/add-daos
X-Git-Tag: v18.0.0~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b99852e3b106775e62c9480ca5fa732cd182da7;p=ceph.git

Merge pull request #47709 from zalsader/add-daos

rgw: add DAOS SAL implementation

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
---

0b99852e3b106775e62c9480ca5fa732cd182da7
diff --cc src/rgw/CMakeLists.txt
index f4460802827d,a9f4f6637ab1..38314c4f1e20
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@@ -275,42 -275,40 +278,50 @@@ if(WITH_RADOSGW_MOTR
    target_link_libraries(rgw_common PRIVATE motr::motr)
  endif()
  
+ if(WITH_RADOSGW_DAOS)
+   find_package(DAOS REQUIRED)
+   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG ")
+   target_link_libraries(rgw_common PRIVATE daos dfs ds3 uuid duns)
+   target_include_directories(rgw_common PRIVATE ${PC_DAOS_INCLUDEDIR} )
+   link_directories( ${PC_DAOS_LIBRARY_DIRS} )
+ endif()
+ 
  set(rgw_a_srcs
 +  rgw_appmain.cc
 +  rgw_asio_client.cc
 +  rgw_asio_frontend.cc
    rgw_auth_keystone.cc
    rgw_client_io.cc
 +  rgw_file.cc
    rgw_frontend.cc
    rgw_http_client_curl.cc
 +  rgw_kmip_client_impl.cc
 +  rgw_lib.cc
    rgw_loadgen.cc
 +  rgw_loadgen_process.cc
 +  rgw_log.cc
 +  rgw_lua_request.cc
 +  rgw_opa.cc
 +  rgw_os_lib.cc
    rgw_period_pusher.cc
 +  rgw_process.cc
    rgw_realm_reloader.cc
    rgw_realm_watcher.cc
 -  rgw_os_lib.cc
 -  rgw_process.cc
    rgw_rest_bucket.cc
    rgw_rest_config.cc
 +  rgw_rest_info.cc
    rgw_rest_log.cc
    rgw_rest_metadata.cc
 +  rgw_rest_ratelimit.cc
    rgw_rest_realm.cc
 +  rgw_rest_sts.cc
    rgw_rest_swift.cc
    rgw_rest_usage.cc
 -  rgw_rest_info.cc
    rgw_rest_user.cc
 -  rgw_rest_ratelimit.cc
 +  rgw_signal.cc
    rgw_swift_auth.cc
    rgw_usage.cc
 -  rgw_opa.cc
 -  rgw_sts.cc
 -  rgw_rest_sts.cc)
 +  rgw_sts.cc)
  
  gperf_generate(${CMAKE_SOURCE_DIR}/src/rgw/rgw_iam_policy_keywords.gperf
    rgw_iam_policy_keywords.frag.cc)