For n_jobs, close client before tearing down cluster (#853)

* Close client before scheduler * update changelog
alteryx · Feb 28, 2020 · 5f4b395 · 5f4b395
1 parent 46d025c
commit 5f4b395
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -3,11 +3,13 @@
 Changelog
 ---------
 **Future Release**
+    * Fixes
+        * Fix a connection closed error when using n_jobs (:pr:`853`)
     * Changes
         * Pin msgpack dependency for Python 3.5; remove dataframe from Dask dependency (:pr:`851`)
 
     Thanks to the following people for contributing to this release:
-    :user:`frances-h`
+    :user:`frances-h`, :user:`rwedge`
 
 **v0.13.2 Jan 31, 2020**
     * Enhancements

diff --git a/featuretools/computational_backends/calculate_feature_matrix.py b/featuretools/computational_backends/calculate_feature_matrix.py
@@ -591,12 +591,12 @@ def parallel_calculate_chunks(cutoff_time, chunk_size, feature_set, approximate,
     except Exception:
         raise
     finally:
-        if 'cluster' not in dask_kwargs and cluster is not None:
-            cluster.close()
-
         if client is not None:
             client.close()
 
+        if 'cluster' not in dask_kwargs and cluster is not None:
+            cluster.close()
+
     feature_matrix = pd.concat(feature_matrix)
 
     return feature_matrix