From be4afd33700ad6b4f7f21e95726de10ac4998b15 Mon Sep 17 00:00:00 2001
From: root <benc@hawaga.org.uk>
Date: Wed, 2 Feb 2022 17:46:16 +0100
Subject: [PATCH 1/2] Fix broken ScalingFailed exception construction

This tries to find the provider label inside self.config.provider,
which does not exist. In this interchange, the provider is
directly available as an attribute.

Tested by: modify my local kube provider to return None on
all submits, see that the issue #679 stack trace appears.
Make this change in this commit, and see that a ScalingFailed
correctly appears.

This addresses the first bullet point in issue #679.
---
 .../funcx_endpoint/executors/high_throughput/interchange.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funcx_endpoint/funcx_endpoint/executors/high_throughput/interchange.py b/funcx_endpoint/funcx_endpoint/executors/high_throughput/interchange.py
index 09c2f735f..36db7552b 100644
--- a/funcx_endpoint/funcx_endpoint/executors/high_throughput/interchange.py
+++ b/funcx_endpoint/funcx_endpoint/executors/high_throughput/interchange.py
@@ -1146,7 +1146,7 @@ def scale_out(self, blocks=1, task_type=None):
                 if not internal_block:
                     raise (
                         ScalingFailed(
-                            self.config.provider.label,
+                            self.provider.label,
                             "Attempts to provision nodes via provider has failed",
                         )
                     )

From 814e3ff7f5b2919462f1683b20fee4ff0a17634f Mon Sep 17 00:00:00 2001
From: Ben Clifford <benc@hawaga.org.uk>
Date: Tue, 15 Feb 2022 13:33:29 +0000
Subject: [PATCH 2/2] Add changelog

---
 .../20220215_133045_benc_issue679_part1.rst   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 changelog.d/20220215_133045_benc_issue679_part1.rst

diff --git a/changelog.d/20220215_133045_benc_issue679_part1.rst b/changelog.d/20220215_133045_benc_issue679_part1.rst
new file mode 100644
index 000000000..3dbed70bb
--- /dev/null
+++ b/changelog.d/20220215_133045_benc_issue679_part1.rst
@@ -0,0 +1,36 @@
+.. A new scriv changelog fragment.
+..
+.. Uncomment the header that is right (remove the leading dots).
+..
+.. New Functionality
+.. ^^^^^^^^^^^^^^^^^
+..
+.. - A bullet item for the New Functionality category.
+..
+ Bug Fixes
+ ^^^^^^^^^
+
+- When a provider raised an exception, that exception was then mishandled
+  and presented as an AttributeError. This handling now no longer corrupts
+  the exception. https://github.com/funcx-faas/funcX/issues/679
+..
+.. Removed
+.. ^^^^^^^
+..
+.. - A bullet item for the Removed category.
+..
+.. Deprecated
+.. ^^^^^^^^^^
+..
+.. - A bullet item for the Deprecated category.
+..
+.. Changed
+.. ^^^^^^^
+..
+.. - A bullet item for the Changed category.
+..
+.. Security
+.. ^^^^^^^^
+..
+.. - A bullet item for the Security category.
+..