Commit 9eda07d7 authored by Eric Cano's avatar Eric Cano
Browse files

Merge remote-tracking branch 'origin/master' into repack-dev

parents 13f10d94 56c294bc
......@@ -377,8 +377,11 @@ void OracleCatalogue::filesWrittenToTape(const std::set<TapeItemWrittenPointer>
const TapeItemWritten &lastEvent = **lastEventItor;
updateTape(conn, lastEvent.vid, lastEvent.fSeq, totalCompressedBytesWritten, lastEvent.tapeDrive);
// If we had only placeholders and no file recorded, we are done.
if (fileEvents.empty()) return;
// If we had only placeholders and no file recorded, we are done (but we still commit the update of the tape's fSeq).
if (fileEvents.empty()) {
conn.commit();
return;
}
// Create the archive file entries, skipping those that already exist
idempotentBatchInsertArchiveFiles(conn, fileEvents);
......
......@@ -360,8 +360,11 @@ void PostgresCatalogue::filesWrittenToTape(const std::set<TapeItemWrittenPointer
updateTape(conn, lastEvent.vid, lastEvent.fSeq, totalCompressedBytesWritten,
lastEvent.tapeDrive);
// If we had only placeholders and no file recorded, we are done.
if (fileEvents.empty()) return;
// If we had only placeholders and no file recorded, we are done (but we still commit the update of the tape's fSeq).
if (fileEvents.empty()) {
conn.commit();
return;
}
// Create the archive file entries, skipping those that already exist
// However we don't currently lock existing rows, so this transaction may
......
......@@ -27,12 +27,19 @@
#
# or:
#
# mysql://username:passord@hostname[:port]/database
#
# or:
#
# oracle:username/password@database
#
# or:
#
# postgresql:postgresql://username:password@hostname/database
#
# or:
#
# sqlite:filename
#
# PLEASE NOTE that the "in_memory" and "sqlite:" connection strings are for
# development and testing. Only the "oracle:" connection string should be used
# in production.
# development and testing purposes only.
......@@ -26,7 +26,9 @@ export EOS_AUTOLOAD_CONFIG=default
export EOS_BROKER_URL=root://DUMMY_HOST_TO_REPLACE:1097//eos/
# The EOS host geo location tag used to sort hosts into geographical (rack) locations
export EOS_GEOTAG="DUMMY_HOST_TO_REPLACE"
# Should not be longer than 8 characters now, otherwise we get:
# EOS_GEOTAG var contains a tag longer than the 8 chars maximum allowed
export EOS_GEOTAG="flat"
# The fully qualified hostname of MGM master1
export EOS_MGM_MASTER1=DUMMY_HOST_TO_REPLACE
......
0:eos-archive-4.4.30-1.el7.cern.x86_64
0:eos-cleanup-4.4.30-1.el7.cern.x86_64
0:eos-client-4.4.30-1.el7.cern.x86_64
0:eos-debuginfo-4.4.30-1.el7.cern.x86_64
0:eos-fuse-4.4.30-1.el7.cern.x86_64
0:eos-fuse-core-4.4.30-1.el7.cern.x86_64
0:eos-fuse-sysv-4.4.30-1.el7.cern.x86_64
0:eos-fusex-4.4.30-1.el7.cern.x86_64
0:eos-fusex-core-4.4.30-1.el7.cern.x86_64
0:eos-fusex-selinux-4.4.30-1.el7.cern.x86_64
0:eos-server-4.4.30-1.el7.cern.x86_64
0:eos-srm-4.4.30-1.el7.cern.x86_64
0:eos-test-4.4.30-1.el7.cern.x86_64
0:eos-testkeytab-4.4.30-1.el7.cern.x86_64
0:eos-archive-4.4.32-1.el7.cern.x86_64
0:eos-cleanup-4.4.32-1.el7.cern.x86_64
0:eos-client-4.4.32-1.el7.cern.x86_64
0:eos-debuginfo-4.4.32-1.el7.cern.x86_64
0:eos-fuse-4.4.32-1.el7.cern.x86_64
0:eos-fuse-core-4.4.32-1.el7.cern.x86_64
0:eos-fuse-sysv-4.4.32-1.el7.cern.x86_64
0:eos-fusex-4.4.32-1.el7.cern.x86_64
0:eos-fusex-core-4.4.32-1.el7.cern.x86_64
0:eos-fusex-selinux-4.4.32-1.el7.cern.x86_64
0:eos-server-4.4.32-1.el7.cern.x86_64
0:eos-srm-4.4.32-1.el7.cern.x86_64
0:eos-test-4.4.32-1.el7.cern.x86_64
0:eos-testkeytab-4.4.32-1.el7.cern.x86_64
1:python2-xrootd-4.9.0-1.el7.*
1:python3-xrootd-4.9.0-1.el7.*
1:xrootd-4.9.0-1.el7.*
......
......@@ -39,11 +39,13 @@ kubectl -n ${NAMESPACE} exec ctaeos -- yum-config-manager --disable cta-artifact
## AND NOT CTA-CI IF ONE BRANCH IS AHEAD OF EOS
####
# This is the commit repo: any commit from any branch in EOS is pushed there => works if lucky...
echo -e "[eos-ci-eos-commit]\nname=EOS CI commit repo for eos packages\nbaseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine/commit/el-7/x86_64/\npriority=3\ngpgcheck=0\nenabled=${COMMIT_REPO_ENABLED}\n\n" | kubectl -n ${NAMESPACE} exec -i ctaeos -- bash -c "cat > /etc/yum.repos.d/eos-ci-commit.repo"
#echo -e "[eos-ci-eos-commit]\nname=EOS CI commit repo for eos packages\nbaseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine/commit/el-7/x86_64/\npriority=3\ngpgcheck=0\nenabled=${COMMIT_REPO_ENABLED}\n\n" | kubectl -n ${NAMESPACE} exec -i ctaeos -- bash -c "cat > /etc/yum.repos.d/eos-ci-commit.repo"
# This is the koji testing repo: all tagged commits are going there.
# IF IT DOESN'T WORK WE CAN COMPLAIN HEAVILY
echo -e "[eos-ci-eos-tag]\nname=EOS koji testing repo for eos packages\nbaseurl=http://linuxsoft.cern.ch/internal/repos/eos7-testing/x86_64/os/\npriority=3\ngpgcheck=0\nenabled=${TAG_REPO_ENABLED}\n\n" | kubectl -n ${NAMESPACE} exec -i ctaeos -- bash -c "cat > /etc/yum.repos.d/eos-ci-tag.repo"
echo -e "[eos-ci-eos-depend]\nname=EOS CI repo for eos depend packages\nbaseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-7/x86_64/\npriority=3\ngpgcheck=0\nenabled=1\n\n" | kubectl -n ${NAMESPACE} exec -i ctaeos -- bash -c "cat > /etc/yum.repos.d/eos-ci-depend.repo"
#echo -e "[eos-ci-eos-tag]\nname=EOS koji testing repo for eos packages\nbaseurl=http://linuxsoft.cern.ch/internal/repos/eos7-testing/x86_64/os/\npriority=3\ngpgcheck=0\nenabled=${TAG_REPO_ENABLED}\n\n" | kubectl -n ${NAMESPACE} exec -i ctaeos -- bash -c "cat > /etc/yum.repos.d/eos-ci-tag.repo"
#echo -e "[eos-ci-eos-depend]\nname=EOS CI repo for eos depend packages\nbaseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-7/x86_64/\npriority=3\ngpgcheck=0\nenabled=1\n\n" | kubectl -n ${NAMESPACE} exec -i ctaeos -- bash -c "cat > /etc/yum.repos.d/eos-ci-depend.repo"
echo -e "[eos-ci-xrootd_latest]\nname=EOS compiled with latest xrootd from eos_xrdtest job in EOS CI\nbaseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine/tag/xrootd_latest/el-7/x86_64/\npriority=3\ngpgcheck=0\nenabled=${TAG_REPO_ENABLED}\n\n" | kubectl -n ${NAMESPACE} exec -i ctaeos -- bash -c "cat > /etc/yum.repos.d/eos-ci-tag.repo"
kubectl -n ${NAMESPACE} exec ctaeos -- eos version
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment