Merge remote-tracking branch 'origin/master' into ssi

continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms/Dockerfile

@@ -90,6 +90,8 @@ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \
       sudo \
   && \
     yum clean all \
+  && \
+    rm -rf /var/cache/yum \
   && \
     mkdir -pv /etc/cta
 

continuousintegration/docker/ctafrontend/cc7/ci_runner/Dockerfile

@@ -76,7 +76,9 @@ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \
       ltrace \
       cta-cli \
   && \
-    yum clean all
+    yum clean all \
+  && \
+    rm -rf /var/cache/yum
 
 # Add pod specific configuration
 ADD ${BASEDIR}/config ${LOCALORCHESTRATIONDIR}

eos_wfe_scripts/delete_archive_file

@@ -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"

objectstore/BackendPopulator.cpp

@@ -29,18 +29,29 @@ BackendPopulator::BackendPopulator(cta::objectstore::Backend & be,
     const std::string &agentType, const cta::log::LogContext & lc): m_backend(be), m_agentReference(agentType, lc.logger()),
     m_lc(lc) {
   cta::objectstore::RootEntry re(m_backend);
-  cta::objectstore::ScopedExclusiveLock rel(re);
-  re.fetch();
+  re.fetchNoLock();
+  cta::objectstore::EntryLogSerDeser cl("user0", "systemhost", time(NULL));
+  // We might have to create the agent register (but this is unlikely)
+  try {
+    re.getAgentRegisterAddress();
+  } catch (...) {
+    RootEntry re2(m_backend);
+    ScopedExclusiveLock rel(re2);
+    re2.fetch();
+    re2.addOrGetAgentRegisterPointerAndCommit(m_agentReference, cl);
+  }
   Agent agent(m_agentReference.getAgentAddress(), m_backend);
   agent.initialize();
-  cta::objectstore::EntryLogSerDeser cl("user0", "systemhost", time(NULL));
-  re.addOrGetAgentRegisterPointerAndCommit(m_agentReference, cl);
-  rel.release();
   agent.insertAndRegisterSelf();
-  rel.lock(re);
-  re.fetch();
-  re.addOrGetDriveRegisterPointerAndCommit(m_agentReference, cl);
-  rel.release();
+  // Likewise, make sure the drive register is around.
+  try {
+    re.getDriveRegisterAddress();
+  } catch (...) {
+    RootEntry re2(m_backend);
+    ScopedExclusiveLock rel(re2);
+    re2.fetch();
+    re2.addOrGetDriveRegisterPointerAndCommit(m_agentReference, cl);
+  }
 }
 
 //------------------------------------------------------------------------------