This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1546 by this push:
     new 78ee925  [DLAB-1546]: added name convention changes
78ee925 is described below

commit 78ee925c574bd6306edd4ae4f2c7e169aaeec2ab
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Mar 3 17:31:15 2020 +0200

    [DLAB-1546]: added name convention changes
---
 infrastructure-provisioning/src/general/lib/gcp/meta_lib.py         | 4 ++--
 .../src/general/scripts/gcp/dataengine-service_configure.py         | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py 
b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
index 3cf4c9f..fc0ee79 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
@@ -183,8 +183,8 @@ class GCPMeta:
                 raise err
         except Exception as err:
             logging.info(
-                "Unable to get Firewall: " + str(err) + "\n Traceback: " + 
traceback.print_exc(file=sys.stdout))
-            append_result(str({"error": "Unable to get Firewall",
+                "Unable to get instance: " + str(err) + "\n Traceback: " + 
traceback.print_exc(file=sys.stdout))
+            append_result(str({"error": "Unable to get instance",
                                "error_message": str(err) + "\n Traceback: " + 
traceback.print_exc(
                                    file=sys.stdout)}))
             traceback.print_exc(file=sys.stdout)
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
 
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
index 1dcf024..05b9c9b 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
@@ -176,7 +176,7 @@ if __name__ == "__main__":
         dataproc_conf['master_name'] = dataproc_conf['cluster_name'] + '-m'
         dataproc_conf['master_ip'] = 
GCPMeta.get_private_ip_address(dataproc_conf['master_name'])
     except Exception as err:
-        dlab.fab.append_result("Failed to generate variables dictionary. 
Exception:" + str(err))
+        dlab.fab.append_result("Failed to generate variables dictionary.", 
str(err))
         GCPActions.delete_dataproc_cluster(dataproc_conf['cluster_name'], 
os.environ['gcp_region'])
         sys.exit(1)
 
@@ -203,7 +203,9 @@ if __name__ == "__main__":
         for job in jobs:
             if job.exitcode != 0:
                 raise Exception
-    except:
+    except Exception as err:
+        GCPActions.delete_dataproc_cluster(dataproc_conf['cluster_name'], 
os.environ['gcp_region'])
+        dlab.fab.append_result("Failed to configure Dataengine-service", 
str(err))
         traceback.print_exc()
         raise Exception
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to