S3: remove libcap dependency - remove http.trace all from default con…

…fig file - add a log message into ObjectStore::PutObject
cern-eos · May 30, 2024 · cd1a917 · cd1a917
1 parent 946f7e9
commit cd1a917
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 5 deletions.
diff --git a/cmake/FindCap.cmake b/cmake/FindCap.cmake
@@ -0,0 +1,10 @@
+
+FIND_LIBRARY(CAP_LIB cap
+  HINTS
+  /usr
+  PATH_SUFFIXES lib lib64
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cap DEFAULT_MSG CAP_LIB)
+
diff --git a/cmake/XRootDDefaults.cmake b/cmake/XRootDDefaults.cmake
@@ -29,6 +29,7 @@ option( ENABLE_XRDEC     "Enable erasure coding component."
 option( ENABLE_ASAN      "Enable adress sanitizer."                                       FALSE )
 option( ENABLE_TSAN      "Enable thread sanitizer."                                       FALSE )
 option( ENABLE_XRDCLHTTP "Enable xrdcl-http plugin."                                      TRUE )
+option( ENABLE_XRDS3     "Enable XrdS3 plugin."                                           TRUE )
 cmake_dependent_option( ENABLE_SCITOKENS "Enable SciTokens plugin." TRUE "NOT XRDCL_ONLY" FALSE )
 cmake_dependent_option( ENABLE_MACAROONS "Enable Macaroons plugin." TRUE "NOT XRDCL_ONLY" FALSE )
 option( FORCE_ENABLED    "Fail build if enabled components cannot be built."              FALSE )

diff --git a/cmake/XRootDFindLibs.cmake b/cmake/XRootDFindLibs.cmake
@@ -24,6 +24,7 @@ if( ZLIB_FOUND )
 endif()
 
 find_package( TinyXml )
+find_package( TinyXml2 )
 
 find_package( LibXml2 )
 if( LIBXML2_FOUND )
@@ -215,3 +216,7 @@ if( ENABLE_XRDCLHTTP )
     set( BUILD_XRDCLHTTP FALSE )
   endif()
 endif()
+
+if( ENABLE_XRDS3 )
+  set (BUILD_XRDS3 TRUE )
+endif()
diff --git a/cmake/XRootDSummary.cmake b/cmake/XRootDSummary.cmake
@@ -17,6 +17,7 @@ component_status( VOMSXRD   BUILD_VOMS        VOMS_FOUND )
 component_status( XRDCL     ENABLE_XRDCL      TRUE_VAR )
 component_status( XRDCLHTTP ENABLE_XRDCLHTTP  DAVIX_FOUND )
 component_status( XRDEC     BUILD_XRDEC       TRUE_VAR )
+component_status( XRDS3     ENABLE_XRDS3      BUILD_XRDS3 )
 
 message( STATUS "----------------------------------------" )
 message( STATUS "Installation path: " ${CMAKE_INSTALL_PREFIX} )
@@ -29,6 +30,7 @@ message( STATUS "Ceph support:      " ${STATUS_CEPH} )
 message( STATUS "Readline support:  " ${STATUS_READLINE} )
 message( STATUS "FUSE support:      " ${STATUS_FUSE} )
 message( STATUS "Kerberos5 support: " ${STATUS_KRB5} )
+message( STATUS "XrdS3 support:     " ${STATUS_XRDS3} )
 message( STATUS "XrdCl:             " ${STATUS_XRDCL} )
 message( STATUS "XrdClHttp:         " ${STATUS_XRDCLHTTP} )
 message( STATUS "HTTP support:      " ${STATUS_HTTP} )

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -47,6 +47,10 @@ if( BUILD_XRDEC )
   add_subdirectory( XrdEc )
 endif()
 
+if( BUILD_XRDS3 )
+  add_subdirectory( XrdS3 )
+endif()
+
 if( NOT XRDCL_ONLY )
   include( XrdServer )
   include( XrdDaemons )

diff --git a/src/XrdS3/XrdS3Api.cc b/src/XrdS3/XrdS3Api.cc
@@ -526,8 +526,6 @@ int S3Api::PutObjectHandler(XrdS3Req& req) {
     }
   }
 
-  S3::S3Handler::Logger()->Log(S3::DEBUG, "Api", "GetObject");
-
   S3ObjectStore::Object obj;
   err = objectStore.GetObject(bucket, req.object, obj);
   if (err == S3Error::None) {
@@ -543,8 +541,6 @@ int S3Api::PutObjectHandler(XrdS3Req& req) {
         ValidatePreconditions(etag, last_modified, req.lowercase_headers))
   }
 
-  S3::S3Handler::Logger()->Log(S3::DEBUG, "Api", "ObjectStore::PutObject");
-
   std::map<std::string, std::string> headers;
   RET_ON_ERROR(objectStore.PutObject(req, bucket, length, chunked, headers))
 

diff --git a/src/XrdS3/XrdS3ObjectStore.cc b/src/XrdS3/XrdS3ObjectStore.cc
@@ -41,6 +41,7 @@
 #include "XrdPosix/XrdPosixExtern.hh"
 #include "XrdS3Auth.hh"
 #include "XrdS3Req.hh"
+#include "XrdS3.hh"
 #include "XrdS3ScopedFsId.hh"
 //------------------------------------------------------------------------------
 
@@ -938,6 +939,8 @@ S3Error S3ObjectStore::PutObject(XrdS3Req &req, const S3Auth::Bucket &bucket,
   ScopedFsId scope(bucket.owner.uid,bucket.owner.gid);
   auto final_path = bucket.path / req.object;
 
+  S3::S3Handler::Logger()->Log(S3::DEBUG, "ObjectStore", "PutObject: uid=%u gid=%u path=%s chuncked=%d size=%lu", bucket.owner.uid, bucket.owner.gid, bucket.path.c_str(), chunked, size);
+
   struct stat buf;
   if (!XrdPosix_Stat(final_path.c_str(), &buf) && S_ISDIR(buf.st_mode)) {
     return S3Error::ObjectExistAsDir;

diff --git a/src/XrdS3/config/xrootd-s3.cfg b/src/XrdS3/config/xrootd-s3.cfg
@@ -38,7 +38,7 @@ xrd.protocol XrdHttp:8443 libXrdHttp.so
 xrd.tls /etc/grid-security/xrootd/hostcert.pem /etc/grid-security/xrootd/hostkey.pem detail
 xrd.tlsca certdir /etc/grid-security/certificates/
 http.gridmap /etc/grid-security/grid-mapfile
-http.trace all
+#http.trace all
 
 
 # ------------------------------------------------------------------------------