Handle missing Instance Pools in cluster import

Author: gregwood-db

dbclient/ClustersClient.py

@@ -47,10 +47,19 @@ def cleanup_cluster_pool_configs(self, cluster_json, cluster_creator, is_job_clu
         :return:
         """
         pool_id_dict = self.get_instance_pool_id_mapping()
-        # if pool id exists, remove instance types
-        cluster_json.pop('node_type_id', None)
-        cluster_json.pop('driver_node_type_id', None)
-        cluster_json.pop('enable_elastic_disk', None)
+
+        if not pool_id_dict:
+            logging.info("WARNING: instance pool is outdated. Pools may have been deleted; cluster will use defaults.")
+            cluster_json.pop("instance_pool_id")
+        else:
+            # if pool id exists, remove instance types
+            cluster_json.pop('node_type_id', None)
+            cluster_json.pop('driver_node_type_id', None)
+            cluster_json.pop('enable_elastic_disk', None)
+            # map old pool ids to new pool ids
+            old_pool_id = cluster_json['instance_pool_id']
+            cluster_json['instance_pool_id'] = pool_id_dict.get[old_pool_id]
+
         if not is_job_cluster:
             # add custom tag for original cluster creator for cost tracking
             if 'custom_tags' in cluster_json:
@@ -65,9 +74,7 @@ def cleanup_cluster_pool_configs(self, cluster_json, cluster_creator, is_job_clu
             iam_role = aws_conf.get('instance_profile_arn', None)
             if not iam_role:
                 cluster_json['aws_attributes'] = {'instance_profile_arn': iam_role}
-        # map old pool ids to new pool ids
-        old_pool_id = cluster_json['instance_pool_id']
-        cluster_json['instance_pool_id'] = pool_id_dict[old_pool_id]
+
         return cluster_json
 
     def delete_all_clusters(self):