diff --git a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list index 854df8e319a7a9ce610e13cf0515fee032b38884..05bc4b483cf5786de2b0fbead60243e456f3c76c 100644 --- a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list +++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list @@ -1,17 +1,17 @@ -0:eos-archive-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-cleanup-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-client-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-debuginfo-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-fuse-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-fuse-core-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-fuse-sysv-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-fusex-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-fusex-core-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-fusex-selinux-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-server-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-srm-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-test-4.2.12-20180202120141git3855655.el7.cern.x86_64 -0:eos-testkeytab-4.2.12-20180202120141git3855655.el7.cern.x86_64 +0:eos-archive-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-cleanup-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-client-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-debuginfo-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-fuse-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-fuse-core-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-fuse-sysv-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-fusex-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-fusex-core-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-fusex-selinux-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-server-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-srm-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-test-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 +0:eos-testkeytab-4.2.12-20180212145907git8b966f6.el7.cern.x86_64 1:python2-xrootd-4.8.1-1.el7.cern.x86_64 1:python3-xrootd-4.8.1-1.el7.cern.x86_64 1:xrootd-4.8.1-1.el7.cern.x86_64 diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh index a91be345ba28732eee9ed3ccbed1d84b0c49b3b1..2633a7848a075259346dab56a511d31f4d413219 100755 --- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh +++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh @@ -8,8 +8,8 @@ eos attr set sys.acl=g:eosusers:rwx!d,u:poweruser1:rwx+dp,u:poweruser2:rwx+dp ${ eos attr set CTA_StorageClass=ctaStorageClass ${PREPROD_DIR} eos attr set CTA_TapeFsId=65535 ${PREPROD_DIR} -eos attr set sys.workflow.closew.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} -eos attr set sys.workflow.closew.CTA_retrieve="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} -eos attr set sys.workflow.archived.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} -eos attr set sys.workflow.sync::prepare.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} -eos attr set sys.workflow.sync::delete.default="proto/cta:ctafrontend:10955 <parent/file>" ${PREPROD_DIR} +eos attr set sys.workflow.closew.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR} +eos attr set sys.workflow.closew.CTA_retrieve="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR} +eos attr set sys.workflow.archived.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR} +eos attr set sys.workflow.sync::prepare.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR} +eos attr set sys.workflow.sync::delete.default="proto:ctafrontend:10955 ctafrontend" ${PREPROD_DIR} diff --git a/continuousintegration/orchestration/create_instance.sh b/continuousintegration/orchestration/create_instance.sh index 709a53d134e9a7f552582c25367bbf994798b662..ea1b8439b68392fa792615312305657b9287e30d 100755 --- a/continuousintegration/orchestration/create_instance.sh +++ b/continuousintegration/orchestration/create_instance.sh @@ -314,8 +314,8 @@ echo "Setting workflows in namespace ${instance} pod ctaeos:" CTA_WF_DIR=/eos/${EOSINSTANCE}/proc/cta/workflow for WORKFLOW in closew.default archived.default sync::prepare.default closew.CTA_retrieve sync::delete.default do - echo "eos attr set sys.workflow.${WORKFLOW}=\"proto/cta:${CTA_ENDPOINT} <parent/file>\" ${CTA_WF_DIR}" - kubectl --namespace=${instance} exec ctaeos -- bash -c "eos attr set sys.workflow.${WORKFLOW}=\"proto/cta:${CTA_ENDPOINT} <parent/file>\" ${CTA_WF_DIR}" + echo "eos attr set sys.workflow.${WORKFLOW}=\"proto:${CTA_ENDPOINT} ctafrontend\" ${CTA_WF_DIR}" + kubectl --namespace=${instance} exec ctaeos -- bash -c "eos attr set sys.workflow.${WORKFLOW}=\"proto:${CTA_ENDPOINT} ctafrontend\" ${CTA_WF_DIR}" done diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp index d1bb13b90e4d0b4ce05086c0694e751384bc36a7..f73efbfebcc90fe3a53a3fce06357c03c83fff0d 100644 --- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp +++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp @@ -367,6 +367,7 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification ¬ification, c std::cerr << result_str << std::endl; #endif response.set_message_txt(result_str); + response.mutable_xattr()->insert(google::protobuf::MapPair<std::string,std::string>("CTA_ArchiveFileId", std::to_string(archiveFileId))); // Set response type diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface index 1e0d5df3725dade40f968ca55de993a6efc93908..01b9c20bce51713468c7429eda7fe065c547ac28 160000 --- a/xrootd-ssi-protobuf-interface +++ b/xrootd-ssi-protobuf-interface @@ -1 +1 @@ -Subproject commit 1e0d5df3725dade40f968ca55de993a6efc93908 +Subproject commit 01b9c20bce51713468c7429eda7fe065c547ac28