From 699b2addbe27580cf3850b6de57bbb64e5d2bb79 Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Fri, 1 Apr 2016 15:57:36 +0200
Subject: [PATCH] Removed minimum files and bytes from the use of mount group
within the catalogue
---
catalogue/CMakeLists.txt | 1 -
catalogue/Catalogue.hpp | 13 +-
catalogue/DummyCatalogue.cpp | 473 ------------------
catalogue/DummyCatalogue.hpp | 184 -------
catalogue/SqliteCatalogue.cpp | 36 +-
catalogue/SqliteCatalogue.hpp | 13 +-
catalogue/SqliteCatalogueTest.cpp | 56 +--
.../tape/tapeserver/daemon/ProcessForker.cpp | 4 +-
8 files changed, 30 insertions(+), 750 deletions(-)
delete mode 100644 catalogue/DummyCatalogue.cpp
delete mode 100644 catalogue/DummyCatalogue.hpp
diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt
index ba9a17c047..c8b7d05b77 100644
--- a/catalogue/CMakeLists.txt
+++ b/catalogue/CMakeLists.txt
@@ -24,7 +24,6 @@ set (CATALOGUE_LIB_SRC_FILES
Catalogue.cpp
ColumnNameToIdx.cpp
DbLogin.cpp
- DummyCatalogue.cpp
OcciConn.cpp
OcciEnv.cpp
OcciRset.cpp
diff --git a/catalogue/Catalogue.hpp b/catalogue/Catalogue.hpp
index d02b81362a..cbb780574a 100644
--- a/catalogue/Catalogue.hpp
+++ b/catalogue/Catalogue.hpp
@@ -138,9 +138,16 @@ public:
virtual void modifyUserMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup) = 0;
virtual void modifyUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &comment) = 0;
- virtual void createMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
- const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint64_t retrievePriority, const uint64_t minRetrieveFilesQueued,
- const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint64_t maxDrivesAllowed, const std::string &comment) = 0;
+ virtual void createMountGroup(
+ const cta::common::dataStructures::SecurityIdentity &cliIdentity,
+ const std::string &name,
+ const uint64_t archivePriority,
+ const uint64_t minArchiveRequestAge,
+ const uint64_t retrievePriority,
+ const uint64_t minRetrieveRequestAge,
+ const uint64_t maxDrivesAllowed,
+ const std::string &comment) = 0;
+
virtual void deleteMountGroup(const std::string &name) = 0;
virtual std::list<cta::common::dataStructures::MountGroup> getMountGroups() const = 0;
virtual void modifyMountGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) = 0;
diff --git a/catalogue/DummyCatalogue.cpp b/catalogue/DummyCatalogue.cpp
deleted file mode 100644
index 188b552099..0000000000
--- a/catalogue/DummyCatalogue.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2015 CERN
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "catalogue/DummyCatalogue.hpp"
-
-
-//------------------------------------------------------------------------------
-// destructor
-//------------------------------------------------------------------------------
-cta::catalogue::DummyCatalogue::~DummyCatalogue() {
-}
-
-//------------------------------------------------------------------------------
-// createBootstrapAdminAndHostNoAuth
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createBootstrapAdminAndHostNoAuth(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &hostName, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createAdminUser
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createAdminUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteAdminUser
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteAdminUser(const cta::common::dataStructures::UserIdentity &user) {}
-
-//------------------------------------------------------------------------------
-// getAdminUsers
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::AdminUser> cta::catalogue::DummyCatalogue::getAdminUsers() const { return std::list<cta::common::dataStructures::AdminUser>();}
-
-//------------------------------------------------------------------------------
-// modifyAdminUserComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyAdminUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createAdminHost
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createAdminHost(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteAdminHost
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteAdminHost(const std::string &hostName) {}
-
-//------------------------------------------------------------------------------
-// getAdminHosts
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::AdminHost> cta::catalogue::DummyCatalogue::getAdminHosts() const { return std::list<cta::common::dataStructures::AdminHost>();}
-
-//------------------------------------------------------------------------------
-// modifyAdminHostComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyAdminHostComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createStorageClass
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createStorageClass(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteStorageClass
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteStorageClass(const std::string &name) {}
-
-//------------------------------------------------------------------------------
-// getStorageClasses
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::StorageClass> cta::catalogue::DummyCatalogue::getStorageClasses() const { return std::list<cta::common::dataStructures::StorageClass>();}
-
-//------------------------------------------------------------------------------
-// modifyStorageClassNbCopies
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies) {}
-
-//------------------------------------------------------------------------------
-// modifyStorageClassComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyStorageClassComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createTapePool
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createTapePool(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes, const bool encryptionValue, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteTapePool
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteTapePool(const std::string &name) {}
-
-//------------------------------------------------------------------------------
-// getTapePools
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::TapePool> cta::catalogue::DummyCatalogue::getTapePools() const { return std::list<cta::common::dataStructures::TapePool>();}
-
-//------------------------------------------------------------------------------
-// modifyTapePoolNbPartialTapes
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes) {}
-
-//------------------------------------------------------------------------------
-// modifyTapePoolComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapePoolComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// setTapePoolEncryption
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::setTapePoolEncryption(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const bool encryptionValue) {}
-
-//------------------------------------------------------------------------------
-// createArchiveRoute
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteArchiveRoute
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb) {}
-
-//------------------------------------------------------------------------------
-// getArchiveRoutes
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::ArchiveRoute> cta::catalogue::DummyCatalogue::getArchiveRoutes() const { return std::list<cta::common::dataStructures::ArchiveRoute>();}
-
-//------------------------------------------------------------------------------
-// modifyArchiveRouteTapePoolName
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName) {}
-
-//------------------------------------------------------------------------------
-// modifyArchiveRouteComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createLogicalLibrary
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteLogicalLibrary
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteLogicalLibrary(const std::string &name) {}
-
-//------------------------------------------------------------------------------
-// getLogicalLibraries
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::LogicalLibrary> cta::catalogue::DummyCatalogue::getLogicalLibraries() const { return std::list<cta::common::dataStructures::LogicalLibrary>();}
-
-//------------------------------------------------------------------------------
-// modifyLogicalLibraryComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyLogicalLibraryComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createTape
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
- const std::string &encryptionKey, const uint64_t capacityInBytes, const bool disabledValue, const bool fullValue, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteTape
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteTape(const std::string &vid) {}
-
-//------------------------------------------------------------------------------
-// getTapes
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::Tape> cta::catalogue::DummyCatalogue::getTapes(const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
- const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue, const std::string &lbpValue) { return std::list<cta::common::dataStructures::Tape>();}
-
-//------------------------------------------------------------------------------
-// reclaimTape
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::reclaimTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeLogicalLibraryName
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeLogicalLibraryName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeTapePoolName
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeTapePoolName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &tapePoolName) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeCapacityInBytes
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeCapacityInBytes(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const uint64_t capacityInBytes) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeEncryptionKey
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeEncryptionKey(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &encryptionKey) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeLabelLog
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeLabelLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeLastWrittenLog
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeLastWrittenLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeLastReadLog
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeLastReadLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
-
-//------------------------------------------------------------------------------
-// setTapeBusy
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::setTapeBusy(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool busyValue) {}
-
-//------------------------------------------------------------------------------
-// setTapeFull
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::setTapeFull(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool fullValue) {}
-
-//------------------------------------------------------------------------------
-// setTapeDisabled
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::setTapeDisabled(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool disabledValue) {}
-
-//------------------------------------------------------------------------------
-// setTapeLbp
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::setTapeLbp(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool lbpValue) {}
-
-//------------------------------------------------------------------------------
-// modifyTapeComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyTapeComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createUser
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteUser
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteUser(const std::string &name, const std::string &group) {}
-
-//------------------------------------------------------------------------------
-// getUsers
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::User> cta::catalogue::DummyCatalogue::getUsers() const { return std::list<cta::common::dataStructures::User>();}
-
-//------------------------------------------------------------------------------
-// modifyUserMountGroup
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyUserMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup) {}
-
-//------------------------------------------------------------------------------
-// modifyUserComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createMountGroup
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
- const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint64_t retrievePriority, const uint64_t minRetrieveFilesQueued,
- const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint64_t maxDrivesAllowed, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteMountGroup
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteMountGroup(const std::string &name) {}
-
-//------------------------------------------------------------------------------
-// getMountGroups
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::MountGroup> cta::catalogue::DummyCatalogue::getMountGroups() const { return std::list<cta::common::dataStructures::MountGroup>();}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupArchivePriority
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupArchiveMinFilesQueued
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupArchiveMinBytesQueued
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupArchiveMinRequestAge
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupRetrievePriority
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupRetrieveMinFilesQueued
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupRetrieveMinBytesQueued
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupRetrieveMinRequestAge
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupMaxDrivesAllowed
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed) {}
-
-//------------------------------------------------------------------------------
-// modifyMountGroupComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyMountGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// createDedication
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::createDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType, const std::string &mountGroup,
- const std::string &tag, const std::string &vid, const uint64_t fromTimestamp, const uint64_t untilTimestamp,const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// deleteDedication
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::deleteDedication(const std::string &drivename) {}
-
-//------------------------------------------------------------------------------
-// getDedications
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::Dedication> cta::catalogue::DummyCatalogue::getDedications() const { return std::list<cta::common::dataStructures::Dedication>();}
-
-//------------------------------------------------------------------------------
-// modifyDedicationType
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyDedicationType(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType) {}
-
-//------------------------------------------------------------------------------
-// modifyDedicationMountGroup
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyDedicationMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &mountGroup) {}
-
-//------------------------------------------------------------------------------
-// modifyDedicationTag
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyDedicationTag(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &tag) {}
-
-//------------------------------------------------------------------------------
-// modifyDedicationVid
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyDedicationVid(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &vid) {}
-
-//------------------------------------------------------------------------------
-// modifyDedicationFrom
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyDedicationFrom(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t fromTimestamp) {}
-
-//------------------------------------------------------------------------------
-// modifyDedicationUntil
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyDedicationUntil(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t untilTimestamp) {}
-
-//------------------------------------------------------------------------------
-// modifyDedicationComment
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::modifyDedicationComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &comment) {}
-
-//------------------------------------------------------------------------------
-// getArchiveFiles
-//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::ArchiveFile> cta::catalogue::DummyCatalogue::getArchiveFiles(const uint64_t id, const std::string &eosid,
- const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) {
- return std::list<cta::common::dataStructures::ArchiveFile>();
-}
-
-//------------------------------------------------------------------------------
-// getArchiveFileSummary
-//------------------------------------------------------------------------------
-cta::common::dataStructures::ArchiveFileSummary cta::catalogue::DummyCatalogue::getArchiveFileSummary(const uint64_t id, const std::string &eosid,
- const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) {
- return cta::common::dataStructures::ArchiveFileSummary();
-}
-
-//------------------------------------------------------------------------------
-// getArchiveFileById
-//------------------------------------------------------------------------------
-cta::common::dataStructures::ArchiveFile cta::catalogue::DummyCatalogue::getArchiveFileById(const uint64_t id){
- return cta::common::dataStructures::ArchiveFile();
-}
-
-//------------------------------------------------------------------------------
-// setDriveStatus
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::setDriveStatus(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &driveName, const bool up, const bool force) {}
-
-//------------------------------------------------------------------------------
-// fileWrittenToTape
-//------------------------------------------------------------------------------
-void cta::catalogue::DummyCatalogue::fileWrittenToTape(
- const cta::common::dataStructures::ArchiveRequest &archiveRequest,
- const cta::common::dataStructures::TapeFileLocation &tapeFileLocation) {
-}
-
-//------------------------------------------------------------------------------
-// prepareForNewFile
-//------------------------------------------------------------------------------
-cta::common::dataStructures::ArchiveFileQueueCriteria
- cta::catalogue::DummyCatalogue::prepareForNewFile(
- const std::string &storageClass, const std::string &user) {
- return common::dataStructures::ArchiveFileQueueCriteria();
-}
-
-//------------------------------------------------------------------------------
-// getTapeCopyToPoolMap
-//------------------------------------------------------------------------------
-cta::common::dataStructures::TapeCopyToPoolMap cta::catalogue::DummyCatalogue::
- getTapeCopyToPoolMap(const std::string &storageClass) const {
- return cta::common::dataStructures::TapeCopyToPoolMap();
-}
-
-//------------------------------------------------------------------------------
-// getArchiveMountPolicy
-//------------------------------------------------------------------------------
-cta::common::dataStructures::MountPolicy cta::catalogue::DummyCatalogue::
- getArchiveMountPolicy(const std::string &user) const {
- return cta::common::dataStructures::MountPolicy();
-}
-
-//------------------------------------------------------------------------------
-// getRetrieveMountPolicy
-//------------------------------------------------------------------------------
-cta::common::dataStructures::MountPolicy cta::catalogue::DummyCatalogue::
- getRetrieveMountPolicy(const std::string &user) const {
- return cta::common::dataStructures::MountPolicy();
-}
-
-//------------------------------------------------------------------------------
-// isAdmin
-//------------------------------------------------------------------------------
-bool cta::catalogue::DummyCatalogue::isAdmin(
- const common::dataStructures::SecurityIdentity &cliIdentity) const {
- return true;
-}
diff --git a/catalogue/DummyCatalogue.hpp b/catalogue/DummyCatalogue.hpp
deleted file mode 100644
index 6e839d420b..0000000000
--- a/catalogue/DummyCatalogue.hpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2015 CERN
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "catalogue/Catalogue.hpp"
-
-namespace cta {
-namespace catalogue {
-
-/**
- * Dummy CTA catalogue to facilitate unit testing.
- */
-class DummyCatalogue: public Catalogue {
-public:
-
- /**
- * Destructor.
- */
- virtual ~DummyCatalogue();
-
- virtual void createBootstrapAdminAndHostNoAuth(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &hostName, const std::string &comment);
-
- virtual void createAdminUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment);
- virtual void deleteAdminUser(const cta::common::dataStructures::UserIdentity &user);
- virtual std::list<cta::common::dataStructures::AdminUser> getAdminUsers() const;
- virtual void modifyAdminUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment);
-
- virtual void createAdminHost(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment);
- virtual void deleteAdminHost(const std::string &hostName);
- virtual std::list<cta::common::dataStructures::AdminHost> getAdminHosts() const;
- virtual void modifyAdminHostComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment);
-
- virtual void createStorageClass(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies, const std::string &comment);
- virtual void deleteStorageClass(const std::string &name);
- virtual std::list<cta::common::dataStructures::StorageClass> getStorageClasses() const;
- virtual void modifyStorageClassNbCopies(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies);
- virtual void modifyStorageClassComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
-
- virtual void createTapePool(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes, const bool encryptionValue, const std::string &comment);
- virtual void deleteTapePool(const std::string &name);
- virtual std::list<cta::common::dataStructures::TapePool> getTapePools() const;
- virtual void modifyTapePoolNbPartialTapes(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes);
- virtual void modifyTapePoolComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
- virtual void setTapePoolEncryption(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const bool encryptionValue);
-
- virtual void createArchiveRoute(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName, const std::string &comment);
- virtual void deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb);
- virtual std::list<cta::common::dataStructures::ArchiveRoute> getArchiveRoutes() const;
- virtual void modifyArchiveRouteTapePoolName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName);
- virtual void modifyArchiveRouteComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment);
-
- virtual void createLogicalLibrary(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
- virtual void deleteLogicalLibrary(const std::string &name);
- virtual std::list<cta::common::dataStructures::LogicalLibrary> getLogicalLibraries() const;
- virtual void modifyLogicalLibraryComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
-
- virtual void createTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
- const std::string &encryptionKey, const uint64_t capacityInBytes, const bool disabledValue, const bool fullValue, const std::string &comment);
- virtual void deleteTape(const std::string &vid);
- virtual std::list<cta::common::dataStructures::Tape> getTapes(const std::string &vid, const std::string &logicalLibraryName, const std::string &tapePoolName,
- const std::string &capacityInBytes, const std::string &disabledValue, const std::string &fullValue, const std::string &busyValue, const std::string &lbpValue);
- virtual void reclaimTape(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid);
- virtual void modifyTapeLogicalLibraryName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName);
- virtual void modifyTapeTapePoolName(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &tapePoolName);
- virtual void modifyTapeCapacityInBytes(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const uint64_t capacityInBytes);
- virtual void modifyTapeEncryptionKey(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &encryptionKey);
- virtual void modifyTapeLabelLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp); // internal function (noCLI)
- virtual void modifyTapeLastWrittenLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp); // internal function (noCLI)
- virtual void modifyTapeLastReadLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp); // internal function (noCLI)
- virtual void setTapeBusy(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool busyValue); // internal function not exposed to the Admin CLI
- virtual void setTapeFull(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool fullValue);
- virtual void setTapeDisabled(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool disabledValue);
- virtual void setTapeLbp(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool lbpValue); // internal function (noCLI)
- virtual void modifyTapeComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &comment);
-
- virtual void createUser(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup, const std::string &comment);
- virtual void deleteUser(const std::string &name, const std::string &group);
- virtual std::list<cta::common::dataStructures::User> getUsers() const;
- virtual void modifyUserMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup);
- virtual void modifyUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &comment);
-
- virtual void createMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
- const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint64_t retrievePriority, const uint64_t minRetrieveFilesQueued,
- const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint64_t maxDrivesAllowed, const std::string &comment);
- virtual void deleteMountGroup(const std::string &name);
- virtual std::list<cta::common::dataStructures::MountGroup> getMountGroups() const;
- virtual void modifyMountGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority);
- virtual void modifyMountGroupArchiveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued);
- virtual void modifyMountGroupArchiveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveBytesQueued);
- virtual void modifyMountGroupArchiveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge);
- virtual void modifyMountGroupRetrievePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority);
- virtual void modifyMountGroupRetrieveMinFilesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued);
- virtual void modifyMountGroupRetrieveMinBytesQueued(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveBytesQueued);
- virtual void modifyMountGroupRetrieveMinRequestAge(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge);
- virtual void modifyMountGroupMaxDrivesAllowed(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed);
- virtual void modifyMountGroupComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment);
-
- virtual void createDedication(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType, const std::string &mountGroup,
- const std::string &tag, const std::string &vid, const uint64_t fromTimestamp, const uint64_t untilTimestamp,const std::string &comment);
- virtual void deleteDedication(const std::string &drivename);
- virtual std::list<cta::common::dataStructures::Dedication> getDedications() const;
- virtual void modifyDedicationType(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType);
- virtual void modifyDedicationMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &mountGroup);
- virtual void modifyDedicationTag(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &tag);
- virtual void modifyDedicationVid(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &vid);
- virtual void modifyDedicationFrom(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t fromTimestamp);
- virtual void modifyDedicationUntil(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t untilTimestamp);
- virtual void modifyDedicationComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &comment);
-
- virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const uint64_t id, const std::string &eosid,
- const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path);
- virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const uint64_t id, const std::string &eosid,
- const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path);
- virtual cta::common::dataStructures::ArchiveFile getArchiveFileById(const uint64_t id);
-
- virtual void setDriveStatus(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &driveName, const bool up, const bool force);
-
- /**
- * Notifies the catalogue that a file has been written to tape.
- *
- * @param archiveRequest The identifier of the archive file.
- *
- */
- virtual void fileWrittenToTape(
- const cta::common::dataStructures::ArchiveRequest &archiveRequest,
- const cta::common::dataStructures::TapeFileLocation &tapeFileLocation);
-
- /**
- * Prepares the catalogue for a new archive file and returns the information
- * required to queue the associated archive request.
- *
- * @param storageClass The storage class of the file to be archived. This
- * will be used by the Catalogue to determine the destinate tape pool for
- * each tape copy.
- * @param user The user for whom the file is to be archived. This will be
- * used by the Catalogue to determine the mount policy to be used when
- * archiving the file.
- * @return The information required to queue the associated archive request.
- */
- virtual cta::common::dataStructures::ArchiveFileQueueCriteria
- prepareForNewFile(const std::string &storageClass, const std::string &user);
-
- virtual cta::common::dataStructures::TapeCopyToPoolMap getTapeCopyToPoolMap(const std::string &storageClass) const;
-
- /**
- * Returns the archive mount policy for the specified end user.
- *
- * @param user The name of the end user.
- * @return The archive mount policy.
- */
- virtual cta::common::dataStructures::MountPolicy getArchiveMountPolicy(
- const std::string &user) const;
-
- /**
- * Returns the retrieve mount policy for the specified end user.
- *
- * @param user The name of the end user.
- * @return The retrieve mount policy.
- */
- virtual cta::common::dataStructures::MountPolicy getRetrieveMountPolicy(
- const std::string &user) const;
-
- virtual bool isAdmin(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const;
-
-}; // class DummyCatalogue
-
-} // namespace catalogue
-} // namespace cta
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index ec30fe99c8..5eb0292b3a 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -1537,12 +1537,8 @@ void cta::catalogue::SqliteCatalogue::createMountGroup(
const common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &name,
const uint64_t archivePriority,
- const uint64_t minArchiveFilesQueued,
- const uint64_t minArchiveBytesQueued,
const uint64_t minArchiveRequestAge,
const uint64_t retrievePriority,
- const uint64_t minRetrieveFilesQueued,
- const uint64_t minRetrieveBytesQueued,
const uint64_t minRetrieveRequestAge,
const uint64_t maxDrivesAllowed,
const std::string &comment) {
@@ -1552,13 +1548,9 @@ void cta::catalogue::SqliteCatalogue::createMountGroup(
"MOUNT_GROUP_NAME,"
"ARCHIVE_PRIORITY,"
- "MIN_ARCHIVE_FILES_QUEUED,"
- "MIN_ARCHIVE_BYTES_QUEUED,"
"MIN_ARCHIVE_REQUEST_AGE,"
"RETRIEVE_PRIORITY,"
- "MIN_RETRIEVE_FILES_QUEUED,"
- "MIN_RETRIEVE_BYTES_QUEUED,"
"MIN_RETRIEVE_REQUEST_AGE,"
"MAX_DRIVES_ALLOWED,"
@@ -1578,13 +1570,9 @@ void cta::catalogue::SqliteCatalogue::createMountGroup(
":MOUNT_GROUP_NAME,"
":ARCHIVE_PRIORITY,"
- ":MIN_ARCHIVE_FILES_QUEUED,"
- ":MIN_ARCHIVE_BYTES_QUEUED,"
":MIN_ARCHIVE_REQUEST_AGE,"
":RETRIEVE_PRIORITY,"
- ":MIN_RETRIEVE_FILES_QUEUED,"
- ":MIN_RETRIEVE_BYTES_QUEUED,"
":MIN_RETRIEVE_REQUEST_AGE,"
":MAX_DRIVES_ALLOWED,"
@@ -1605,13 +1593,9 @@ void cta::catalogue::SqliteCatalogue::createMountGroup(
stmt->bind(":MOUNT_GROUP_NAME", name);
stmt->bind(":ARCHIVE_PRIORITY", archivePriority);
- stmt->bind(":MIN_ARCHIVE_FILES_QUEUED", minArchiveFilesQueued);
- stmt->bind(":MIN_ARCHIVE_BYTES_QUEUED", minArchiveBytesQueued);
stmt->bind(":MIN_ARCHIVE_REQUEST_AGE", minArchiveRequestAge);
stmt->bind(":RETRIEVE_PRIORITY", retrievePriority);
- stmt->bind(":MIN_RETRIEVE_FILES_QUEUED", minRetrieveFilesQueued);
- stmt->bind(":MIN_RETRIEVE_BYTES_QUEUED", minRetrieveBytesQueued);
stmt->bind(":MIN_RETRIEVE_REQUEST_AGE", minRetrieveRequestAge);
stmt->bind(":MAX_DRIVES_ALLOWED", maxDrivesAllowed);
@@ -1641,15 +1625,11 @@ std::list<cta::common::dataStructures::MountGroup>
"SELECT "
"MOUNT_GROUP_NAME AS MOUNT_GROUP_NAME,"
- "ARCHIVE_PRIORITY AS ARCHIVE_PRIORITY,"
- "MIN_ARCHIVE_FILES_QUEUED AS MIN_ARCHIVE_FILES_QUEUED,"
- "MIN_ARCHIVE_BYTES_QUEUED AS MIN_ARCHIVE_BYTES_QUEUED,"
- "MIN_ARCHIVE_REQUEST_AGE AS MIN_ARCHIVE_REQUEST_AGE,"
+ "ARCHIVE_PRIORITY AS ARCHIVE_PRIORITY,"
+ "MIN_ARCHIVE_REQUEST_AGE AS MIN_ARCHIVE_REQUEST_AGE,"
- "RETRIEVE_PRIORITY AS RETRIEVE_PRIORITY,"
- "MIN_RETRIEVE_FILES_QUEUED AS MIN_RETRIEVE_FILES_QUEUED,"
- "MIN_RETRIEVE_BYTES_QUEUED AS MIN_RETRIEVE_BYTES_QUEUED,"
- "MIN_RETRIEVE_REQUEST_AGE AS MIN_RETRIEVE_REQUEST_AGE,"
+ "RETRIEVE_PRIORITY AS RETRIEVE_PRIORITY,"
+ "MIN_RETRIEVE_REQUEST_AGE AS MIN_RETRIEVE_REQUEST_AGE,"
"MAX_DRIVES_ALLOWED AS MAX_DRIVES_ALLOWED,"
@@ -1676,19 +1656,11 @@ std::list<cta::common::dataStructures::MountGroup>
group.name = stmt->columnText(nameToIdx["MOUNT_GROUP_NAME"]);
group.archive_priority = stmt->columnUint64(nameToIdx["ARCHIVE_PRIORITY"]);
- group.archive_minFilesQueued =
- stmt->columnUint64(nameToIdx["MIN_ARCHIVE_FILES_QUEUED"]);
- group.archive_minBytesQueued =
- stmt->columnUint64(nameToIdx["MIN_ARCHIVE_BYTES_QUEUED"]);
group.archive_minRequestAge =
stmt->columnUint64(nameToIdx["MIN_ARCHIVE_REQUEST_AGE"]);
group.retrieve_priority =
stmt->columnUint64(nameToIdx["RETRIEVE_PRIORITY"]);
- group.retrieve_minFilesQueued =
- stmt->columnUint64(nameToIdx["MIN_RETRIEVE_FILES_QUEUED"]);
- group.retrieve_minBytesQueued =
- stmt->columnUint64(nameToIdx["MIN_RETRIEVE_BYTES_QUEUED"]);
group.retrieve_minRequestAge =
stmt->columnUint64(nameToIdx["MIN_RETRIEVE_REQUEST_AGE"]);
diff --git a/catalogue/SqliteCatalogue.hpp b/catalogue/SqliteCatalogue.hpp
index 30f23b81fc..24e19ed965 100644
--- a/catalogue/SqliteCatalogue.hpp
+++ b/catalogue/SqliteCatalogue.hpp
@@ -102,9 +102,16 @@ public:
virtual void modifyUserMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &mountGroup);
virtual void modifyUserComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &group, const std::string &comment);
- virtual void createMountGroup(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority, const uint64_t minArchiveFilesQueued,
- const uint64_t minArchiveBytesQueued, const uint64_t minArchiveRequestAge, const uint64_t retrievePriority, const uint64_t minRetrieveFilesQueued,
- const uint64_t minRetrieveBytesQueued, const uint64_t minRetrieveRequestAge, const uint64_t maxDrivesAllowed, const std::string &comment);
+ virtual void createMountGroup(
+ const cta::common::dataStructures::SecurityIdentity &cliIdentity,
+ const std::string &name,
+ const uint64_t archivePriority,
+ const uint64_t minArchiveRequestAge,
+ const uint64_t retrievePriority,
+ const uint64_t minRetrieveRequestAge,
+ const uint64_t maxDrivesAllowed,
+ const std::string &comment);
+
virtual void deleteMountGroup(const std::string &name);
virtual std::list<cta::common::dataStructures::MountGroup> getMountGroups() const;
virtual void modifyMountGroupArchivePriority(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority);
diff --git a/catalogue/SqliteCatalogueTest.cpp b/catalogue/SqliteCatalogueTest.cpp
index 93e1dfc8b5..64369b505c 100644
--- a/catalogue/SqliteCatalogueTest.cpp
+++ b/catalogue/SqliteCatalogueTest.cpp
@@ -651,26 +651,18 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createMountGroup) {
const std::string name = "mount_group";
const uint64_t archivePriority = 1;
- const uint64_t minArchiveFilesQueued = 2;
- const uint64_t minArchiveBytesQueued = 3;
- const uint64_t minArchiveRequestAge = 4;
- const uint64_t retrievePriority = 5;
- const uint64_t minRetrieveFilesQueued = 6;
- const uint64_t minRetrieveBytesQueued = 7;
- const uint64_t minRetrieveRequestAge = 8;
- const uint64_t maxDrivesAllowed = 9;
+ const uint64_t minArchiveRequestAge = 2;
+ const uint64_t retrievePriority = 3;
+ const uint64_t minRetrieveRequestAge = 4;
+ const uint64_t maxDrivesAllowed = 5;
const std::string &comment = "create mount group";
catalogue.createMountGroup(
m_cliSI,
name,
archivePriority,
- minArchiveFilesQueued,
- minArchiveBytesQueued,
minArchiveRequestAge,
retrievePriority,
- minRetrieveFilesQueued,
- minRetrieveBytesQueued,
minRetrieveRequestAge,
maxDrivesAllowed,
comment);
@@ -685,13 +677,9 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createMountGroup) {
ASSERT_EQ(name, group.name);
ASSERT_EQ(archivePriority, group.archive_priority);
- ASSERT_EQ(minArchiveFilesQueued, group.archive_minFilesQueued);
- ASSERT_EQ(minArchiveBytesQueued, group.archive_minBytesQueued);
ASSERT_EQ(minArchiveRequestAge, group.archive_minRequestAge);
ASSERT_EQ(retrievePriority, group.retrieve_priority);
- ASSERT_EQ(minRetrieveFilesQueued, group.retrieve_minFilesQueued);
- ASSERT_EQ(minRetrieveBytesQueued, group.retrieve_minBytesQueued);
ASSERT_EQ(minRetrieveRequestAge, group.retrieve_minRequestAge);
ASSERT_EQ(maxDrivesAllowed, group.maxDrivesAllowed);
@@ -717,12 +705,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createMountGroup_same_twice) {
const std::string name = "mount_group";
const uint64_t archivePriority = 1;
- const uint64_t minArchiveFilesQueued = 2;
- const uint64_t minArchiveBytesQueued = 3;
const uint64_t minArchiveRequestAge = 4;
const uint64_t retrievePriority = 5;
- const uint64_t minRetrieveFilesQueued = 6;
- const uint64_t minRetrieveBytesQueued = 7;
const uint64_t minRetrieveRequestAge = 8;
const uint64_t maxDrivesAllowed = 9;
const std::string &comment = "create mount group";
@@ -731,12 +715,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createMountGroup_same_twice) {
m_cliSI,
name,
archivePriority,
- minArchiveFilesQueued,
- minArchiveBytesQueued,
minArchiveRequestAge,
retrievePriority,
- minRetrieveFilesQueued,
- minRetrieveBytesQueued,
minRetrieveRequestAge,
maxDrivesAllowed,
comment);
@@ -745,12 +725,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createMountGroup_same_twice) {
m_cliSI,
name,
archivePriority,
- minArchiveFilesQueued,
- minArchiveBytesQueued,
minArchiveRequestAge,
retrievePriority,
- minRetrieveFilesQueued,
- minRetrieveBytesQueued,
minRetrieveRequestAge,
maxDrivesAllowed,
comment), exception::Exception);
@@ -765,12 +741,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createUser) {
const std::string mountGroupName = "mount_group";
const uint64_t archivePriority = 1;
- const uint64_t minArchiveFilesQueued = 2;
- const uint64_t minArchiveBytesQueued = 3;
const uint64_t minArchiveRequestAge = 4;
const uint64_t retrievePriority = 5;
- const uint64_t minRetrieveFilesQueued = 6;
- const uint64_t minRetrieveBytesQueued = 7;
const uint64_t minRetrieveRequestAge = 8;
const uint64_t maxDrivesAllowed = 9;
@@ -778,12 +750,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createUser) {
m_cliSI,
mountGroupName,
archivePriority,
- minArchiveFilesQueued,
- minArchiveBytesQueued,
minArchiveRequestAge,
retrievePriority,
- minRetrieveFilesQueued,
- minRetrieveBytesQueued,
minRetrieveRequestAge,
maxDrivesAllowed,
"create mount group");
@@ -811,8 +779,6 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createUser) {
catalogue.getArchiveMountPolicy(userName);
ASSERT_EQ(archivePriority, archivePolicy.priority);
- ASSERT_EQ(minArchiveFilesQueued, archivePolicy.minFilesQueued);
- ASSERT_EQ(minArchiveBytesQueued, archivePolicy.minBytesQueued);
ASSERT_EQ(minArchiveRequestAge, archivePolicy.minRequestAge);
ASSERT_EQ(maxDrivesAllowed, archivePolicy.maxDrives);
@@ -820,8 +786,6 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createUser) {
catalogue.getRetrieveMountPolicy(userName);
ASSERT_EQ(retrievePriority, retrievePolicy.priority);
- ASSERT_EQ(minRetrieveFilesQueued, retrievePolicy.minFilesQueued);
- ASSERT_EQ(minRetrieveBytesQueued, retrievePolicy.minBytesQueued);
ASSERT_EQ(minRetrieveRequestAge, retrievePolicy.minRequestAge);
ASSERT_EQ(maxDrivesAllowed, retrievePolicy.maxDrives);
}
@@ -835,12 +799,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createUser_same_twice) {
const std::string mountGroupName = "mount_group";
const uint64_t archivePriority = 1;
- const uint64_t minArchiveFilesQueued = 2;
- const uint64_t minArchiveBytesQueued = 3;
const uint64_t minArchiveRequestAge = 4;
const uint64_t retrievePriority = 5;
- const uint64_t minRetrieveFilesQueued = 6;
- const uint64_t minRetrieveBytesQueued = 7;
const uint64_t minRetrieveRequestAge = 8;
const uint64_t maxDrivesAllowed = 9;
@@ -848,12 +808,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createUser_same_twice) {
m_cliSI,
mountGroupName,
archivePriority,
- minArchiveFilesQueued,
- minArchiveBytesQueued,
minArchiveRequestAge,
retrievePriority,
- minRetrieveFilesQueued,
- minRetrieveBytesQueued,
minRetrieveRequestAge,
maxDrivesAllowed,
"create mount group");
@@ -965,12 +921,8 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, prepareForNewFile) {
m_cliSI,
mountGroupName,
archivePriority,
- minArchiveFilesQueued,
- minArchiveBytesQueued,
minArchiveRequestAge,
retrievePriority,
- minRetrieveFilesQueued,
- minRetrieveBytesQueued,
minRetrieveRequestAge,
maxDrivesAllowed,
"create mount group");
diff --git a/tapeserver/castor/tape/tapeserver/daemon/ProcessForker.cpp b/tapeserver/castor/tape/tapeserver/daemon/ProcessForker.cpp
index 445606aa47..081c470d7d 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/ProcessForker.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/ProcessForker.cpp
@@ -47,7 +47,7 @@
#include "castor/tape/tapeserver/daemon/ProcessForkerUtils.hpp"
#include "castor/utils/SmartArrayPtr.hpp"
#include "castor/utils/utils.hpp"
-#include "catalogue/DummyCatalogue.hpp"
+#include "catalogue/SqliteCatalogue.hpp"
#include "objectstore/BackendVFS.hpp"
#include "objectstore/BackendFactory.hpp"
#include "objectstore/RootEntry.hpp"
@@ -569,7 +569,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
} catch (std::bad_cast &){}
cta::objectstore::BackendPopulator backendPopulator(*backend);
cta::OStoreDBWithAgent osdb(*backend, backendPopulator.getAgent());
- cta::catalogue::DummyCatalogue catalogue;
+ cta::catalogue::SqliteCatalogue catalogue;
cta::Scheduler scheduler(catalogue, osdb);
castor::tape::System::realWrapper sysWrapper;
--
GitLab