Commit 24e2c845 authored by Cedric Caffy's avatar Cedric Caffy
Browse files

[cta-admin] Corrected the showqueues command in the case ArchiveForUser and...

[cta-admin] Corrected the showqueues command in the case ArchiveForUser and ArchiveForRepack exist for the same tapepool
parent e55c7642
......@@ -9,6 +9,10 @@ This release contains an improvement allowing to fetch the EOS free space via an
- Upgraded EOS to 4.8.26-1
- cta/CTA#907 For backpressure, the EOS free space can be fetched by calling an external script
### Bug fixes
- cta/CTA#917 Corrected the bug in the cta-admin showqueues command in the case ArchiveForUser and ArchiveForRepack exist for the same tapepool
# v3.1-8
## Summary
......
......@@ -30,9 +30,9 @@ QueueAndMountSummary &QueueAndMountSummary::getOrCreateEntry(std::list<QueueAndM
const common::dataStructures::VidToTapeMap &vid_to_tapeinfo)
{
for (auto & summary: summaryList) {
if (((mountType==MountType::ArchiveForUser || mountType==MountType::ArchiveForRepack) && summary.tapePool==tapePool) ||
(mountType==MountType::Retrieve && summary.vid==vid))
if((summary.tapePool == tapePool && summary.mountType == mountType) || (summary.vid == vid && mountType == MountType::Retrieve)) {
return summary;
}
}
if (std::set<MountType>({MountType::ArchiveForUser, MountType::Retrieve, MountType::ArchiveForRepack}).count(mountType)) {
summaryList.push_back(QueueAndMountSummary());
......
......@@ -133,7 +133,7 @@ if [ ! -z $BACKPRESSURE_TEST ]; then
echo "Backpressure test: setting too high free space requirements"
# This should be idempotent as we will be called several times
if [[ $( admin_cta --json ds ls | jq '.[] | select(.name=="repackBuffer") | .name') != '"repackBuffer"' ]]; then
admin_cta ds add -n repackBuffer -r "root://${EOSINSTANCE}/${REPACK_BUFFER_BASEDIR}" -u "eos:${EOSINSTANCE}:default" -i 5 -f 111222333444555 -s 60 -m toto
admin_cta ds add -n repackBuffer -r "root://${EOSINSTANCE}/${REPACK_BUFFER_BASEDIR}" -u "eos:${EOSINSTANCE}:default" -i 5 -f 111222333444555 -s 20 -m toto
else
echo "Disk system repackBuffer alread defined. Ensuring too high free space requirements."
admin_cta ds ch -n repackBuffer -f 111222333444555
......
......@@ -493,6 +493,7 @@ Currently contains a helper for the client-ar script, which should be installed
* Wed Nov 04 2020 julien.leduc (at) cern.ch - 3.1-9
- Upstream EOS 4.8.26-1
- cta/CTA#907 For backpressure, the EOS free space can be fetched by calling an external script
- cta/CTA#917 Corrected the bug in the cta-admin showqueues command in the case ArchiveForUser and ArchiveForRepack exist for the same tapepool
* Fri Oct 22 2020 julien.leduc (at) cern.ch - 3.1-8
- CTA software Recommended Access Order (RAO) implemented for LTO drives
- cta-admin repack ls tabular output improvements
......
......@@ -249,7 +249,9 @@ void OStoreDB::fetchMountInfo(SchedulerDatabase::TapeMountDecisionInfo& tmdi, Ro
.add("queueLockTime", queueLockTime)
.add("queueFetchTime", queueFetchTime)
.add("processingTime", processingTime);
logContext.log(log::INFO, "In OStoreDB::fetchMountInfo(): fetched an archive for user queue.");
if(queueLockTime > 1 || queueFetchTime > 1) {
logContext.log(log::WARNING, "In OStoreDB::fetchMountInfo(): fetched an archive for user queue and that lasted more than 1 second.");
}
}
// Walk the archive queues for REPACK for statistics
for (auto & aqp: re.dumpArchiveQueues(JobQueueType::JobsToTransferForRepack)) {
......@@ -308,7 +310,9 @@ void OStoreDB::fetchMountInfo(SchedulerDatabase::TapeMountDecisionInfo& tmdi, Ro
.add("queueLockTime", queueLockTime)
.add("queueFetchTime", queueFetchTime)
.add("processingTime", processingTime);
logContext.log(log::INFO, "In OStoreDB::fetchMountInfo(): fetched an archive for repack queue.");
if(queueLockTime > 1 || queueFetchTime > 1) {
logContext.log(log::WARNING, "In OStoreDB::fetchMountInfo(): fetched an archive for repack queue and that lasted more than 1 second.");
}
}
// Walk the retrieve queues for statistics
for (auto & rqp: re.dumpRetrieveQueues(JobQueueType::JobsToTransferForUser)) {
......
Markdown is supported
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