From 850e6912abacf5662d0000d022a27ddf5e02a672 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Tue, 27 Jul 2021 11:19:57 +0200
Subject: [PATCH] Improved the error messages given when a mount rule cannot be
 found.

---
 catalogue/RdbmsCatalogue.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/catalogue/RdbmsCatalogue.cpp b/catalogue/RdbmsCatalogue.cpp
index d5ef6b9a32..2d61efebb8 100644
--- a/catalogue/RdbmsCatalogue.cpp
+++ b/catalogue/RdbmsCatalogue.cpp
@@ -7386,9 +7386,8 @@ uint64_t RdbmsCatalogue::checkAndGetNextArchiveFileId(const std::string &diskIns
 
         if(!defaultMountPolicy) {
           exception::UserError ue;
-          ue.getMessage() << "No mount rules for the requester or their group:"
-            " storageClass=" << storageClassName << " requester=" << diskInstanceName << ":" << user.name << ":" <<
-            user.group;
+          ue.getMessage() << "Failed to check and get next archive file ID: No mount rules: storageClass=" <<
+            storageClassName << " requester=" << diskInstanceName << ":" << user.name << ":" << user.group;
           throw ue;
         }
       }
@@ -7443,8 +7442,8 @@ common::dataStructures::ArchiveFileQueueCriteria RdbmsCatalogue::getArchiveFileQ
 
         if(!mountPolicy) {
           exception::UserError ue;
-          ue.getMessage() << "No mount rules for the requester or their group: storageClass=" << storageClassName <<
-            " requester=" << diskInstanceName << ":" << user.name << ":" << user.group;
+          ue.getMessage() << "Failed to get archive file queue criteria: No mount rules: storageClass=" <<
+            storageClassName << " requester=" << diskInstanceName << ":" << user.name << ":" << user.group;
           throw ue;
         }
       }
-- 
GitLab