diff --git a/common/exception/NotImplementedException.hpp b/common/exception/NotImplementedException.hpp index 5acc4c21969a04e6f66d325855499c55443ad3f7..cd927b9dbf8139c22da09ff7bfc721f0fbeebed3 100644 --- a/common/exception/NotImplementedException.hpp +++ b/common/exception/NotImplementedException.hpp @@ -28,7 +28,7 @@ namespace cta::exception { */ class NotImplementedException : public cta::exception::Exception { public: - NotImplementedException(const std::string& what = "", + NotImplementedException([[maybe_unused]] const std::string& what = "", const std::source_location loc = std::source_location::current()) : cta::exception::Exception(makeMessage(what, loc)) {} diff --git a/disk/DiskSystem.cpp b/disk/DiskSystem.cpp index 00aaf465a0bb4eb901b831cef0fca315a27f9e71..44cc5e483a904a064a119e43d83a159f51811d68 100644 --- a/disk/DiskSystem.cpp +++ b/disk/DiskSystem.cpp @@ -160,7 +160,7 @@ void DiskSystemFreeSpaceList::fetchDiskSystemFreeSpace(const std::setgetRequesterActivityMountRules()) {} diff --git a/frontend/common/ActivityMountRuleLsResponseStream.hpp b/frontend/common/ActivityMountRuleLsResponseStream.hpp index a64ed07031c23f1e8dcc4589c3cc2738776e89f1..6f41cefe9d66f6959fe9845c187297668d234bce 100644 --- a/frontend/common/ActivityMountRuleLsResponseStream.hpp +++ b/frontend/common/ActivityMountRuleLsResponseStream.hpp @@ -29,8 +29,7 @@ class ActivityMountRuleLsResponseStream final : public CtaAdminResponseStream { public: ActivityMountRuleLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/AdminCmd.cpp b/frontend/common/AdminCmd.cpp index 41f798b988f49cab42b197ef4dcb6766fb522d9d..d1e56d49ec630ffdf000b959dd741d4f9450be46 100644 --- a/frontend/common/AdminCmd.cpp +++ b/frontend/common/AdminCmd.cpp @@ -534,7 +534,7 @@ void AdminCmd::processDrive_Rm(xrd::Response& response) { tapeDrive.driveStatus == common::dataStructures::DriveStatus::Unknown || has_flag(OptionBoolean::FORCE)) { - m_scheduler.removeDrive(m_cliIdentity, tapeDriveName, m_lc); + m_scheduler.removeDrive(tapeDriveName, m_lc); cmdlineOutput << "Drive " << tapeDriveName << " removed" << (has_flag(OptionBoolean::FORCE) ? " (forced)." : ".") << std::endl; } else { diff --git a/frontend/common/AdminLsResponseStream.cpp b/frontend/common/AdminLsResponseStream.cpp index d0b872b776ea1f6bcce8db68bc3b2935cd03d726..27a78175713d40f7e3ac03a58b7c11f2a291e8a7 100644 --- a/frontend/common/AdminLsResponseStream.cpp +++ b/frontend/common/AdminLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { AdminLsResponseStream::AdminLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_adminUsers(catalogue.AdminUser()->getAdminUsers()) {} diff --git a/frontend/common/AdminLsResponseStream.hpp b/frontend/common/AdminLsResponseStream.hpp index 83a184a907eaf64ce4c4fade7eb93f768bc27976..e0000ebdc2657c003d3dae5f99e345f2a99762a7 100644 --- a/frontend/common/AdminLsResponseStream.hpp +++ b/frontend/common/AdminLsResponseStream.hpp @@ -29,8 +29,7 @@ class AdminLsResponseStream final : public CtaAdminResponseStream { public: AdminLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/ArchiveRouteLsResponseStream.cpp b/frontend/common/ArchiveRouteLsResponseStream.cpp index e109fadc8bf73efa2abe8b164c9f8f252d32bc67..40ba530ca022ca3eda9982a58ad5108da2bb1324 100644 --- a/frontend/common/ArchiveRouteLsResponseStream.cpp +++ b/frontend/common/ArchiveRouteLsResponseStream.cpp @@ -22,8 +22,7 @@ namespace cta::frontend { ArchiveRouteLsResponseStream::ArchiveRouteLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_archiveRoutes(catalogue.ArchiveRoute()->getArchiveRoutes()) {} diff --git a/frontend/common/ArchiveRouteLsResponseStream.hpp b/frontend/common/ArchiveRouteLsResponseStream.hpp index fc9137e8e2ee453dec6c387b3f4afef8e7c5a81b..215d1292d75bbb980ad83bceeebd32208ebe8aed 100644 --- a/frontend/common/ArchiveRouteLsResponseStream.hpp +++ b/frontend/common/ArchiveRouteLsResponseStream.hpp @@ -29,8 +29,7 @@ class ArchiveRouteLsResponseStream final : public CtaAdminResponseStream { public: ArchiveRouteLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/DiskInstanceLsResponseStream.cpp b/frontend/common/DiskInstanceLsResponseStream.cpp index be1942e5184fa41021a0e41adb4a7ed49cc31355..655de16277a52a7d610bf955cebc57b876c22498 100644 --- a/frontend/common/DiskInstanceLsResponseStream.cpp +++ b/frontend/common/DiskInstanceLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { DiskInstanceLsResponseStream::DiskInstanceLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_diskInstances(catalogue.DiskInstance()->getAllDiskInstances()) {} diff --git a/frontend/common/DiskInstanceLsResponseStream.hpp b/frontend/common/DiskInstanceLsResponseStream.hpp index 39f9bc797227bf270268c79524cc4ccabd2dd358..4f42aadae65b011a7e406b838f7cc33fdd0496ac 100644 --- a/frontend/common/DiskInstanceLsResponseStream.hpp +++ b/frontend/common/DiskInstanceLsResponseStream.hpp @@ -29,8 +29,7 @@ class DiskInstanceLsResponseStream final : public CtaAdminResponseStream { public: DiskInstanceLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/DiskInstanceSpaceLsResponseStream.cpp b/frontend/common/DiskInstanceSpaceLsResponseStream.cpp index 136e33e4c0835d826637a7daa704c1ac039da8e4..e5c957ecc6780f8438acc1c7cbefe887d1aef335 100644 --- a/frontend/common/DiskInstanceSpaceLsResponseStream.cpp +++ b/frontend/common/DiskInstanceSpaceLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { DiskInstanceSpaceLsResponseStream::DiskInstanceSpaceLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_diskInstanceSpaces(catalogue.DiskInstanceSpace()->getAllDiskInstanceSpaces()) {} diff --git a/frontend/common/DiskInstanceSpaceLsResponseStream.hpp b/frontend/common/DiskInstanceSpaceLsResponseStream.hpp index bfb4c2142fddc829036b90a571d658595a1cb4b8..ca98f02bc178753c5ec01ce60069e46d7921215c 100644 --- a/frontend/common/DiskInstanceSpaceLsResponseStream.hpp +++ b/frontend/common/DiskInstanceSpaceLsResponseStream.hpp @@ -29,8 +29,7 @@ class DiskInstanceSpaceLsResponseStream final : public CtaAdminResponseStream { public: DiskInstanceSpaceLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/DiskSystemLsResponseStream.cpp b/frontend/common/DiskSystemLsResponseStream.cpp index 2e1f325e04d3ebdd84b59735d8b8846f572524f0..c844e13e0e94dbd2b9b51589c5c752b082e31016 100644 --- a/frontend/common/DiskSystemLsResponseStream.cpp +++ b/frontend/common/DiskSystemLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { DiskSystemLsResponseStream::DiskSystemLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_diskSystems(catalogue.DiskSystem()->getAllDiskSystems()) {} diff --git a/frontend/common/DiskSystemLsResponseStream.hpp b/frontend/common/DiskSystemLsResponseStream.hpp index d6bc3b510533baad114bd65811385db38eefc49d..15d729d3fe14dfa1ff1879b0fb9e026b2874b13b 100644 --- a/frontend/common/DiskSystemLsResponseStream.hpp +++ b/frontend/common/DiskSystemLsResponseStream.hpp @@ -28,8 +28,7 @@ class DiskSystemLsResponseStream final : public CtaAdminResponseStream { public: DiskSystemLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/GroupMountRuleLsResponseStream.cpp b/frontend/common/GroupMountRuleLsResponseStream.cpp index 8348d152bc4e6cd1c17a330faa1b68b33b0aa76e..5eb3da5ee3771e0d6a60059b70a720eaf82522d2 100644 --- a/frontend/common/GroupMountRuleLsResponseStream.cpp +++ b/frontend/common/GroupMountRuleLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { GroupMountRuleLsResponseStream::GroupMountRuleLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_groupMountRules(catalogue.RequesterGroupMountRule()->getRequesterGroupMountRules()) {} diff --git a/frontend/common/GroupMountRuleLsResponseStream.hpp b/frontend/common/GroupMountRuleLsResponseStream.hpp index 5a0b7090dae304a5be6d806cbe089da2c646b6f4..69b02924cf3bf2fab2e40f853e7998503ba4e411 100644 --- a/frontend/common/GroupMountRuleLsResponseStream.hpp +++ b/frontend/common/GroupMountRuleLsResponseStream.hpp @@ -29,8 +29,7 @@ class GroupMountRuleLsResponseStream final : public CtaAdminResponseStream { public: GroupMountRuleLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/MediaTypeLsResponseStream.cpp b/frontend/common/MediaTypeLsResponseStream.cpp index 84381b6b16733885af96ba19195b36f0c542f1da..c071d759605d728b9f8a6bec33c8145cdee19dcf 100644 --- a/frontend/common/MediaTypeLsResponseStream.cpp +++ b/frontend/common/MediaTypeLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { MediaTypeLsResponseStream::MediaTypeLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_mediaTypes(catalogue.MediaType()->getMediaTypes()) {} diff --git a/frontend/common/MediaTypeLsResponseStream.hpp b/frontend/common/MediaTypeLsResponseStream.hpp index 9247051d11550ff3a02fe65c9263efed46d3fee4..410f10987eced5114a8deb822f73e9563ef68cdc 100644 --- a/frontend/common/MediaTypeLsResponseStream.hpp +++ b/frontend/common/MediaTypeLsResponseStream.hpp @@ -29,8 +29,7 @@ class MediaTypeLsResponseStream final : public CtaAdminResponseStream { public: MediaTypeLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/MountPolicyLsResponseStream.cpp b/frontend/common/MountPolicyLsResponseStream.cpp index f376bf883701e5f69a37597f6c77cef7a9bf250c..73fe76f578ff2d3ca4d908365674e9b3931e7869 100644 --- a/frontend/common/MountPolicyLsResponseStream.cpp +++ b/frontend/common/MountPolicyLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { MountPolicyLsResponseStream::MountPolicyLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_mountPolicies(catalogue.MountPolicy()->getMountPolicies()) {} diff --git a/frontend/common/MountPolicyLsResponseStream.hpp b/frontend/common/MountPolicyLsResponseStream.hpp index 2a110317b71245cac0c6d85f8e5d324ac24a11ec..0bc7d3697f4a63af523e4ecbf28bd2f0b3b4c6d8 100644 --- a/frontend/common/MountPolicyLsResponseStream.hpp +++ b/frontend/common/MountPolicyLsResponseStream.hpp @@ -29,8 +29,7 @@ class MountPolicyLsResponseStream final : public CtaAdminResponseStream { public: MountPolicyLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/PhysicalLibraryLsResponseStream.cpp b/frontend/common/PhysicalLibraryLsResponseStream.cpp index 0c599b722d9aec822f8561aeef41b5296bb580ae..8e98860fb47806020f05cd18858902cd6664a6d7 100644 --- a/frontend/common/PhysicalLibraryLsResponseStream.cpp +++ b/frontend/common/PhysicalLibraryLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { PhysicalLibraryLsResponseStream::PhysicalLibraryLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_physicalLibraries(catalogue.PhysicalLibrary()->getPhysicalLibraries()) {} diff --git a/frontend/common/PhysicalLibraryLsResponseStream.hpp b/frontend/common/PhysicalLibraryLsResponseStream.hpp index 7b4db6eee6bca8bc815e478499180702feb634c2..b6e05654fc8d2f24b9e22aea2160b7089b09a2d8 100644 --- a/frontend/common/PhysicalLibraryLsResponseStream.hpp +++ b/frontend/common/PhysicalLibraryLsResponseStream.hpp @@ -29,8 +29,7 @@ class PhysicalLibraryLsResponseStream final : public CtaAdminResponseStream { public: PhysicalLibraryLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/RequesterMountRuleLsResponseStream.cpp b/frontend/common/RequesterMountRuleLsResponseStream.cpp index 8f3f985900e70476344239abd34ae0d9255a670d..7720de75285ff4a30611afde11d91d9ecf5c84bf 100644 --- a/frontend/common/RequesterMountRuleLsResponseStream.cpp +++ b/frontend/common/RequesterMountRuleLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { RequesterMountRuleLsResponseStream::RequesterMountRuleLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_requesterMountRules(catalogue.RequesterMountRule()->getRequesterMountRules()) {} diff --git a/frontend/common/RequesterMountRuleLsResponseStream.hpp b/frontend/common/RequesterMountRuleLsResponseStream.hpp index 27e72df6ba294fc55b75f6a70f4107373feb855d..2e65cb1543fe39c717ab8a1221be0c4a1f65a06b 100644 --- a/frontend/common/RequesterMountRuleLsResponseStream.hpp +++ b/frontend/common/RequesterMountRuleLsResponseStream.hpp @@ -29,8 +29,7 @@ class RequesterMountRuleLsResponseStream final : public CtaAdminResponseStream { public: RequesterMountRuleLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/common/ShowQueuesResponseStream.cpp b/frontend/common/ShowQueuesResponseStream.cpp index 040b70190d558cf357d002e48ca8925da8baa22f..7626f03c7c4137d23892a5caab9ff04de0bf5dee 100644 --- a/frontend/common/ShowQueuesResponseStream.cpp +++ b/frontend/common/ShowQueuesResponseStream.cpp @@ -24,7 +24,6 @@ namespace cta::frontend { ShowQueuesResponseStream::ShowQueuesResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, const std::string& instanceName, - const admin::AdminCmd& adminCmd, cta::log::LogContext& lc) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_lc(lc), diff --git a/frontend/common/ShowQueuesResponseStream.hpp b/frontend/common/ShowQueuesResponseStream.hpp index e84590a963acc5bff63fae72ccf57b1b470182dd..dfe335590d40845f2a274d8eee69df5b7b047f0e 100644 --- a/frontend/common/ShowQueuesResponseStream.hpp +++ b/frontend/common/ShowQueuesResponseStream.hpp @@ -30,7 +30,6 @@ public: ShowQueuesResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, const std::string& instanceName, - const admin::AdminCmd& adminCmd, cta::log::LogContext& lc); bool isDone() override; diff --git a/frontend/common/VirtualOrganizationLsResponseStream.cpp b/frontend/common/VirtualOrganizationLsResponseStream.cpp index 2324737069605a8783b15c0005f34251a98499d9..5e1318736ed74db14e2ca3e45f547119bd0f9554 100644 --- a/frontend/common/VirtualOrganizationLsResponseStream.cpp +++ b/frontend/common/VirtualOrganizationLsResponseStream.cpp @@ -21,8 +21,7 @@ namespace cta::frontend { VirtualOrganizationLsResponseStream::VirtualOrganizationLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) + const std::string& instanceName) : CtaAdminResponseStream(catalogue, scheduler, instanceName), m_virtualOrganizations(catalogue.VO()->getVirtualOrganizations()) {} diff --git a/frontend/common/VirtualOrganizationLsResponseStream.hpp b/frontend/common/VirtualOrganizationLsResponseStream.hpp index 8b67613512154076d20775408b5e6efde353b356..9c788e614fb6f07156e8d16c6b36d01536ebd36f 100644 --- a/frontend/common/VirtualOrganizationLsResponseStream.hpp +++ b/frontend/common/VirtualOrganizationLsResponseStream.hpp @@ -29,8 +29,7 @@ class VirtualOrganizationLsResponseStream final : public CtaAdminResponseStream public: VirtualOrganizationLsResponseStream(cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); + const std::string& instanceName); bool isDone() override; cta::xrd::Data next() override; diff --git a/frontend/grpc/callback_api/CtaAdminServer.hpp b/frontend/grpc/callback_api/CtaAdminServer.hpp index 6cd9ff975588cbc999f52f16f1834e008e8f1e3a..f7a6e08a3e948c9419b701714e16dc52d8adf123 100644 --- a/frontend/grpc/callback_api/CtaAdminServer.hpp +++ b/frontend/grpc/callback_api/CtaAdminServer.hpp @@ -142,15 +142,11 @@ CtaRpcStreamImpl::GenericAdminStream(::grpc::CallbackServerContext* context, con headerType = HeaderType::TAPEPOOL_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_VIRTUALORGANIZATION, cta::admin::AdminCmd::SUBCMD_LS): - stream = std::make_unique(m_catalogue, - m_scheduler, - m_instanceName, - request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::VIRTUALORGANIZATION_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_DISKINSTANCE, cta::admin::AdminCmd::SUBCMD_LS): - stream = - std::make_unique(m_catalogue, m_scheduler, m_instanceName, request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::DISKINSTANCE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_DRIVE, cta::admin::AdminCmd::SUBCMD_LS): @@ -159,57 +155,41 @@ CtaRpcStreamImpl::GenericAdminStream(::grpc::CallbackServerContext* context, con headerType = HeaderType::DRIVE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_ADMIN, cta::admin::AdminCmd::SUBCMD_LS): - stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName, request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::ADMIN_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_VERSION, cta::admin::AdminCmd::SUBCMD_NONE): return new VersionWriteReactor(m_catalogue, m_scheduler, m_instanceName, m_catalogueConnString, request); case cmd_pair(cta::admin::AdminCmd::CMD_ARCHIVEROUTE, cta::admin::AdminCmd::SUBCMD_LS): - stream = - std::make_unique(m_catalogue, m_scheduler, m_instanceName, request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::ARCHIVEROUTE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_GROUPMOUNTRULE, cta::admin::AdminCmd::SUBCMD_LS): - stream = std::make_unique(m_catalogue, - m_scheduler, - m_instanceName, - request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::GROUPMOUNTRULE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_MEDIATYPE, cta::admin::AdminCmd::SUBCMD_LS): - stream = - std::make_unique(m_catalogue, m_scheduler, m_instanceName, request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::MEDIATYPE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_REQUESTERMOUNTRULE, cta::admin::AdminCmd::SUBCMD_LS): - stream = std::make_unique(m_catalogue, - m_scheduler, - m_instanceName, - request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::REQUESTERMOUNTRULE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_PHYSICALLIBRARY, cta::admin::AdminCmd::SUBCMD_LS): - stream = std::make_unique(m_catalogue, - m_scheduler, - m_instanceName, - request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::PHYSICALLIBRARY_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_MOUNTPOLICY, cta::admin::AdminCmd::SUBCMD_LS): - stream = - std::make_unique(m_catalogue, m_scheduler, m_instanceName, request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::MOUNTPOLICY_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_DISKSYSTEM, cta::admin::AdminCmd::SUBCMD_LS): - stream = - std::make_unique(m_catalogue, m_scheduler, m_instanceName, request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::DISKSYSTEM_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_DISKINSTANCESPACE, cta::admin::AdminCmd::SUBCMD_LS): - stream = std::make_unique(m_catalogue, - m_scheduler, - m_instanceName, - request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::DISKINSTANCESPACE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_TAPEFILE, cta::admin::AdminCmd::SUBCMD_LS): @@ -218,18 +198,11 @@ CtaRpcStreamImpl::GenericAdminStream(::grpc::CallbackServerContext* context, con headerType = HeaderType::TAPEFILE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_ACTIVITYMOUNTRULE, cta::admin::AdminCmd::SUBCMD_LS): - stream = std::make_unique(m_catalogue, - m_scheduler, - m_instanceName, - request->admincmd()); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName); headerType = HeaderType::ACTIVITYMOUNTRULE_LS; break; case cmd_pair(cta::admin::AdminCmd::CMD_SHOWQUEUES, cta::admin::AdminCmd::SUBCMD_NONE): - stream = std::make_unique(m_catalogue, - m_scheduler, - m_instanceName, - request->admincmd(), - m_lc); + stream = std::make_unique(m_catalogue, m_scheduler, m_instanceName, m_lc); headerType = HeaderType::SHOWQUEUES; break; case cmd_pair(cta::admin::AdminCmd::CMD_REPACK, cta::admin::AdminCmd::SUBCMD_LS): @@ -272,6 +245,6 @@ CtaRpcStreamImpl::GenericAdminStream(::grpc::CallbackServerContext* context, con return new DefaultWriteReactor(ex.getMessageValue()); } // try-catch // proceed with command execution if no exception was thrown - return new CtaAdminServerWriteReactor(m_catalogue, m_scheduler, m_instanceName, std::move(stream), headerType); + return new CtaAdminServerWriteReactor(m_scheduler, m_instanceName, std::move(stream), headerType); } } // namespace cta::frontend::grpc diff --git a/frontend/grpc/callback_api/CtaAdminServerWriteReactor.cpp b/frontend/grpc/callback_api/CtaAdminServerWriteReactor.cpp index 85efe281ec138924f25045da4699e5002d7a4a6a..a60d60665b5a32546fca67e6687703b892e0fd20 100644 --- a/frontend/grpc/callback_api/CtaAdminServerWriteReactor.cpp +++ b/frontend/grpc/callback_api/CtaAdminServerWriteReactor.cpp @@ -47,8 +47,7 @@ void CtaAdminServerWriteReactor::NextWrite() { } } -CtaAdminServerWriteReactor::CtaAdminServerWriteReactor(cta::catalogue::Catalogue& catalogue, - cta::Scheduler& scheduler, +CtaAdminServerWriteReactor::CtaAdminServerWriteReactor(cta::Scheduler& scheduler, const std::string& instanceName, std::unique_ptr stream, cta::admin::HeaderType headerType) diff --git a/frontend/grpc/callback_api/CtaAdminServerWriteReactor.hpp b/frontend/grpc/callback_api/CtaAdminServerWriteReactor.hpp index bcadc3855f53aee6f9382590186363810ea0635e..a431351d2391196c1d2ac783092031532f84a477 100644 --- a/frontend/grpc/callback_api/CtaAdminServerWriteReactor.hpp +++ b/frontend/grpc/callback_api/CtaAdminServerWriteReactor.hpp @@ -16,8 +16,7 @@ namespace cta::frontend::grpc { class CtaAdminServerWriteReactor : public ::grpc::ServerWriteReactor /* CtaAdminServerWriteReactor */ { public: - CtaAdminServerWriteReactor(cta::catalogue::Catalogue& catalogue, - cta::Scheduler& scheduler, + CtaAdminServerWriteReactor(cta::Scheduler& scheduler, const std::string& instanceName, std::unique_ptr stream, cta::admin::HeaderType headerType); diff --git a/frontend/grpc/callback_api/ServerVersion.hpp b/frontend/grpc/callback_api/ServerVersion.hpp index 6ca0c352e100e6119f806dc6e2f67ae40d38c208..2f84bb4275b0b5f85347901b2a7235c8ea9a0d15 100644 --- a/frontend/grpc/callback_api/ServerVersion.hpp +++ b/frontend/grpc/callback_api/ServerVersion.hpp @@ -36,7 +36,7 @@ VersionWriteReactor::VersionWriteReactor(cta::catalogue::Catalogue& catalogue, const std::string& instanceName, const std::string& catalogueConnString, const cta::xrd::Request* request) - : CtaAdminServerWriteReactor(catalogue, scheduler, instanceName, nullptr, cta::admin::HeaderType::VERSION_CMD), + : CtaAdminServerWriteReactor(scheduler, instanceName, nullptr, cta::admin::HeaderType::VERSION_CMD), m_catalogue_conn_string(catalogueConnString), m_catalogue_version(catalogue.Schema()->getSchemaVersion().getSchemaVersion()), m_is_upgrading(catalogue.Schema()->getSchemaVersion().getStatus() == diff --git a/mediachanger/rmcd/rmc_procreq.cpp b/mediachanger/rmcd/rmc_procreq.cpp index 02dc6fe76c5c30a976b95fcc4b82ff4568624a04..65e9155eef5d37f62c55de95d275ec85d58ad41c 100644 --- a/mediachanger/rmcd/rmc_procreq.cpp +++ b/mediachanger/rmcd/rmc_procreq.cpp @@ -449,10 +449,10 @@ int rmc_srv_unmount(const struct rmc_srv_rqst_context* const rqst_context) { return c; } -int rmc_srv_genericmount(struct rmc_srv_rqst_context* const rqst_context) { +int rmc_srv_genericmount([[maybe_unused]] struct rmc_srv_rqst_context* const rqst_context) { return 0; } -int rmc_srv_genericunmount(struct rmc_srv_rqst_context* const rqst_context) { +int rmc_srv_genericunmount([[maybe_unused]] struct rmc_srv_rqst_context* const rqst_context) { return 0; } diff --git a/mediachanger/rmcd/rmc_smcsubr.cpp b/mediachanger/rmcd/rmc_smcsubr.cpp index 31bb271a4ea9751e348c9be5928633acb064f41a..87c2b10a952787f41a093703016870be7315d90d 100644 --- a/mediachanger/rmcd/rmc_smcsubr.cpp +++ b/mediachanger/rmcd/rmc_smcsubr.cpp @@ -413,7 +413,7 @@ int smc_find_cartridge(const int fd, const int start, const int nbelem, struct smc_element_info element_info[], - struct robot_info* const robot_info) { + [[maybe_unused]] struct robot_info* const robot_info) { unsigned char cdb[12]; const char* msgaddr; int nb_sense_ret; diff --git a/mediachanger/smc/smc.cpp b/mediachanger/smc/smc.cpp index b6571453fbbbe136ef435795bf1012db05923428..7445b2f2542d3a02432b8e8cde23e4daa5ef9255 100644 --- a/mediachanger/smc/smc.cpp +++ b/mediachanger/smc/smc.cpp @@ -128,7 +128,7 @@ void smc_qdrive_jsonPrint(const struct robot_info* const robot_info, } static int smc_qdrive(const char* const rmchost, - const int fd, + [[maybe_unused]] const int fd, const struct robot_info* const robot_info, int drvord, const int isJsonEnabled) { @@ -240,8 +240,10 @@ void smc_qport_jsonPrint(const struct smc_element_info* const element_info, cons printf("]"); } -static int -smc_qport(const char* const rmchost, const int fd, const struct robot_info* const robot_info, const int isJsonEnabled) { +static int smc_qport(const char* const rmchost, + [[maybe_unused]] const int fd, + const struct robot_info* const robot_info, + const int isJsonEnabled) { int c; struct smc_element_info* element_info; int nbelem; diff --git a/rdbms/wrapper/PostgresConn.cpp b/rdbms/wrapper/PostgresConn.cpp index 1d8696d76bdb268968ac1e58211e2dcc949e8d38..98ea98a9f89ac553efb810265a9cb4cffbb5bf44 100644 --- a/rdbms/wrapper/PostgresConn.cpp +++ b/rdbms/wrapper/PostgresConn.cpp @@ -476,7 +476,7 @@ std::string PostgresConn::nextStmtName() { //------------------------------------------------------------------------------ // noticeProcessor //------------------------------------------------------------------------------ -void PostgresConn::noticeProcessor(void* arg, const char* message) { +void PostgresConn::noticeProcessor([[maybe_unused]] void* arg, [[maybe_unused]] const char* message) { //fprintf(stderr, "%s", message); } diff --git a/scheduler/LabelMount.cpp b/scheduler/LabelMount.cpp index f27619d1468fd95745c76ddca3f08e338a49e231..0d33a7824422355fd7af406485f1721e157abb0f 100644 --- a/scheduler/LabelMount.cpp +++ b/scheduler/LabelMount.cpp @@ -69,8 +69,9 @@ void LabelMount::setTapeMounted(log::LogContext &logContext) const { // TODO } -LabelMount::LabelMount(catalogue::Catalogue& catalogue, std::unique_ptr dbMount): - m_catalogue(catalogue) { +LabelMount::LabelMount(catalogue::Catalogue& catalogue, + [[maybe_unused]] std::unique_ptr dbMount) + : m_catalogue(catalogue) { throw 0; // TODO; } diff --git a/scheduler/LabelMount.hpp b/scheduler/LabelMount.hpp index 52e8799e556c0ccb0e1cd6f88321e2dd511c7830..90273220693fa26df33fdf3d462877d2ca6bb0a0 100644 --- a/scheduler/LabelMount.hpp +++ b/scheduler/LabelMount.hpp @@ -49,7 +49,8 @@ protected: * * @param dbMount The database representation of this mount */ - LabelMount(catalogue::Catalogue & catalogue, std::unique_ptr dbMount); + LabelMount(catalogue::Catalogue& catalogue, + [[maybe_unused]] std::unique_ptr dbMount); public: CTA_GENERATE_EXCEPTION_CLASS(WrongMountType); diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp index ec0f52e15c7ae64c6c060cd6ab375000237103f8..77379bd24a980af71a8ce1b16475145f59cfa580 100644 --- a/scheduler/Scheduler.cpp +++ b/scheduler/Scheduler.cpp @@ -1032,9 +1032,7 @@ bool Scheduler::checkDriveCanBeCreated(const cta::common::dataStructures::DriveI //------------------------------------------------------------------------------ // removeDrive //------------------------------------------------------------------------------ -void Scheduler::removeDrive(const common::dataStructures::SecurityIdentity& cliIdentity, - const std::string& driveName, - log::LogContext& lc) { +void Scheduler::removeDrive(const std::string& driveName, log::LogContext& lc) { utils::Timer t; m_tapeDrivesState->removeDrive(driveName, lc); auto schedulerDbTime = t.secs(); @@ -1167,8 +1165,7 @@ std::optional Scheduler::getDriveState(c //------------------------------------------------------------------------------ // getDriveStates //------------------------------------------------------------------------------ -std::list -Scheduler::getDriveStates(const common::dataStructures::SecurityIdentity& cliIdentity, log::LogContext& lc) const { +std::list Scheduler::getDriveStates(log::LogContext& lc) const { utils::Timer t; const auto ret = m_catalogue.DriveState()->getTapeDrives(); auto schedulerDbTime = t.secs(); diff --git a/scheduler/Scheduler.hpp b/scheduler/Scheduler.hpp index 7a6e7ed0dd4e7d162e19516d0da17715b671461e..b6f30ec0a35465921f6523f9b29f267b410320d5 100644 --- a/scheduler/Scheduler.hpp +++ b/scheduler/Scheduler.hpp @@ -241,12 +241,9 @@ public: /** * Remove drive from the drive register. * - * @param cliIdentity The identity of the user requesting the drive removal. * @param driveName The drive name */ - void removeDrive(const cta::common::dataStructures::SecurityIdentity& cliIdentity, - const std::string& driveName, - log::LogContext& lc); + void removeDrive(const std::string& driveName, log::LogContext& lc); /** * Reports the state of the drive to the object store. This information is then reported @@ -298,11 +295,9 @@ public: /** * Dumps the states of all drives for display - * @param cliIdentity * @return A list of drive state structures. */ - std::list - getDriveStates(const cta::common::dataStructures::SecurityIdentity& cliIdentity, log::LogContext& lc) const; + std::list getDriveStates(log::LogContext& lc) const; /*============== Actual mount scheduling and queue status reporting ========*/ private: diff --git a/scheduler/rdbms/ArchiveRdbJob.cpp b/scheduler/rdbms/ArchiveRdbJob.cpp index 52268979b43afe2d23ce7dd602f8e84075107e7c..6fda902c3ce2ee36c64a6bf84063d6ceea8eec84 100644 --- a/scheduler/rdbms/ArchiveRdbJob.cpp +++ b/scheduler/rdbms/ArchiveRdbJob.cpp @@ -106,7 +106,7 @@ void ArchiveRdbJob::reset() { void ArchiveRdbJob::handleExceedTotalRetries(cta::schedulerdb::Transaction& txn, log::LogContext& lc, - const std::string& reason) { + [[maybe_unused]] const std::string& reason) { if (m_jobRow.status != ArchiveJobStatus::AJS_ToTransferForUser) { lc.log(log::WARNING, std::string("ArchiveRdbJob::handleExceedTotalRetries(): Unexpected status: ") + to_string(m_jobRow.status) + @@ -131,7 +131,8 @@ void ArchiveRdbJob::handleExceedTotalRetries(cta::schedulerdb::Transaction& txn, void ArchiveRdbJob::requeueJobToMount(cta::schedulerdb::Transaction& txn, log::LogContext& lc, - const std::string& reason, bool keepMountId) { + [[maybe_unused]] const std::string& reason, + bool keepMountId) { std::string log_msg = "In ArchiveRdbJob::requeueJobToMount(): requeueFailedJob() to same mount"; if (!keepMountId) { m_jobRow.retriesWithinMount = 0; diff --git a/scheduler/rdbms/ArchiveRdbJob.hpp b/scheduler/rdbms/ArchiveRdbJob.hpp index e70d82434daec2cc7e6853dc10bc0e35b2debda0..44268fb127ce870a594d74b6c4d960511167ca14 100644 --- a/scheduler/rdbms/ArchiveRdbJob.hpp +++ b/scheduler/rdbms/ArchiveRdbJob.hpp @@ -121,9 +121,11 @@ public: * @param lc The logging context for structured logging. * @param reason The textual explanation for the failure. */ - void handleExceedTotalRetries(cta::schedulerdb::Transaction& txn, log::LogContext& lc, const std::string& reason); + void handleExceedTotalRetries(cta::schedulerdb::Transaction& txn, + log::LogContext& lc, + [[maybe_unused]] const std::string& reason); - /** + /** * Requeues the job to a same/new (keepMountId) mount after a failure. * Resets mount-related retry counters and updates the job in the DB. * @@ -132,8 +134,10 @@ public: * @param reason The textual explanation for the failure. * @param keepMountId If false, the job will be requeues with NULL Mount ID, otherwise same Mount ID will be used */ - void requeueJobToMount(cta::schedulerdb::Transaction& txn, log::LogContext& lc, const std::string& reason, bool keepMountId); - + void requeueJobToMount(cta::schedulerdb::Transaction& txn, + log::LogContext& lc, + [[maybe_unused]] const std::string& reason, + bool keepMountId); postgres::ArchiveJobQueueRow m_jobRow; // Job data is encapsulated in this member bool m_jobOwned = false; diff --git a/scheduler/rdbms/RelationalDB.cpp b/scheduler/rdbms/RelationalDB.cpp index 43cb34ff0cf6a6d737b727b845d8966e01f2687d..58d3d60eca1a3fec4b2f33328a8575d37cb812de 100644 --- a/scheduler/rdbms/RelationalDB.cpp +++ b/scheduler/rdbms/RelationalDB.cpp @@ -1331,7 +1331,7 @@ RelationalDB::getMountInfoNoLock(PurposeGetMountInfo purpose, log::LogContext& l } void RelationalDB::fetchMountInfo(SchedulerDatabase::TapeMountDecisionInfo& tmdi, - SchedulerDatabase::PurposeGetMountInfo purpose, + [[maybe_unused]] SchedulerDatabase::PurposeGetMountInfo purpose, log::LogContext& lc) { utils::Timer t; utils::Timer ttotal; diff --git a/scheduler/rdbms/RelationalDB.hpp b/scheduler/rdbms/RelationalDB.hpp index 69b1d4b13d4dbd9fee11b6faee1fbd1baea8bd5b..317293c037533b2335d53c36d10df80f6ca081c9 100644 --- a/scheduler/rdbms/RelationalDB.hpp +++ b/scheduler/rdbms/RelationalDB.hpp @@ -309,7 +309,7 @@ private: * @param lc The logging context */ void fetchMountInfo(SchedulerDatabase::TapeMountDecisionInfo& tmdi, - SchedulerDatabase::PurposeGetMountInfo purpose, + [[maybe_unused]] SchedulerDatabase::PurposeGetMountInfo purpose, log::LogContext& lc); bool deleteDiskFiles(std::unordered_set& jobSrcUrls, log::LogContext& lc); std::list fetchRepackInfo(const std::string& vid); diff --git a/scheduler/rdbms/RetrieveRdbJob.cpp b/scheduler/rdbms/RetrieveRdbJob.cpp index ee42e7a2cf20bc8f53920a2424d2d7fcba6ee92d..212c4dc6d4eba0ba19c652cd1fe7d1b521463c4c 100644 --- a/scheduler/rdbms/RetrieveRdbJob.cpp +++ b/scheduler/rdbms/RetrieveRdbJob.cpp @@ -151,10 +151,9 @@ void RetrieveRdbJob::reset() { reportType = ReportType::NoReportRequired; } - void RetrieveRdbJob::handleExceedTotalRetries(cta::schedulerdb::Transaction& txn, - log::LogContext& lc, - const std::string& reason) { + log::LogContext& lc, + [[maybe_unused]] const std::string& reason) { if (m_jobRow.status != RetrieveJobStatus::RJS_ToTransfer) { lc.log(log::WARNING, std::string("RetrieveRdbJob::handleExceedTotalRetries(): Unexpected status: ") + to_string(m_jobRow.status) + @@ -179,7 +178,8 @@ void RetrieveRdbJob::handleExceedTotalRetries(cta::schedulerdb::Transaction& txn void RetrieveRdbJob::requeueJobToMount(cta::schedulerdb::Transaction& txn, log::LogContext& lc, - const std::string& reason, bool keepMountId) { + [[maybe_unused]] const std::string& reason, + bool keepMountId) { std::string log_msg = "In RetrieveRdbJob::requeueJobToMount(): requeueFailedJob() to same mount"; if (!keepMountId) { log_msg = "In RetrieveRdbJob::requeueJobToMount(): requeueFailedJob() to new mount"; diff --git a/scheduler/rdbms/RetrieveRdbJob.hpp b/scheduler/rdbms/RetrieveRdbJob.hpp index f6f8eff6162a39a9665ac9074e9a0bf37d8c61ef..e3365109d5825fa728fce8ec415c811d4d0f4c67 100644 --- a/scheduler/rdbms/RetrieveRdbJob.hpp +++ b/scheduler/rdbms/RetrieveRdbJob.hpp @@ -110,7 +110,9 @@ public: * @param lc The logging context for structured logging. * @param reason The textual explanation for the failure. */ - void handleExceedTotalRetries(cta::schedulerdb::Transaction& txn, log::LogContext& lc, const std::string& reason); + void handleExceedTotalRetries(cta::schedulerdb::Transaction& txn, + log::LogContext& lc, + [[maybe_unused]] const std::string& reason); /** * Requeues the job to a new/same (keepMountId) mount after a failure. @@ -121,8 +123,10 @@ public: * @param reason The textual explanation for the failure. * @param keepMountId If false, job will be requeued with NULL as Mount ID, otherwise same Mount ID will be kept */ - void requeueJobToMount(cta::schedulerdb::Transaction& txn, log::LogContext& lc, const std::string& reason, bool keepMountId); - + void requeueJobToMount(cta::schedulerdb::Transaction& txn, + log::LogContext& lc, + [[maybe_unused]] const std::string& reason, + bool keepMountId); postgres::RetrieveJobQueueRow m_jobRow; // Job data is encapsulated in this member bool m_jobOwned = false; diff --git a/scheduler/rdbms/RetrieveRequest.cpp b/scheduler/rdbms/RetrieveRequest.cpp index 5ae1270fac7bef82d4bab34b0fe106f87140dffc..6e1142f7d2b0a021145fb25e4b668f7db29a643f 100644 --- a/scheduler/rdbms/RetrieveRequest.cpp +++ b/scheduler/rdbms/RetrieveRequest.cpp @@ -155,7 +155,8 @@ void RetrieveRequest::setRepackInfo(const cta::schedulerdb::RetrieveRequest::Ret m_repackInfo = repackInfo; } -void RetrieveRequest::setJobStatus(uint32_t copyNumber, const cta::schedulerdb::RetrieveJobStatus& status) { +void RetrieveRequest::setJobStatus([[maybe_unused]] uint32_t copyNumber, + const cta::schedulerdb::RetrieveJobStatus& status) { m_status = status; } diff --git a/scheduler/rdbms/RetrieveRequest.hpp b/scheduler/rdbms/RetrieveRequest.hpp index abe9c81827f667d377bdb33448a3b68f687a37f3..83e1f0a056d59f906ca4cf06787abfd481724940 100644 --- a/scheduler/rdbms/RetrieveRequest.hpp +++ b/scheduler/rdbms/RetrieveRequest.hpp @@ -54,7 +54,7 @@ public: */ [[noreturn]] void setFailureReason(std::string_view reason) const; [[noreturn]] bool addJobFailure(uint32_t copyNumber, uint64_t mountId, std::string_view failureReason) const; - void setJobStatus(uint32_t copyNumber, const cta::schedulerdb::RetrieveJobStatus& status); + void setJobStatus([[maybe_unused]] uint32_t copyNumber, const cta::schedulerdb::RetrieveJobStatus& status); void setSchedulerRequest(const cta::common::dataStructures::RetrieveRequest& retrieveRequest); void setActivityIfNeeded(const cta::common::dataStructures::RetrieveRequest& retrieveRequest, const cta::common::dataStructures::RetrieveFileQueueCriteria& criteria); diff --git a/scheduler/rdbms/postgres/RetrieveJobSummary.hpp b/scheduler/rdbms/postgres/RetrieveJobSummary.hpp index 3a8c556d8788d04179a5c30c5adb2cc19eb1c532..34f784931f8429c6dcfaa974073afb351bd3cc0e 100644 --- a/scheduler/rdbms/postgres/RetrieveJobSummary.hpp +++ b/scheduler/rdbms/postgres/RetrieveJobSummary.hpp @@ -77,7 +77,8 @@ struct RetrieveJobSummaryRow { * * @return result set containing all rows in the table */ - static rdbms::Rset selectVid(const std::string& vid, common::dataStructures::JobQueueType type, rdbms::Conn& conn) { + static rdbms::Rset + selectVid(const std::string& vid, [[maybe_unused]] common::dataStructures::JobQueueType type, rdbms::Conn& conn) { // for the moment ignoring status as we will query only one table // where all the jobs wait to be popped to the drive task queues const char* const sql = R"SQL( diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp index 67549fafd5d65aba11ac702d4b5d252b643c668d..734183515314f765d8b6578a5b20dd9952a3dd0d 100644 --- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp +++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp @@ -46,24 +46,24 @@ //------------------------------------------------------------------------------ //Constructor //------------------------------------------------------------------------------ -castor::tape::tapeserver::daemon::DataTransferSession::DataTransferSession(const std::string& hostname, - cta::log::Logger& log, - System::virtualWrapper& sysWrapper, - const cta::tape::daemon::DriveConfigEntry& driveConfig, - cta::mediachanger::MediaChangerFacade& mc, - cta::tape::daemon::TapedProxy& initialProcess, - - const DataTransferConfig& dataTransferConfig, - cta::Scheduler& scheduler) : - m_log(log), - m_sysWrapper(sysWrapper), - m_driveConfig(driveConfig), - m_dataTransferConfig(dataTransferConfig), - m_driveInfo({driveConfig.unitName, cta::utils::getShortHostname(), driveConfig.logicalLibrary}), - m_mediaChanger(mc), - m_initialProcess(initialProcess), - m_scheduler(scheduler) { -} +castor::tape::tapeserver::daemon::DataTransferSession::DataTransferSession( + [[maybe_unused]] const std::string& hostname, + cta::log::Logger& log, + System::virtualWrapper& sysWrapper, + const cta::tape::daemon::DriveConfigEntry& driveConfig, + cta::mediachanger::MediaChangerFacade& mc, + cta::tape::daemon::TapedProxy& initialProcess, + + const DataTransferConfig& dataTransferConfig, + cta::Scheduler& scheduler) + : m_log(log), + m_sysWrapper(sysWrapper), + m_driveConfig(driveConfig), + m_dataTransferConfig(dataTransferConfig), + m_driveInfo({driveConfig.unitName, cta::utils::getShortHostname(), driveConfig.logicalLibrary}), + m_mediaChanger(mc), + m_initialProcess(initialProcess), + m_scheduler(scheduler) {} //------------------------------------------------------------------------------ //DataTransferSession::execute @@ -542,13 +542,12 @@ castor::tape::tapeserver::daemon::DataTransferSession::executeWrite(cta::log::Lo //DataTransferSession::executeLabel //------------------------------------------------------------------------------ castor::tape::tapeserver::daemon::Session::EndOfSessionAction -castor::tape::tapeserver::daemon::DataTransferSession::executeLabel(cta::log::LogContext& logContext, - cta::LabelMount *labelMount) { +castor::tape::tapeserver::daemon::DataTransferSession::executeLabel([[maybe_unused]] cta::log::LogContext& logContext, + [[maybe_unused]] cta::LabelMount* labelMount) { throw cta::exception::NotImplementedException(); // TODO } - //------------------------------------------------------------------------------ //DataTransferSession::findDrive //------------------------------------------------------------------------------ diff --git a/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp b/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp index d25da9ac664b41bbf334550d4bba4e092f77ca2b..f737c9465002700ef4181c5e42e11e3dee1d4fb0 100644 --- a/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp +++ b/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp @@ -20,7 +20,7 @@ namespace castor::tape::utils { template -void suppresUnusedVariable(const T& sp) { +void suppresUnusedVariable([[maybe_unused]] const T& sp) { /* * method is empty because as the name suggests, we do not intend to do anything with sp * we only need it for its side effects within the logger. Calling this function ensures diff --git a/tapeserver/readtp/ReadtpCmd.cpp b/tapeserver/readtp/ReadtpCmd.cpp index 4674f162f060adf84c124bed546a1d4f05e68207..68d163d8335a3455cf9ba8810521770d7c82486a 100644 --- a/tapeserver/readtp/ReadtpCmd.cpp +++ b/tapeserver/readtp/ReadtpCmd.cpp @@ -489,8 +489,8 @@ void ReadtpCmd::readTapeFile( //------------------------------------------------------------------------------ // unloadTape //------------------------------------------------------------------------------ -void ReadtpCmd::unloadTape( - const std::string &vid, castor::tape::tapeserver::drive::DriveInterface &drive) { +void ReadtpCmd::unloadTape([[maybe_unused]] const std::string& vid, + castor::tape::tapeserver::drive::DriveInterface& drive) { std::unique_ptr librarySlotPtr; librarySlotPtr.reset( cta::mediachanger::LibrarySlotParser::parse(m_rawLibrarySlot)); diff --git a/tapeserver/tapelabel/TapeLabelCmd.cpp b/tapeserver/tapelabel/TapeLabelCmd.cpp index 600ed9294c99ace0511de34c723520755e0bd844..6301f8a83f5efdf8548a46e99e647548933f8c1a 100644 --- a/tapeserver/tapelabel/TapeLabelCmd.cpp +++ b/tapeserver/tapelabel/TapeLabelCmd.cpp @@ -332,7 +332,8 @@ void TapeLabelCmd::writeLabelToTape( //------------------------------------------------------------------------------ // unloadTape //------------------------------------------------------------------------------ -void TapeLabelCmd::unloadTape(const std::string &vid, castor::tape::tapeserver::drive::DriveInterface &drive) { +void TapeLabelCmd::unloadTape([[maybe_unused]] const std::string& vid, + castor::tape::tapeserver::drive::DriveInterface& drive) { std::unique_ptr librarySlotPtr; librarySlotPtr.reset( cta::mediachanger::LibrarySlotParser::parse(m_rawLibrarySlot)); diff --git a/xroot_plugins/XrdCtaActivityMountRuleLs.hpp b/xroot_plugins/XrdCtaActivityMountRuleLs.hpp index e7c3aad07e14980b5ea7cc22efcb1a2c4c370c7e..8ee9abd28e59b56b87b54cd2fd0ad960ffa939f8 100644 --- a/xroot_plugins/XrdCtaActivityMountRuleLs.hpp +++ b/xroot_plugins/XrdCtaActivityMountRuleLs.hpp @@ -39,8 +39,7 @@ inline ActivityMountRuleLsStream::ActivityMountRuleLsStream(const frontend::Admi scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaAdminLs.hpp b/xroot_plugins/XrdCtaAdminLs.hpp index 90e7430157ffa70ecce7b2b5911ee509265e69bf..9f7faebf5d72e0828ef3db8e1d8cc35dedfd0e62 100644 --- a/xroot_plugins/XrdCtaAdminLs.hpp +++ b/xroot_plugins/XrdCtaAdminLs.hpp @@ -35,12 +35,10 @@ private: inline AdminLsStream::AdminLsStream(const frontend::AdminCmdStream& requestMsg, cta::catalogue::Catalogue& catalogue, cta::Scheduler& scheduler) - : XrdCtaStream(catalogue, - scheduler, - std::make_unique(catalogue, - scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + : XrdCtaStream( + catalogue, + scheduler, + std::make_unique(catalogue, scheduler, requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaArchiveRouteLs.hpp b/xroot_plugins/XrdCtaArchiveRouteLs.hpp index 55000b2ce312056f853bb44e3ab5216ca74efb67..7d6a59a99b11d12d56b1739aa41f623b7eef4a5b 100644 --- a/xroot_plugins/XrdCtaArchiveRouteLs.hpp +++ b/xroot_plugins/XrdCtaArchiveRouteLs.hpp @@ -39,8 +39,7 @@ inline ArchiveRouteLsStream::ArchiveRouteLsStream(const frontend::AdminCmdStream scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaDiskInstanceLs.hpp b/xroot_plugins/XrdCtaDiskInstanceLs.hpp index 38ef214ff76c681dda992a0c54a9f9d1524f271b..627f21ab4c5b68338942a5b2b2b34e74b602a727 100644 --- a/xroot_plugins/XrdCtaDiskInstanceLs.hpp +++ b/xroot_plugins/XrdCtaDiskInstanceLs.hpp @@ -39,8 +39,7 @@ inline DiskInstanceLsStream::DiskInstanceLsStream(const frontend::AdminCmdStream scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaDiskInstanceSpaceLs.hpp b/xroot_plugins/XrdCtaDiskInstanceSpaceLs.hpp index 60f8d6ca6afc6c5bc88448dc80199d7e4bcf6194..666ad273ff84197d58f5723bb2cd0e3812f59d94 100644 --- a/xroot_plugins/XrdCtaDiskInstanceSpaceLs.hpp +++ b/xroot_plugins/XrdCtaDiskInstanceSpaceLs.hpp @@ -39,8 +39,7 @@ inline DiskInstanceSpaceLsStream::DiskInstanceSpaceLsStream(const frontend::Admi scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaDiskSystemLs.hpp b/xroot_plugins/XrdCtaDiskSystemLs.hpp index 6276b46f57f400a265ea43a7b759fe2bbebd07fc..dfbc767805097c7429c461143c1f663d44d848a2 100644 --- a/xroot_plugins/XrdCtaDiskSystemLs.hpp +++ b/xroot_plugins/XrdCtaDiskSystemLs.hpp @@ -39,8 +39,7 @@ inline DiskSystemLsStream::DiskSystemLsStream(const frontend::AdminCmdStream& re scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaGroupMountRuleLs.hpp b/xroot_plugins/XrdCtaGroupMountRuleLs.hpp index c8e8930867b05af2bb05336cfe73b516181baa4a..9e59cc0a25499db39012360ffe49914c7b1b4a4d 100644 --- a/xroot_plugins/XrdCtaGroupMountRuleLs.hpp +++ b/xroot_plugins/XrdCtaGroupMountRuleLs.hpp @@ -39,8 +39,7 @@ inline GroupMountRuleLsStream::GroupMountRuleLsStream(const frontend::AdminCmdSt scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaMediaTypeLs.hpp b/xroot_plugins/XrdCtaMediaTypeLs.hpp index 8fb5080755093b7b87fee2d17b55d11edd3a3c6a..70d70398d8a6785d85f4ccf2e6e32b5083d9bf8d 100644 --- a/xroot_plugins/XrdCtaMediaTypeLs.hpp +++ b/xroot_plugins/XrdCtaMediaTypeLs.hpp @@ -39,8 +39,7 @@ inline MediaTypeLsStream::MediaTypeLsStream(const frontend::AdminCmdStream& requ scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaMountPolicyLs.hpp b/xroot_plugins/XrdCtaMountPolicyLs.hpp index a32f2444fabfd8a1b4dc6c14426038c838d1d268..f375bc1eb9d665669629d00d34dbf7beb019bee9 100644 --- a/xroot_plugins/XrdCtaMountPolicyLs.hpp +++ b/xroot_plugins/XrdCtaMountPolicyLs.hpp @@ -39,8 +39,7 @@ inline MountPolicyLsStream::MountPolicyLsStream(const frontend::AdminCmdStream& scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaPhysicalLibraryLs.hpp b/xroot_plugins/XrdCtaPhysicalLibraryLs.hpp index 7a693661b5052152eec02679420b91832455d682..6d78a62a628e001697abe86c468e7813e144f2ff 100644 --- a/xroot_plugins/XrdCtaPhysicalLibraryLs.hpp +++ b/xroot_plugins/XrdCtaPhysicalLibraryLs.hpp @@ -39,8 +39,7 @@ inline PhysicalLibraryLsStream::PhysicalLibraryLsStream(const frontend::AdminCmd scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp b/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp index d3204a5d8d6ccd4081fccf66af6b995d7fb87060..a00052ce60f89e94830916171bdd10ea7880a3cb 100644 --- a/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp +++ b/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp @@ -39,8 +39,7 @@ inline RequesterMountRuleLsStream::RequesterMountRuleLsStream(const frontend::Ad scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaShowQueues.hpp b/xroot_plugins/XrdCtaShowQueues.hpp index 634e8fb35c002e79dacc19f582fb9e809849fed0..f5a987c456ffd7aabcf519110dd8208badd258fd 100644 --- a/xroot_plugins/XrdCtaShowQueues.hpp +++ b/xroot_plugins/XrdCtaShowQueues.hpp @@ -50,7 +50,6 @@ inline ShowQueuesStream::ShowQueuesStream(const frontend::AdminCmdStream& reques std::make_unique(catalogue, scheduler, requestMsg.getInstanceName(), - requestMsg.getAdminCmd(), lc)) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); } diff --git a/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp b/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp index ea072e8bacadf4df291ab2b9f045dac5d34ffebb..d56314a6714a6b9a635a31c55fd329a731e8926d 100644 --- a/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp +++ b/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp @@ -39,8 +39,7 @@ inline VirtualOrganizationLsStream::VirtualOrganizationLsStream(const frontend:: scheduler, std::make_unique(catalogue, scheduler, - requestMsg.getInstanceName(), - requestMsg.getAdminCmd())) { + requestMsg.getInstanceName())) { XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, " constructor"); }