From ca241b75d42226fb85d98e7df7f3c6d005ee3a39 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@vmware.com>
Date: Wed, 17 May 2023 01:04:14 -0700
Subject: [PATCH] Add back reporting of failed sub-proxies

---
 salt/metaproxy/deltaproxy.py | 9 ++++++++-
 salt/metaproxy/proxy.py      | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/salt/metaproxy/deltaproxy.py b/salt/metaproxy/deltaproxy.py
index 74efd66d50e..058f410ae58 100644
--- a/salt/metaproxy/deltaproxy.py
+++ b/salt/metaproxy/deltaproxy.py
@@ -350,9 +350,16 @@ def post_master_init(self, master):
                     self.utils,
                 )
             )
-        results = yield salt.ext.tornado.gen.multi(waitfor)
+
+        try:
+            results = yield salt.ext.tornado.gen.multi(waitfor)
+        except Exception as exc:  # pylint: disable=broad-except
+            log.error("Errors loading sub proxies")
+
+        _failed = self.opts["proxy"].get("ids", [])
         for sub_proxy_data in results:
             minion_id = sub_proxy_data["proxy_opts"].get("id")
+            _failed.remove(minion_id)
 
             if sub_proxy_data["proxy_minion"]:
                 self.deltaproxy_opts[minion_id] = sub_proxy_data["proxy_opts"]
diff --git a/salt/metaproxy/proxy.py b/salt/metaproxy/proxy.py
index 1700e35027d..039081cf5f1 100644
--- a/salt/metaproxy/proxy.py
+++ b/salt/metaproxy/proxy.py
@@ -54,6 +54,7 @@ from salt.utils.process import SignalHandlingProcess, default_signals
 
 log = logging.getLogger(__name__)
 
+
 @salt.ext.tornado.gen.coroutine
 def post_master_init(self, master):
     """