Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
92eddc45
Commit
92eddc45
authored
Sep 25, 2017
by
Michael Davis
Browse files
Resets config files modified by ssi branch
parent
2101aed0
Changes
6
Hide whitespace changes
Inline
Side-by-side
cmdline/CMakeLists.txt
View file @
92eddc45
...
...
@@ -33,7 +33,7 @@ include_directories (${CMAKE_SOURCE_DIR}/tapeserver/)
#
# Get some extra debug messages on stdout
add_definitions
(
-DXRDSSI_DEBUG
)
#
add_definitions(-DXRDSSI_DEBUG)
find_package
(
xrootd REQUIRED
)
find_package
(
Protobuf3 REQUIRED
)
...
...
continuousintegration/docker/ctafrontend/cc7/config/ctafrontend/etc/xrootd/xrootd-cta.cfg
View file @
92eddc45
# Load the CTA SSI and OFS plugins
xrootd.fslib libXrdSsi.so libXrdCtaOfs.so
# Specify which paths should be routed to the OFS plugin
#
# The "old" cta command will continue to use OFS. The "new" eoscta_stub and
# cta_admin binaries use SSI.
#
# Y3Rh is the Base64 encoding of cta, so this string appears at the beginning
# of all cta admin commands
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
# Load the SSI module
ssi.svclib libXrdSsiCta.so
# Load the plugin XrdCtaOfs
xrootd.fslib libXrdCtaOfs.so
# Use the security module
xrootd.seclib libXrdSec.so
...
...
@@ -29,16 +14,8 @@ sec.protocol unix
#sec.protbind * only sss
sec.protbind 172.17.0* only unix
# Export the SSI resource
all.export /ctafrontend nolock r/w
# Export the OFS resources, specified in ssi.fspath above.
#
# 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
# Allow copying from absolute paths
all.export /
# Turn off asynchronous i/o
xrootd.async off
...
...
continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
View file @
92eddc45
...
...
@@ -9,21 +9,22 @@
0:eos-srm-4.1.26-20170824172038gitc7cf4c6.el7.cern.x86_64
0:eos-test-4.1.26-20170824172038gitc7cf4c6.el7.cern.x86_64
0:eos-testkeytab-4.1.26-20170824172038gitc7cf4c6.el7.cern.x86_64
1:xrootd-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-client-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-client-devel-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-client-libs-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-debuginfo-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-devel-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-doc-20170918.cf0d636-1.el7.cern.noarch
1:xrootd-fuse-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-libs-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-private-devel-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-python-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-selinux-20170918.cf0d636-1.el7.cern.noarch
1:xrootd-server-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-server-devel-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-server-libs-20170918.cf0d636-1.el7.cern.x86_64
1:xrootd-4.7.0-1.el7.x86_64
1:xrootd-client-4.7.0-1.el7.x86_64
1:xrootd-client-devel-4.7.0-1.el7.x86_64
1:xrootd-client-libs-4.7.0-1.el7.x86_64
1:xrootd-debuginfo-4.7.0-1.el7.x86_64
1:xrootd-devel-4.7.0-1.el7.x86_64
1:xrootd-doc-4.7.0-1.el7.noarch
1:xrootd-fuse-4.7.0-1.el7.x86_64
1:xrootd-libs-4.7.0-1.el7.x86_64
1:xrootd-private-devel-4.7.0-1.el7.x86_64
1:xrootd-python-4.7.0-1.el7.x86_64
1:xrootd-selinux-4.7.0-1.el7.noarch
1:xrootd-server-4.7.0-1.el7.x86_64
1:xrootd-server-devel-4.7.0-1.el7.x86_64
1:xrootd-server-libs-4.7.0-1.el7.x86_64
1:xrootd-tests-4.7.0-1.el7.x86_64
2:ceph-12.2.0-0.el7.x86_64
2:ceph-base-12.2.0-0.el7.x86_64
2:ceph-common-12.2.0-0.el7.x86_64
...
...
cta.spec.in
View file @
92eddc45
...
...
@@ -37,10 +37,10 @@ BuildRequires: xrootd-client-devel = 1:4.2.3
BuildRequires: xrootd-devel = 1:4.2.3
BuildRequires: cryptopp-devel >= 5.6.2
%else
BuildRequires: xrootd-client-devel
BuildRequires: xrootd-devel
BuildRequires: xrootd-server-devel
BuildRequires: xrootd-private-devel
BuildRequires: xrootd-client-devel
= 1:4.7.0
BuildRequires: xrootd-devel
= 1:4.7.0
BuildRequires: xrootd-server-devel
= 1:4.7.0
BuildRequires: xrootd-private-devel
= 1:4.7.0
BuildRequires: librados-devel >= 11.0, libradosstriper-devel >= 11.0,
BuildRequires: protobuf3-compiler >= 3.3.1 protobuf3-devel >= 3.3.1
BuildRequires: gmock-devel >= 1.5.0 gtest-devel >= 1.5.0
...
...
eos_wfe_scripts/delete_archive_file
View file @
92eddc45
...
...
@@ -16,7 +16,7 @@ if test $# -ne 5; then
exit
${
EINVAL
}
fi
CTA_BIN
=
/usr/bin/
eoscta_stub
CTA_BIN
=
/usr/bin/
cta
WF_TAG
=
"
$1
"
RUSERNAME
=
"
$2
"
...
...
@@ -33,9 +33,8 @@ if test UNDEF = ${ARCHIVE_FILE_ID}; then
exit
0
fi
if
RESULT
=
`
2>&1
LD_LIBRARY_PATH
=
/usr/lib64/protobuf3
XRDDEBUG
=
1
${
CTA_BIN
}
deletearchive
--user
${
RUSERNAME
}
--group
${
RGROUPNAME
}
--id
${
ARCHIVE_FILE_ID
}
--json
`
;
then
if
RESULT
=
`
2>&1
LD_LIBRARY_PATH
=
/usr/lib64/protobuf3
${
CTA_BIN
}
deletearchive
--user
${
RUSERNAME
}
--group
${
RGROUPNAME
}
--id
${
ARCHIVE_FILE_ID
}
--json
`
;
then
echo
"
$LOG_DATE
$LOG_SCRIPT_NAME
deleted tape archive file: rusername=
${
RUSERNAME
}
rgroupname=
${
RGROUPNAME
}
archiveFileId=
${
ARCHIVE_FILE_ID
}
path=
${
FILE_PATH
}
"
>>
${
LOG_FILE
}
echo
${
RESULT
}
exit
0
else
echo
"
$LOG_DATE
$LOG_SCRIPT_NAME
failed to delete tape archive file: error=
${
RESULT
}
rusername=
${
RUSERNAME
}
rgroupname=
${
RGROUPNAME
}
archiveFileId=
${
ARCHIVE_FILE_ID
}
path=
${
FILE_PATH
}
"
>>
${
LOG_FILE
}
...
...
xroot_plugins/CMakeLists.txt
View file @
92eddc45
...
...
@@ -37,11 +37,10 @@ set_target_properties(XrdCtaOfs PROPERTIES INSTALL_RPATH ${PROTOBUF3_RPATH})
add_subdirectory
(
messages
)
add_definitions
(
-DXRDSSI_DEBUG
)
#
add_definitions(-DXRDSSI_DEBUG)
include_directories
(
../xroot_ssi_pb
)
add_library
(
XrdSsiCta MODULE XrdSsiCtaServiceProvider.cpp XrdSsiCtaRequestProc.cpp XrdSsiCtaRequestMessage.cpp
../cmdline/CtaAdminCmdParse.cpp
)
add_library
(
XrdSsiCta MODULE XrdSsiCtaServiceProvider.cpp XrdSsiCtaRequestProc.cpp XrdSsiCtaRequestMessage.cpp ../cmdline/CtaAdminCmdParse.cpp
)
target_link_libraries
(
XrdSsiCta XrdSsi-4 XrdSsiLib XrdCtaMessages ctascheduler ctacommon ctaobjectstore ctacatalogue
)
set_target_properties
(
XrdSsiCta PROPERTIES INSTALL_RPATH
${
PROTOBUF3_RPATH
}
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment