From 54f1b5002d575da02dc23ba817786b4ce25acc43 Mon Sep 17 00:00:00 2001 From: Lasse Tjernaes Wardenaer <lasse.tjernaes.wardenaer@cern.ch> Date: Thu, 24 Nov 2022 11:54:47 +0100 Subject: [PATCH] Fix "hostName.empty()" bug and remove vid check --- ReleaseNotes.md | 1 + .../standalone_cli_tools/CtaVerifyFile.cpp | 20 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index ba7fe9e64c..7183860897 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -7,6 +7,7 @@ ### Bug fixes - cta/CTA#93 - Refactor Frontend code to allow code sharing between SSI and gRPC implementations - cta/CTA#221 - Change option in cta-send-event from instance to eos.instance +- cta/CTA#223 - Remove vid check to improve run time of cta-verify-file, fix possible _S_construct null not valid error # v4.7.14-1 diff --git a/cmdline/standalone_cli_tools/CtaVerifyFile.cpp b/cmdline/standalone_cli_tools/CtaVerifyFile.cpp index 499b0d1659..1bc187e686 100644 --- a/cmdline/standalone_cli_tools/CtaVerifyFile.cpp +++ b/cmdline/standalone_cli_tools/CtaVerifyFile.cpp @@ -83,24 +83,6 @@ void fillNotification(cta::eos::Notification ¬ification, const CmdLineArgs &c } } -/* - * Checks if the provided vid exists - */ -void vidExists(cta::cliTool::CmdLineArgs cmdLineArgs, const XrdSsiPb::Config &config) { - std::string hostName = std::getenv("HOSTNAME"); - if(hostName.empty()) { - hostName = "UNKNOWN"; - } - cta::log::StdoutLogger log(hostName, "cta-verify-file"); - auto serviceProviderPtr = std::make_unique<XrdSsiPbServiceType>(config); - auto vidsInCatalogue = CatalogueFetch::getVids(serviceProviderPtr, log); - - std::list<std::string>::iterator findIter = std::find(vidsInCatalogue.begin(), vidsInCatalogue.end(), cmdLineArgs.m_vid); - if(vidsInCatalogue.end() == findIter) { - throw std::runtime_error("The provided --vid does not exist in the Catalogue."); - } -} - XrdSsiPb::Config getConfig() { // Set configuration options XrdSsiPb::Config config(g_config_file, "cta"); @@ -199,8 +181,6 @@ int exceptionThrowingMain(int argc, char *const *const argv) const XrdSsiPb::Config config = getConfig(); - vidExists(cmdLineArgs, config); - for(const auto &archiveFileId : archiveFileIds) { sendVerifyRequest(cmdLineArgs, archiveFileId, config); } -- GitLab