From d03eeb0e56ac38bdcb546d15c3b21d556e40a367 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Thu, 7 Nov 2024 13:00:10 +0000
Subject: [PATCH] Extend oslo.messaging exceptions (#990)

Adds more exceptions to catch and only searches for
oslo.messaging exceptions in services that use it to
reduce extraneous searches.
---
 hotsos/core/plugins/openstack/exceptions.py |  7 +++++-
 hotsos/core/plugins/openstack/openstack.py  | 28 +++++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/hotsos/core/plugins/openstack/exceptions.py b/hotsos/core/plugins/openstack/exceptions.py
index b053d5957..bc3a0eea8 100644
--- a/hotsos/core/plugins/openstack/exceptions.py
+++ b/hotsos/core/plugins/openstack/exceptions.py
@@ -98,11 +98,17 @@
 
 # https://opendev.org/openstack/oslo.messaging/src/branch/master/oslo_messaging/exceptions.py
 OSLO_MESSAGING_EXCEPTIONS = [
+# oslo_messaging/exceptions.py
     "MessagingException",
     "MessagingTimeout",
     "MessageDeliveryFailure",
     "InvalidTarget",
     "MessageUndeliverable",
+    "ConfigurationError",
+# oslo_messaging/rpc/client.py
+    "RemoteError",
+    "RPCVersionCapError",
+    "ClientSendError",
 ]
 
 # Exceptions common to any project should be defined here
@@ -111,5 +117,4 @@
     r'amqp.exceptions.ConnectionForced',
     r'OSError: Server unexpectedly closed connection',
 ] + OSLO_DB_EXCEPTIONS \
-  + OSLO_MESSAGING_EXCEPTIONS \
   + PYTHON_BUILTIN_EXCEPTIONS
diff --git a/hotsos/core/plugins/openstack/openstack.py b/hotsos/core/plugins/openstack/openstack.py
index e24b58af2..0c6f1122a 100644
--- a/hotsos/core/plugins/openstack/openstack.py
+++ b/hotsos/core/plugins/openstack/openstack.py
@@ -7,6 +7,7 @@
 from hotsos.core import host_helpers
 from hotsos.core.log import log
 from hotsos.core.plugins.openstack.exceptions import (
+    OSLO_MESSAGING_EXCEPTIONS,
     EXCEPTIONS_COMMON,
 )
 from hotsos.core.plugins.openstack.exceptions_barbican import (
@@ -279,19 +280,26 @@
         'stein': '1.0.0'}
 }
 
-OST_EXCEPTIONS = {'barbican': BARBICAN_EXCEPTIONS + CASTELLAN_EXCEPTIONS,
-                  'cinder': CINDER_EXCEPTIONS + CASTELLAN_EXCEPTIONS,
-                  'designate': DESIGNATE_EXCEPTIONS,
+OST_EXCEPTIONS = {'barbican': BARBICAN_EXCEPTIONS + CASTELLAN_EXCEPTIONS +
+                  OSLO_MESSAGING_EXCEPTIONS,
+                  'cinder': CINDER_EXCEPTIONS + CASTELLAN_EXCEPTIONS +
+                  OSLO_MESSAGING_EXCEPTIONS,
+                  'designate': DESIGNATE_EXCEPTIONS +
+                  OSLO_MESSAGING_EXCEPTIONS,
                   'glance': GLANCE_EXCEPTIONS + GLANCE_STORE_EXCEPTIONS,
-                  'heat': HEAT_EXCEPTIONS,
+                  'heat': HEAT_EXCEPTIONS +
+                  OSLO_MESSAGING_EXCEPTIONS,
                   'keystone': KEYSTONE_EXCEPTIONS,
-                  'manila': MANILA_EXCEPTIONS,
-                  'masakari': MASAKARI_EXCEPTIONS,
-                  'neutron': NEUTRON_EXCEPTIONS + OVSDBAPP_EXCEPTIONS,
+                  'manila': MANILA_EXCEPTIONS + OSLO_MESSAGING_EXCEPTIONS,
+                  'masakari': MASAKARI_EXCEPTIONS + OSLO_MESSAGING_EXCEPTIONS,
+                  'neutron': NEUTRON_EXCEPTIONS + OVSDBAPP_EXCEPTIONS +
+                  OSLO_MESSAGING_EXCEPTIONS,
                   'nova': NOVA_EXCEPTIONS + PYTHON_LIBVIRT_EXCEPTIONS +
-                  NEUTRONCLIENT_EXCEPTIONS + OS_VIF_EXCEPTIONS,
-                  'octavia': OCTAVIA_EXCEPTIONS,
-                  'placement': PLACEMENT_EXCEPTIONS,
+                  NEUTRONCLIENT_EXCEPTIONS + OS_VIF_EXCEPTIONS +
+                  OSLO_MESSAGING_EXCEPTIONS,
+                  'octavia': OCTAVIA_EXCEPTIONS + OSLO_MESSAGING_EXCEPTIONS,
+                  'placement': PLACEMENT_EXCEPTIONS +
+                  OSLO_MESSAGING_EXCEPTIONS,
                   }