Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

XrdAdaptor: improve exception messages #47462

Merged
merged 2 commits into from
Mar 2, 2025
Merged

XrdAdaptor: improve exception messages #47462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
259fde0
Include information on inactive sources to exception messages
makortel Feb 26, 2025
9ea9ade
Include full new URL in the exception messages from initialize()
makortel Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions Utilities/XrdAdaptor/src/XrdRequestManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void RequestManager::initialize(std::weak_ptr<RequestManager> self) {
ex.clearMessage();
ex.clearContext();
ex.clearAdditionalInfo();
ex << "XrdCl::File::Open(name='" << m_name << "', flags=0x" << std::hex << m_flags << ", permissions=0"
ex << "XrdCl::File::Open(name='" << new_filename << "', flags=0x" << std::hex << m_flags << ", permissions=0"
<< std::oct << m_perms << std::dec << ") => error '" << openStatus.ToStr() << "' (errno=" << openStatus.errNo
<< ", code=" << openStatus.code << ")";
ex.addContext("Calling XrdFile::open()");
Expand All @@ -233,7 +233,7 @@ void RequestManager::initialize(std::weak_ptr<RequestManager> self) {
ex.clearMessage();
ex.clearContext();
ex.clearAdditionalInfo();
ex << "XrdCl::File::Open(name='" << m_name << "', flags=0x" << std::hex << m_flags << ", permissions=0"
ex << "XrdCl::File::Open(name='" << new_filename << "', flags=0x" << std::hex << m_flags << ", permissions=0"
<< std::oct << m_perms << std::dec << ") => error '" << status->ToStr() << "' (errno=" << status->errNo
<< ", code=" << status->code << ")";
ex.addContext("Calling XrdFile::open()");
Expand Down Expand Up @@ -563,6 +563,14 @@ void RequestManager::getPrettyActiveSourceNames(std::vector<std::string> &source
}
}

void RequestManager::getPrettyInactiveSourceNames(std::vector<std::string> &sources) const {
std::lock_guard<std::recursive_mutex> sentry(m_source_mutex);
sources.reserve(m_inactiveSources.size());
for (auto const &source : m_inactiveSources) {
sources.push_back(source->PrettyID());
}
}

void RequestManager::getDisabledSourceNames(std::vector<std::string> &sources) const {
sources.reserve(m_disabledSourceStrings.size());
for (auto const &source : m_disabledSourceStrings) {
Expand All @@ -577,6 +585,11 @@ void RequestManager::addConnections(cms::Exception &ex) const {
ex.addAdditionalInfo("Active source: " + source);
}
sources.clear();
getPrettyInactiveSourceNames(sources);
for (auto const &source : sources) {
ex.addAdditionalInfo("Inactive source: " + source);
}
sources.clear();
getDisabledSourceNames(sources);
for (auto const &source : sources) {
ex.addAdditionalInfo("Disabled source: " + source);
Expand Down
6 changes: 6 additions & 0 deletions Utilities/XrdAdaptor/src/XrdRequestManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ namespace XrdAdaptor {
void getActiveSourceNames(std::vector<std::string> &sources) const;
void getPrettyActiveSourceNames(std::vector<std::string> &sources) const;

/**
* Retrieve the names of the inactive sources
* (primarily meant to enable meaningful log messages).
*/
void getPrettyInactiveSourceNames(std::vector<std::string> &sources) const;

/**
* Retrieve the names of the disabled sources
* (primarily meant to enable meaningful log messages).
Expand Down