From 7b570a5d91f857bbd0a2b6ee861500c7c32ea980 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Mon, 12 Feb 2018 17:05:08 +0100
Subject: [PATCH] New generalised EOS WFE

---
 .../cc7/etc/yum/pluginconf.d/versionlock.list | 28 +++++++++----------
 .../cc7/opt/run/bin/eos_configure_preprod.sh  | 10 +++----
 .../orchestration/create_instance.sh          |  4 +--
 xroot_plugins/XrdSsiCtaRequestMessage.cpp     |  1 +
 xrootd-ssi-protobuf-interface                 |  2 +-
 5 files changed, 23 insertions(+), 22 deletions(-)

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 854df8e319..05bc4b483c 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 a91be345ba..2633a7848a 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 709a53d134..ea1b8439b6 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 d1bb13b90e..f73efbfebc 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -367,6 +367,7 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification &notification, 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 1e0d5df372..01b9c20bce 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit 1e0d5df3725dade40f968ca55de993a6efc93908
+Subproject commit 01b9c20bce51713468c7429eda7fe065c547ac28
-- 
GitLab