Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
5ac5df04
Commit
5ac5df04
authored
7 years ago
by
Michael Davis
Browse files
Options
Downloads
Patches
Plain Diff
Don't build XrdCtaOfs.so
Updates CTA Frontend config so only the SSI plugin is loaded.
parent
1328317a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cta.spec.in
+0
-1
0 additions, 1 deletion
cta.spec.in
xroot_plugins/CMakeLists.txt
+21
-21
21 additions, 21 deletions
xroot_plugins/CMakeLists.txt
xroot_plugins/cta-frontend-xrootd.conf
+6
-5
6 additions, 5 deletions
xroot_plugins/cta-frontend-xrootd.conf
with
27 additions
and
27 deletions
cta.spec.in
+
0
−
1
View file @
5ac5df04
...
...
@@ -157,7 +157,6 @@ The xroot plugin
/usr/bin/getent passwd cta || /usr/sbin/useradd -s /bin/nologin -c "CTA system account" -g cta cta
%files -n cta-frontend
%defattr(0755,root,root)
%{_libdir}/libXrdCtaOfs.so*
%{_libdir}/libXrdSsiCta.so*
%attr(0755,cta,cta) %dir /var/log/cta
%attr(0644,root,root) %config(noreplace) /etc/logrotate.d/cta-frontend
...
...
This diff is collapsed.
Click to expand it.
xroot_plugins/CMakeLists.txt
+
21
−
21
View file @
5ac5df04
...
...
@@ -48,27 +48,27 @@ endif (OCCI_SUPPORT)
#
# XRootD OFS plugin for CTA Frontend (DEPRECATED)
#
add_library
(
XrdCtaOfs MODULE
ListArchiveFilesCmd.cpp
XrdCtaFilesystem.cpp
XrdCtaFile.cpp
XrdCtaDir.cpp
)
if
(
CMAKE_COMPILER_IS_GNUCC
)
# Add -Wno-implicit-fallthrough compiler flag if using gcc version 7 or greater
if
(
GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7
)
set_property
(
SOURCE XrdCtaFile.cpp APPEND_STRING PROPERTY COMPILE_FLAGS
" -Wno-implicit-fallthrough"
)
endif
(
GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7
)
endif
(
CMAKE_COMPILER_IS_GNUCC
)
set_property
(
TARGET XrdCtaOfs PROPERTY SOVERSION
"
${
CTA_SOVERSION
}
"
)
set_property
(
TARGET XrdCtaOfs PROPERTY VERSION
"
${
CTA_LIBVERSION
}
"
)
target_link_libraries
(
XrdCtaOfs ctacatalogue ctascheduler ctacommon ctaobjectstore cryptopp
)
set_property
(
TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH
${
PROTOBUF3_RPATH
}
)
if
(
OCCI_SUPPORT
)
set_property
(
TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH
${
ORACLE-INSTANTCLIENT_RPATH
}
)
endif
(
OCCI_SUPPORT
)
install
(
TARGETS XrdCtaOfs DESTINATION usr/
${
CMAKE_INSTALL_LIBDIR
}
)
#
add_library (XrdCtaOfs MODULE
#
ListArchiveFilesCmd.cpp
#
XrdCtaFilesystem.cpp
#
XrdCtaFile.cpp
#
XrdCtaDir.cpp)
#
if(CMAKE_COMPILER_IS_GNUCC)
#
# Add -Wno-implicit-fallthrough compiler flag if using gcc version 7 or greater
#
if (GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7)
#
set_property(SOURCE XrdCtaFile.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-implicit-fallthrough")
#
endif (GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7)
#
endif(CMAKE_COMPILER_IS_GNUCC)
#
#
set_property(TARGET XrdCtaOfs PROPERTY SOVERSION "${CTA_SOVERSION}")
#
set_property(TARGET XrdCtaOfs PROPERTY VERSION "${CTA_LIBVERSION}")
#
target_link_libraries (XrdCtaOfs ctacatalogue ctascheduler ctacommon ctaobjectstore cryptopp)
#
set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
#
if (OCCI_SUPPORT)
#
set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
#
endif (OCCI_SUPPORT)
#
#
install (TARGETS XrdCtaOfs DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
#
####################################################################################################
...
...
This diff is collapsed.
Click to expand it.
xroot_plugins/cta-frontend-xrootd.conf
+
6
−
5
View file @
5ac5df04
# Load the CTA SSI and OFS plugins
xrootd
.
fslib
libXrdSsi
.
so
libXrdCtaOfs
.
so
#xrootd.fslib libXrdSsi.so libXrdCtaOfs.so
xrootd
.
fslib
libXrdSsi
.
so
# Specify which paths are handled by the OFS plugin
#
...
...
@@ -8,10 +9,10 @@ xrootd.fslib libXrdSsi.so libXrdCtaOfs.so
#
# Y3Rh is the Base64 encoding of cta, so this string appears at the beginning
# of all cta admin commands
ssi
.
fspath
/
Y3Rh
#
ssi.fspath /Y3Rh
# L3Vzci9iaW4vY3Rh is Base64 encoding of /usr/bin/cta which appears at
# the beginning of commands called from the EOS WFE bash script
ssi
.
fspath
/
L3Vzci9iaW4vY3Rh
#
ssi.fspath /L3Vzci9iaW4vY3Rh
# Load the SSI module
ssi
.
svclib
libXrdSsiCta
.
so
...
...
@@ -41,5 +42,5 @@ all.export /ctafrontend nolock r/w
# There can be more than one of these; anything that starts with the prefix
# will go to the the underlying file system. Note that this prefix cannot be
# a substring of '/ctafrontend', so it is not possible to simply export '/'.
all
.
export
/
Y3Rh
all
.
export
/
L3Vzci9iaW4vY3Rh
#
all.export /Y3Rh
#
all.export /L3Vzci9iaW4vY3Rh
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment